Browse Source

部件字段修改

haojianlong 4 years ago
parent
commit
4dca5105d5

+ 4 - 27
src/api/scan/request.js

@@ -369,29 +369,6 @@ export function defaultFloor(param) {
 //   return fetch({ method: 'POST', url: `${godhand}/equipment/create?projectId=${param.perjectId}&secret=${param.secret}`, data })
 // }
 
-
-//物理世界新建岗位(部件)
-export function createComponent(param) {
-  let data = {
-    "building_id": param.BuildId,
-    "component_category": param.category,
-    "floor_id": param.BIMID,
-    "infos": {
-      "BIMID": [
-        { "value": param.BIMID }
-      ],
-      "BIMLocation": [
-        { "value": param.BIMLocation }
-      ]
-    }
-  }
-  return fetch({
-    method: 'POST',
-    url: `${physics}/component/create?projectId=${param.perjectId}&secret=${param.secret}`,
-    data
-  })
-}
-
 //通过岗位id查询元空间id
 export function getSpaceId(param) {
   let data = {
@@ -1200,26 +1177,26 @@ export function getEquipPartsCon(param, success) {
 
 //设备清单 - 新增部件
 export function createPart(param, success) {
-  let url = `${baseUrl}${dataCenter}/component/create`;
+  let url = `${baseUrl}${object}/component/create`;
   http.postJson(url, param, success)
 }
 
 // 查询部件总数
 export function queryPart(param, success) {
-  let url = `${baseUrl}${dataCenter}/component/count`;
+  let url = `${baseUrl}${object}/component/count`;
   http.postJson(url, param, success)
 }
 
 //设备清单 - 删除部件
 export function deleteParts(param, success) {
-  let url = `${baseUrl}${dataCenter}/component/delete?projectId=${param.projectId}`;
+  let url = `${baseUrl}${object}/component/delete?projectId=${param.projectId}`;
   let data = param.data;
   http.postJson(url, data, success)
 }
 
 //设备清单 - 更新部件
 export function updateParts(param, success) {
-  let url = `${baseUrl}${dataCenter}/component/update?projectId=${param.projectId}`;
+  let url = `${baseUrl}${object}/component/update?projectId=${param.projectId}`;
   let data = param.data;
   http.postJson(url, data, success)
 }

+ 0 - 65
src/utils/handsontable/notShow.js

@@ -4,7 +4,6 @@ import tools from "@/utils/scan/tools"
 import fieldData from "@/utils/handsontable/fillterField"
 import dataTypeMap from "./dataTypeMap"
 
-let inputModeArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "L", "L1", "L2", "F1", "F2", "M", "Own"]
 //在编辑模式下并且勾选隐藏自动填充的信息点不显示的字段
 let noShowArr = [
   "specification",
@@ -76,70 +75,6 @@ let firmArr = [
   // "dpInsurerId"//保险公司信息Id
 ]
 
-let cutArr = [{
-  name: "品牌型号",
-  code: "dpManufacturerId",
-  num: 2,
-}, {
-  name: "供应商信息",
-  code: "dpSupplierId",
-  num: 5
-}, {
-  name: "维修商信息",
-  code: "dpMaintainerId",
-  num: 19
-}, {
-  name: "保险公司信息",
-  code: "dpInsurerId",
-  num: 25
-}]
-
-let newData = [{
-  name: "品牌型号",
-  code: "dpManufacturerId",
-  num: 2,
-}, {
-  name: "供应商信息",
-  code: "dpSupplierId",
-  num: 8
-}, {
-  name: "维修商信息",
-  code: "dpMaintainerId",
-  num: 35
-}, {
-  name: "保险公司信息",
-  code: "dpInsurerId",
-  num: 42
-}]
-//创建部件固定不显示-管理部件固定不显示(即编辑模式)
-let partsAddNoShow = [
-  'EquipID',
-  'EquipName',
-  'EquipQRCode',
-  'BIMID',
-  'BIMLocation',
-  'Brand',
-  'Specification',
-  'Manufacturer',
-  'Supplier',
-  'SupplierContactor',
-  'SupplierPhone',
-  'SupplierEmail',
-  'SupplierWeb',
-  'SupplierFax',
-  'maintainer',
-  'MaintainerContactor',
-  'MaintainerPhone',
-  'MaintainerEmail',
-  'MaintainerWeb',
-  'MaintainerFax',
-  'Insurer',
-  "InsurerContactor",
-  "InsurerPhone",
-  "InsurerEmail",
-  "InsurerWeb",
-  "InsurerFax",
-]
 // 将映射表枚举值转为数组
 const mapToArr = () => {
   const arr = []

+ 7 - 7
src/views/ledger/facility/parts/index.vue

@@ -320,8 +320,8 @@ export default {
         this.$message("开发中...");
       }
       //设备二维码图片
-      if (val == "EquipQRCode") {
-        this.qrcodeUrl = this.tableData[row.row].EquipQRCode;
+      if (val == "defaultQRCode") {
+        this.qrcodeUrl = this.tableData[row.row].defaultQRCode;
         if (!!this.qrcodeUrl) {
           this.myDialog.qrcode = true;
         } else {
@@ -350,7 +350,7 @@ export default {
         this.myDialog.insurer = true;
       }
       //供应合同编号
-      if (val == "LedgerParam.SupplyPurchase.SupplierContractID") {
+      if (val == "infos.supplierContractID") {
         let falg = null;
         let data = this.tableData[row.row].dpSupplierId;
         if (data) {
@@ -364,7 +364,7 @@ export default {
         }
       }
       //保险单号
-      if (val == "LedgerParam.InsuranceDoc.InsuranceNum") {
+      if (val == "infos.insuranceNum") {
         //选择保单
         let falg = null;
         let data = this.tableData[row.row].dpInsurerId;
@@ -401,15 +401,15 @@ export default {
       }
       //安装照片--设备铭牌照片
       if (
-        val == "LedgerParam.Siteinstall.InstallPic" ||
-        val == "LedgerParam.PhotoDoc.Nameplate"
+        val == "infos.installPic" ||
+        val == "infos.nameplate"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.imgsArr = data ? data : [];
         this.myDialog.uploadImgs = true;
       }
       //设备照片
-      if (val == "LedgerParam.PhotoDoc.Pic") {
+      if (val == "infos.pic") {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.picsArr = data ? data : [];
         this.myDialog.pic = true;

+ 47 - 53
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -143,7 +143,7 @@ export default {
   },
   created() {
     this.category = this.$route.query;
-    this.category.ParentId = this.category.Code.substr(0, 4);
+    this.category.parentId = this.category.code.substr(0, this.category.code.length - 2);
     this.getBelongs();
     this.getTableHeader();
   },
@@ -152,7 +152,7 @@ export default {
     getBelongs() {
       let params = {
         data: {
-          filters: `equipCode='${this.category.Code}'`,
+          filters: `equipCode='${this.category.code}'`,
           pageNumber: 1,
           pageSize: 50
         }
@@ -169,7 +169,7 @@ export default {
         orders: "sort asc, name desc",
         pageNumber: 1,
         pageSize: 1000,
-        type: this.category.Code
+        type: this.category.code
         // Filters: `type='Equipment' or type='${this.category.Code}'`
       };
       await getDataDictionary(params, res => {
@@ -198,7 +198,7 @@ export default {
       }
       let flag = false;
       newData.map(item => {
-        if (item.Checked && !item.EquipLocalName) {
+        if (item.Checked && !item.localName) {
           flag = true;
         }
       })
@@ -208,18 +208,18 @@ export default {
       }
 
       for (let i = 0; i < newData.length; i++) {
-        newData[i].ParentId = this.category.deviceId //当前设备id
-        newData[i].Category = this.category.Code //当前部件分类
-        newData[i].Family = this.firmId;
+        newData[i].parentId = this.category.deviceId //当前设备id
+        newData[i].classCode = this.category.code //当前部件分类
+        newData[i].family = this.firmId;
         //待接口修改为关联创建
         let param = {
-          Cascade: [],
-          Content: [newData[i]]
+          cascade: [],
+          content: [newData[i]]
         }
 
         await createPart(param, async res => {
           if (newData[i].Checked) {//同时创建资产
-            param.Content[0].EquipmentId = res.EntityList[0].EquipID
+            param.content[0].equipmentId = res.entityList[0].id
             await createPropertyData(param, res => {
               // todo 创建资产
             })
@@ -231,34 +231,13 @@ export default {
               path: "/ledger/partsmanage",
               query: {
                 deviceId: this.category.deviceId,
-                typeId: this.category.ParentId,
+                typeId: this.category.parentId,
                 pageNo: this.category.pageNo,
                 pageSize: this.category.pageSize
               }
             });
           }
         })
-
-        // if (newData[i].Checked) {//同时创建资产
-        //   await createPropertyData([params], async res => {
-        //     params.PropertyId = res.Id
-
-        //   })
-        // }
-        // else {
-        //   await createPart(params, res => {
-        //     if (i == newData.length - 1) {
-        //       this.$router.push({
-        //         path: "/ledger/partsmanage",
-        //         query: {
-        //           deviceId: this.category.deviceId,
-        //           typeId: this.category.ParentId
-        //         }
-        //       });
-        //       session.remove("partsAddData")
-        //     }
-        //   });
-        // }
       }
     },
     // 删除表格行
@@ -358,41 +337,56 @@ export default {
     },
     //选择型号修改
     firmChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "dpManufacturerId", data.venderId)//生产商ID
-      tools.setDataForKey(this.tableData[this.row], "dpBrandId", data.brandId)//品牌ID
-      tools.setDataForKey(this.tableData[this.row], "dpSpecificationId", data.specificationId)//型号ID
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.equipManufactor.manufacturer", data.venderName)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.equipManufactor.brand", data.brandName)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.equipManufactor.Specification", data.name)
+      tools.setDataForKey(this.tableData[this.row], "dpManufacturerId", data.venderId); //生产商ID
+      tools.setDataForKey(this.tableData[this.row], "dpBrandId", data.brandId); //品牌ID
+      tools.setDataForKey(this.tableData[this.row], "dpSpecificationId", data.specificationId); //型号ID
+      tools.setDataForKey(this.tableData[this.row], "infos.manufacturer", data.venderName);
+      tools.setDataForKey(this.tableData[this.row], "infos.brand", data.name);
+      tools.setDataForKey(this.tableData[this.row], "infos.specification", data.brandName);
     },
     //供应商变更
     supplierChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.Supplier", data.name)
-      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId);
+      tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name);
+      tools.setDataForKey(this.tableData[this.row], 'infos.supplierPhone', data.contacts[0]?data.contacts[0].phone:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.supplierContactor', data.contacts[0]?data.contacts[0].name:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.supplierWeb', data.website?data.website:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.supplierEmail', data.contacts[0]?data.contacts[0].email:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.supplierFax', data.contacts[0]?data.contacts[0].fax:null)
     },
     //保险商变更
     changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.Insurer", data.name)
-      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId);
+      tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name);
+      tools.setDataForKey(this.tableData[this.row], 'infos.insurerWeb', data.website?data.website:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.insurerEmail', data.contacts[0]?data.contacts[0].email:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.insurerFax', data.contacts[0]?data.contacts[0].fax:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.insurerPhone', data.contacts[0]?data.contacts[0].phone:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.insurerContactor', data.contacts[0]?data.contacts[0].name:null)
     },
     //维修商变更
     changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.operationMainte.maintainer", data.name)
-      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId);
+      tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name);
+      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerWeb', data.website?data.website:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerContactor', data.contacts[0]?data.contacts[0].name:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerPhone', data.contacts[0]?data.contacts[0].phone:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerEmail', data.contacts[0]?data.contacts[0].email:null)
+      tools.setDataForKey(this.tableData[this.row], 'infos.maintainerFax', data.contacts[0]?data.contacts[0].fax:null)
     },
     supplyChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContractID", { id: data });
+      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", { id: data });
     },
     //保险合同
     guaranteeChange(data) {
       for (let key in data) {
-        this.utilToKey(key, "insuranceNo", data, "InsuranceNum");
+        this.utilToKey(key, "insuranceNo", data, "insuranceNum");
         if (key == "contractFile") {
           if (!!data[key]) {
             data[key] = [data[key]];
           }
         }
-        this.utilToKey(key, "contractFile", data, "InsuranceFile");
+        this.utilToKey(key, "contractFile", data, "insuranceFile");
       }
     },
     //上传文件弹窗触发事件
@@ -455,7 +449,7 @@ export default {
       //其他的开始判断
       let val = this.tableExample.colToProp(row.col);
       //设备二维码图片
-      if (val == "EquipQRCode") {
+      if (val == "defaultQRCode") {
         this.myDialog.qrcode = true;
         this.$refs.qrcode.getCanvas(1111);
       }
@@ -481,7 +475,7 @@ export default {
         this.myDialog.insurer = true;
       }
       //供应合同编号
-      if (val == "LedgerParam.SupplyPurchase.SupplierContractID") {
+      if (val == "infos.supplierContractID") {
         let falg = null;
         let data = this.tableData[row.row].dpSupplierId;
         if (data) {
@@ -495,7 +489,7 @@ export default {
         }
       }
       //保险单号
-      if (val == "LedgerParam.InsuranceDoc.InsuranceNum") {
+      if (val == "infos.insuranceNum") {
         //选择保单
         let falg = null;
         let data = this.tableData[row.row].dpInsurerId
@@ -532,15 +526,15 @@ export default {
       }
       //安装照片--设备铭牌照片
       if (
-        val == "LedgerParam.Siteinstall.InstallPic" ||
-        val == "LedgerParam.PhotoDoc.Nameplate"
+        val == "infos.installPic" ||
+        val == "infos.nameplate"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.imgsArr = data ? data : []
         this.myDialog.uploadImgs = true;
       }
       //设备照片
-      if (val == "LedgerParam.PhotoDoc.Pic") {
+      if (val == "infos.pic") {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.picsArr = data ? data : []
         this.myDialog.pic = true;

+ 4 - 5
src/views/ledger/facility/partsmanage/index.vue

@@ -2,8 +2,8 @@
   <div id="deviceList">
     <el-row>
       <el-tabs @tab-click="tabsClick" v-model="tabVal">
-        <el-tab-pane v-for="t in partsTypeList" :key="t.Id" :name="t.Code"
-                     :label="t.Name+'('+t.Count+')'"></el-tab-pane>
+        <el-tab-pane v-for="t in partsTypeList" :key="t.id" :name="t.code"
+                     :label="t.name+'('+t.count+')'"></el-tab-pane>
       </el-tabs>
     </el-row>
     <el-row class="left">
@@ -235,8 +235,8 @@ export default {
         id: this.deviceId //设备id
       };
       await getPartsAllType(params, res => {
-        this.partsTypeList = res.Content;
-        this.tabVal = this.partsTypeList[0].Code;
+        this.partsTypeList = res.content;
+        this.tabVal = this.partsTypeList[0].code;
         this.activeTab = this.partsTypeList[0];
         this.getTableHeader();
         this.getBelongs();
@@ -490,7 +490,6 @@ export default {
       tools.setDataForKey(this.tableData[this.row], "dpManufacturerId", data.venderId); //生产商ID
       tools.setDataForKey(this.tableData[this.row], "dpBrandId", data.brandId); //品牌ID
       tools.setDataForKey(this.tableData[this.row], "dpSpecificationId", data.specificationId); //型号ID
-      tools.setDataForKey(this.tableData[this.row], "testReport", data.venderName);
       tools.setDataForKey(this.tableData[this.row], "infos.manufacturer", data.venderName);
       tools.setDataForKey(this.tableData[this.row], "infos.brand", data.name);
       tools.setDataForKey(this.tableData[this.row], "infos.specification", data.brandName);