Browse Source

设备台账四大厂商

haojianlong 4 years ago
parent
commit
bcf8a0ab46

+ 1 - 1
src/api/scan/request.js

@@ -1219,7 +1219,7 @@ export function updateEquip(param, success) {
 
 //设备清单 - 删除设备
 export function deleteEquip(param, success) {
-  let url = `${baseUrl}/datacenter4/equip/delete`;
+  let url = `${baseUrl}${dataCenter}/equip/delete`;
   http.postJson(url, param, success)
 }
 

+ 24 - 24
src/components/data_admin/buildData/vendersChange.vue

@@ -10,7 +10,7 @@
             <div class="saga-input">厂商库中已有的值</div>
             <div class="saga-button">当前资产的值</div>
           </div>
-          <div v-if="obj.infosKey == 'DPSpecificationID' && create">
+          <div v-if="obj.infosKey == 'dpSpecificationId' && create">
             <div style="line-height:32px;">
               <el-switch
                 v-model="isCreateProduct"
@@ -46,7 +46,7 @@
             </div>
           </div>
           <div class="saga-ipnput-view">
-            <template v-for="(item,index) in labelList" v-if="obj.infosKey != 'DPSpecificationID' ">
+            <template v-for="(item,index) in labelList" v-if="obj.infosKey != 'dpSpecificationId' ">
               <data-fill
                 v-if="isShow(item,index)"
                 :isCreated="create"
@@ -54,7 +54,7 @@
                 @change="changefillData"
               ></data-fill>
             </template>
-            <template v-if="obj.infosKey == 'DPSpecificationID'">
+            <template v-if="obj.infosKey == 'dpSpecificationId'">
               <div v-for="item in labelList">
                 <!-- 一级标签 -->
                 <h3 style="line-height:32px; color: green;">{{item.FirstTag}}</h3>
@@ -161,7 +161,7 @@ export default {
     changeSwitch() {
       if (!this.isCreateProduct) {
         let param = {
-          brandId: this.fm.Infos.DPBrandID,
+          brandId: this.fm.Infos.dpBrandId,
           familyCode: this.fm.Family
         }
         getProductList(param, res => {
@@ -174,7 +174,7 @@ export default {
       this.fm = tools.deepCopyObj(this.fmData)
       console.log(this.gm, this.fmData, "fmData")
       this.obj = getJson(this.infosKey.split(".")[1])
-      if (this.obj.infosKey != "DPSpecificationID") {
+      if (this.obj.infosKey != "dpSpecificationId") {
         this.labelList = this.obj.options.map(item => {
           let keyArr = item.key.split("."), data = ""
           item.value = this.fm.Infos[item.optLabel] || ""
@@ -200,18 +200,18 @@ export default {
     },
     //创建请求
     createOwn() {
-      let venderIdArr = ["DPManufacturerID", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "DPBrandID"]
+      let venderIdArr = ["dpManufacturerId", "DPSupplierID", "DPInsurerID", "DPMaintainerID", "dpBrandId"]
       console.log(this.fm)
       if (venderIdArr.indexOf(this.obj.infosKey) > -1) {
         let param = {}
         param.name = this.getMess('vender.name')
-        if (this.obj.infosKey != "DPManufacturerID") {
+        if (this.obj.infosKey != "dpManufacturerId") {
           param.website = this.getMess('vender.website')
         }
         //当其id为品牌id
-        if (this.obj.infosKey == "DPBrandID") {
+        if (this.obj.infosKey == "dpBrandId") {
           param.name = this.getMess('content.name')
-          param.venderId = this.fm.Infos.DPManufacturerID
+          param.venderId = this.fm.Infos.dpManufacturerId
         }
         //新建
         this.obj.createFunc(param, res => {
@@ -240,21 +240,21 @@ export default {
             for (let k in this.labelList) {
               this.changeFmData(this.labelList[k].optLabel, this.fm.Infos)
             }
-            if (this.obj.infosKey == "DPBrandID") {
+            if (this.obj.infosKey == "dpBrandId") {
               this.fm.Infos.Brand = this.getMess('content.name')
-              this.fm.Infos.DPSpecificationID = null
+              this.fm.Infos.dpSpecificationId = null
             }
             //如果修改的是生产厂家,品牌型号清空
-            if (this.obj.infosKey == "DPManufacturerID") {
-              this.fm.Infos.DPBrandID = null
-              this.fm.Infos.DPSpecificationID = null
+            if (this.obj.infosKey == "dpManufacturerId") {
+              this.fm.Infos.dpBrandId = null
+              this.fm.Infos.dpSpecificationId = null
             }
             this.updateFm(this.fm)
           }
         })
       }
-      let brandId = this.fm.Infos.DPBrandID
-      if (this.obj.infosKey == "DPSpecificationID") {
+      let brandId = this.fm.Infos.dpBrandId
+      if (this.obj.infosKey == "dpSpecificationId") {
         let param = tools.deepCopyObj(this.fm)
         param.Infos = {}
         //取infos中的数据
@@ -318,7 +318,7 @@ export default {
       this.obj.createFunc(param, res => {
         let updateParam = tools.deepCopyObj(this.fm)
         updateParam.Infos = {}
-        updateParam.Infos.DPSpecificationID = res.id
+        updateParam.Infos.dpSpecificationId = res.id
         this.labelList.map(item => {
           if (item.details && item.details.length) {
             //一级标签
@@ -359,18 +359,18 @@ export default {
       this.isCreateShow = false
       this.obj = {}
       this.obj = getJson(this.infosKey.split(".")[1])
-      let venders = ["DPSupplierID", "DPInsurerID", "DPManufacturerID"]
+      let venders = ["DPSupplierID", "DPInsurerID", "dpManufacturerId"]
       if (!!this.obj) {
         let param = {
           venderId: this.fm.Infos[this.obj.infosKey],
           projectId: this.projectId
         }
-        if (this.obj.infosKey == "DPBrandID") {
+        if (this.obj.infosKey == "dpBrandId") {
           param = {
             brandId: this.fm.Infos[this.obj.infosKey]
           }
         }
-        if (this.obj.infosKey == "DPSpecificationID") {
+        if (this.obj.infosKey == "dpSpecificationId") {
           param = {
             specificationId: this.fm.Infos[this.obj.infosKey]
           }
@@ -379,14 +379,14 @@ export default {
           console.log(res, venders.indexOf(this.obj.infosKey))
           if (venders.indexOf(this.obj.infosKey) > -1) {
             this.name = res.content.vender.name
-          } else if (this.obj.infosKey == "DPBrandID") {
+          } else if (this.obj.infosKey == "dpBrandId") {
             this.name = res.content.name
           } else {
             let content = res.content
             this.name = content.venderName + '-' + content.brandName + '-' + content.productName + '-' + content.specificationName
           }
           this.labelList = []
-          if (this.obj.infosKey == "DPSpecificationID") {
+          if (this.obj.infosKey == "dpSpecificationId") {
             this.labelList = this.obj.options.map(item => {
               if (item.details && item.details.length) {
                 //一级标签
@@ -450,7 +450,7 @@ export default {
     updateSpecification() {
       console.log("修改型号", this.obj)
       let param = {
-        specificationId: this.fm.Infos.DPSpecificationID,
+        specificationId: this.fm.Infos.dpSpecificationId,
         name: "",
         infos: {}
       }
@@ -496,7 +496,7 @@ export default {
       param.projectId = this.projectId
       param.name = this.getMess('vender.name')
       param.website = this.getMess('vender.website')
-      if (this.obj.infosKey == "DPBrandID") {
+      if (this.obj.infosKey == "dpBrandId") {
         param = {
           brandId: this.fm.Infos[this.obj.infosKey],
           name: this.getMess('content.name')

+ 1 - 1
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -15,7 +15,7 @@
           <el-form-item label="资产本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
-          <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
+          <el-form-item label="生产厂家:">{{ detail.manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
           <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
         </el-form>

+ 1 - 1
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -17,7 +17,7 @@
           <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
-          <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
+          <el-form-item label="生产厂家:">{{ detail.manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
           <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
           <el-form-item label="包含部件:">

+ 2 - 2
src/components/dialogHanson/addDevice.vue

@@ -217,7 +217,7 @@ export default {
         }
 
         if (
-          item.infoPointCode == "Maintainer" ||
+          item.infoPointCode == "maintainer" ||
           item.infoPointCode == "Supplier" ||
           item.infoPointCode == "Insurer" ||
           item.infoPointCode == "InsurerContactor"
@@ -431,7 +431,7 @@ export default {
       }
 
       if (
-        val == "infos.Maintainer" ||
+        val == "infos.maintainer" ||
         val == "infos.Supplier" ||
         val == "infos.Insurer" ||
         val == "infos.InsurerContactor"

+ 3 - 3
src/components/dialogs/addDialog/businessDialog.vue

@@ -351,7 +351,7 @@ export default {
         }
 
         if (
-          item.infoPointCode == "Maintainer" ||
+          item.infoPointCode == "maintainer" ||
           item.infoPointCode == "Supplier" ||
           item.infoPointCode == "Insurer" ||
           item.infoPointCode == "InsurerContactor"
@@ -600,7 +600,7 @@ export default {
         this.myDialog.supplier = true;
       }
 
-      if (val == "infos.Maintainer") {
+      if (val == "infos.maintainer") {
         this.myDialog.maintainer = true;
       }
 
@@ -680,7 +680,7 @@ export default {
     //维修商变更
     changeMaintainer(data) {
       for (let key in data) {
-        this.utilToKey(key, "name", data, "Maintainer")
+        this.utilToKey(key, "name", data, "maintainer")
         this.utilToKey(key, "email", data, "MaintainerEmail")
         this.utilToKey(key, "website", data, "MaintainerWeb")
         this.utilToKey(key, "phone", data, "MaintainerPhone")

+ 15 - 15
src/components/dialogs/addDialog/dialogAssets.vue

@@ -393,17 +393,17 @@ export default {
         if (!!item.Infos.DPSupplierID) {
           item.Infos.DPSupplierID = item.Infos.DPSupplierID.split("-")[0]
         }
-        if (!!item.Infos.DPManufacturerID) {
-          item.Infos.DPManufacturerID = item.Infos.DPManufacturerID.split("-")[0]
+        if (!!item.Infos.dpManufacturerId) {
+          item.Infos.dpManufacturerId = item.Infos.dpManufacturerId.split("-")[0]
         }
         if (!!item.Infos.DPInsurerID) {
           item.Infos.DPInsurerID = item.Infos.DPInsurerID.split("-")[0]
         }
-        if (!!item.Infos.DPMaintainerID) {
-          item.Infos.DPMaintainerID = item.Infos.DPMaintainerID.split("-")[0]
+        if (!!item.Infos.dpMaintainerId) {
+          item.Infos.dpMaintainerId = item.Infos.dpMaintainerId.split("-")[0]
         }
-        if (!!item.Infos.DPSpecificationID) {
-          item.Infos.DPSpecificationID = item.Infos.DPSpecificationID.split("-")[0]
+        if (!!item.Infos.dpSpecificationId) {
+          item.Infos.dpSpecificationId = item.Infos.dpSpecificationId.split("-")[0]
         }
         for (let k in item.Infos) {
           if (item.Infos[k] == "") {
@@ -570,7 +570,7 @@ export default {
         this.dialog.systemType = true
       }
 
-      if (val == "infos.DPManufacturerID") {
+      if (val == "infos.dpManufacturerId") {
         this.myDialog.firm = true;
       }
 
@@ -641,7 +641,7 @@ export default {
         this.myDialog.supplier = true;
       }
 
-      if (val == "infos.DPMaintainerID"
+      if (val == "infos.dpMaintainerId"
       ) {
         this.myDialog.maintainer = true;
       }
@@ -652,7 +652,7 @@ export default {
         this.myDialog.insurer = true;
       }
 
-      if (val == "infos.Maintainer") {
+      if (val == "infos.maintainer") {
         this.myDialog.maintainer = true;
       }
 
@@ -705,12 +705,12 @@ export default {
       for (let key in data) {
         // this.utilToKey(key, "brand", data, "Brand")
         // this.utilToKey(key, "name", data, "Specification")
-        // this.utilToKey(key, "venderName", data, "Manufacturer")
+        // this.utilToKey(key, "venderName", data, "manufacturer")
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name + "/" + data.brand
-          this.utilToKey(key, "venderId", data, "DPManufacturerID")
+          this.utilToKey(key, "venderId", data, "dpManufacturerId")
         }
-        this.utilToKey(key, "specificationId", data, "DPSpecificationID")
+        this.utilToKey(key, "specificationId", data, "dpSpecificationId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -729,7 +729,7 @@ export default {
           console.log(data)
           this.utilToKey(key, "venderId", data, "DPSupplierID")
         }
-        // this.utilToKey(key, "specificationId", data, "DPSpecificationID")
+        // this.utilToKey(key, "specificationId", data, "dpSpecificationId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -774,7 +774,7 @@ export default {
     //维修商变更
     changeMaintainer(data) {
       for (let key in data) {
-        // this.utilToKey(key, "name", data, "Maintainer")
+        // this.utilToKey(key, "name", data, "maintainer")
         // this.utilToKey(key, "email", data, "MaintainerEmail")
         // this.utilToKey(key, "website", data, "MaintainerWeb")
         // this.utilToKey(key, "phone", data, "MaintainerPhone")
@@ -782,7 +782,7 @@ export default {
         // this.utilToKey(key, "man", data, "MaintainerContactor")
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name
-          this.utilToKey(key, "venderId", data, "DPMaintainerID")
+          this.utilToKey(key, "venderId", data, "dpMaintainerId")
         }
       }
       tools.setItem(this.deviceType.code, this.main)

+ 10 - 10
src/components/dialogs/list/batchDialog.vue

@@ -151,19 +151,19 @@ export default {
       firm: [
         {
           name: "生产厂家/品牌型号",
-          code: "DPManufacturerID",
+          code: "dpManufacturerId",
           num: 2,
         }, {
           name: "供应商信息",
-          code: "DPSupplierID",
+          code: "dpSupplierId",
           num: 8
         }, {
           name: "维修商信息",
-          code: "DPMaintainerID",
+          code: "dpMaintainerId",
           num: 35
         }, {
           name: "保险公司信息",
-          code: "DPInsurerID",
+          code: "dpInsurerId",
           num: 42
         }
       ],
@@ -314,8 +314,8 @@ export default {
         return false
       }
       let arr = []
-      // DPSupplierID 供应商 DPManufacturerID 生产商 DPBrandID 品牌
-      // DPSpecificationID 型号 DPInsurerID 保险商 DPMaintainerID 维修商
+      // DPSupplierID 供应商 dpManufacturerId 生产商 dpBrandId 品牌
+      // dpSpecificationId 型号 DPInsurerID 保险商 dpMaintainerId 维修商
       this.multipleSelection.forEach(item => {
         let equipId = item.id
         arr.push({ equipId })
@@ -333,9 +333,9 @@ export default {
             brand: brandName,
             specification: Specification
           }
-          Id.DPManufacturerID = venderId
-          Id.DPBrandID = brandId
-          Id.DPSpecificationID = specificationId
+          Id.dpManufacturerId = venderId
+          Id.dpBrandId = brandId
+          Id.dpSpecificationId = specificationId
         }
       })
       this.checkedCities.filter(item => item.num === 8).forEach(i => {  //供应商8
@@ -355,7 +355,7 @@ export default {
           single.operationMainte = {
             maintainer: name
           }
-          Id.DPMaintainerID = venderId
+          Id.dpMaintainerId = venderId
         }
       })
       let insurance = this.checkedCities.filter(item => item.num === 42)

+ 15 - 15
src/components/ledger/addDialog/dialogAssets.vue

@@ -396,17 +396,17 @@ export default {
         if (!!item.Infos.DPSupplierID) {
           item.Infos.DPSupplierID = item.Infos.DPSupplierID.split("-")[0]
         }
-        if (!!item.Infos.DPManufacturerID) {
-          item.Infos.DPManufacturerID = item.Infos.DPManufacturerID.split("-")[0]
+        if (!!item.Infos.dpManufacturerId) {
+          item.Infos.dpManufacturerId = item.Infos.dpManufacturerId.split("-")[0]
         }
         if (!!item.Infos.DPInsurerID) {
           item.Infos.DPInsurerID = item.Infos.DPInsurerID.split("-")[0]
         }
-        if (!!item.Infos.DPMaintainerID) {
-          item.Infos.DPMaintainerID = item.Infos.DPMaintainerID.split("-")[0]
+        if (!!item.Infos.dpMaintainerId) {
+          item.Infos.dpMaintainerId = item.Infos.dpMaintainerId.split("-")[0]
         }
-        if (!!item.Infos.DPSpecificationID) {
-          item.Infos.DPSpecificationID = item.Infos.DPSpecificationID.split("-")[0]
+        if (!!item.Infos.dpSpecificationId) {
+          item.Infos.dpSpecificationId = item.Infos.dpSpecificationId.split("-")[0]
         }
         for (let k in item.Infos) {
           if (item.Infos[k] == "") {
@@ -574,7 +574,7 @@ export default {
         this.dialog.systemType = true
       }
 
-      if (val == "infos.DPManufacturerID") {
+      if (val == "infos.dpManufacturerId") {
         this.myDialog.firm = true;
       }
 
@@ -646,7 +646,7 @@ export default {
         this.myDialog.supplier = true;
       }
 
-      if (val == "infos.DPMaintainerID"
+      if (val == "infos.dpMaintainerId"
       ) {
         this.myDialog.maintainer = true;
       }
@@ -657,7 +657,7 @@ export default {
         this.myDialog.insurer = true;
       }
 
-      if (val == "infos.Maintainer") {
+      if (val == "infos.maintainer") {
         this.myDialog.maintainer = true;
       }
 
@@ -710,12 +710,12 @@ export default {
       for (let key in data) {
         // this.utilToKey(key, "brand", data, "Brand")
         // this.utilToKey(key, "name", data, "Specification")
-        // this.utilToKey(key, "venderName", data, "Manufacturer")
+        // this.utilToKey(key, "venderName", data, "manufacturer")
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name + "/" + data.brand
-          this.utilToKey(key, "venderId", data, "DPManufacturerID")
+          this.utilToKey(key, "venderId", data, "dpManufacturerId")
         }
-        this.utilToKey(key, "specificationId", data, "DPSpecificationID")
+        this.utilToKey(key, "specificationId", data, "dpSpecificationId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -734,7 +734,7 @@ export default {
           console.log(data)
           this.utilToKey(key, "venderId", data, "DPSupplierID")
         }
-        // this.utilToKey(key, "specificationId", data, "DPSpecificationID")
+        // this.utilToKey(key, "specificationId", data, "dpSpecificationId")
       }
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -779,7 +779,7 @@ export default {
     //维修商变更
     changeMaintainer(data) {
       for (let key in data) {
-        // this.utilToKey(key, "name", data, "Maintainer")
+        // this.utilToKey(key, "name", data, "maintainer")
         // this.utilToKey(key, "email", data, "MaintainerEmail")
         // this.utilToKey(key, "website", data, "MaintainerWeb")
         // this.utilToKey(key, "phone", data, "MaintainerPhone")
@@ -787,7 +787,7 @@ export default {
         // this.utilToKey(key, "man", data, "MaintainerContactor")
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name
-          this.utilToKey(key, "venderId", data, "DPMaintainerID")
+          this.utilToKey(key, "venderId", data, "dpMaintainerId")
         }
       }
       tools.setItem(this.deviceType.code, this.main)

+ 35 - 35
src/components/ledger/handsontables/assets.vue

@@ -906,25 +906,25 @@ export default {
           }
           return false
         //品牌型号弹窗
-        case 'DPManufacturerID':
+        case 'dpManufacturerId':
           if (!this.onlyRead) {
             this.myDialog.firm = true;
           }
           return false
         //供应商信息弹窗
-        case 'DPSupplierID':
+        case 'dpSupplierId':
           if (!this.onlyRead) {
             this.myDialog.supplier = true;
           }
           return false
         //维修商信息弹窗
-        case 'DPMaintainerID':
+        case 'dpMaintainerId':
           if (!this.onlyRead) {
             this.myDialog.maintainer = true;
           }
           return false
         //保险公司信息
-        case 'DPInsurerID':
+        case 'dpInsurerId':
           if (!this.onlyRead) {
             this.myDialog.insurer = true;
           }
@@ -949,7 +949,7 @@ export default {
         case 'LedgerParam.InsuranceDoc.InsuranceNum':
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
-            let DPIdata = this.tableData[row.row].DPInsurerID;
+            let DPIdata = this.tableData[row.row].dpInsurerId;
             if (DPIdata) {
               DPInsurerIDflag = DPIdata.split("-")[0];
             }
@@ -965,12 +965,12 @@ export default {
         case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
         case 'LedgerParam.PhotoDoc.Archive': //设备文档
         case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
-        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.operationMainte.MaintainManual': //维修保养手册
         case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
         case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
         case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
-        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
-        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.equipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.equipManufactor.TestReport': //检测报告
         case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
         case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
         case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
@@ -1108,25 +1108,25 @@ export default {
         this.firmName = firm //批量维护dialog显示对象的字段
       } else {
 
-        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], "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)
         this.handleUpdataTable(
           [
-            [this.row, "DPManufacturerID", null, data.venderId],
-            [this.row, "DPBrandID", null, data.brandId],
-            [this.row, "DPSpecificationID", null, data.specificationId],
-            [this.row, "LedgerParam.EquipManufactor.Manufacturer", null, data.venderName],
-            [this.row, "LedgerParam.EquipManufactor.Brand", null, data.brandName],
-            [this.row, "LedgerParam.EquipManufactor.Specification", null, data.name]
+            [this.row, "dpManufacturerId", null, data.venderId],
+            [this.row, "dpBrandId", null, data.brandId],
+            [this.row, "dpSpecificationId", null, data.specificationId],
+            [this.row, "LedgerParam.equipManufactor.manufacturer", null, data.venderName],
+            [this.row, "LedgerParam.equipManufactor.Brand", null, data.brandName],
+            [this.row, "LedgerParam.equipManufactor.Specification", null, data.name]
           ],
           "edit"
         )
-        // this.handleUpdataTable([[this.row, "LedgerParam.EquipManufactor.Brand", null, data.brand]], "edit")
-        // this.handleUpdataTable([[this.row, "LedgerParam.EquipManufactor.Specification", null, data.name]], "edit")
+        // this.handleUpdataTable([[this.row, "LedgerParam.equipManufactor.Brand", null, data.brand]], "edit")
+        // this.handleUpdataTable([[this.row, "LedgerParam.equipManufactor.Specification", null, data.name]], "edit")
       }
     },
     //保险商变更
@@ -1135,12 +1135,12 @@ export default {
         let firm = { ...data, num: 42 }
         this.firmName = firm
       } else {
-        tools.setDataForKey(this.tableData[this.row], "DPInsurerID", data.venderId)
-        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], "LedgerParam.insuranceDoc.insurer", data.name)
         this.handleUpdataTable(
           [
-            [this.row, "DPInsurerID", null, data.venderId],
-            [this.row, "LedgerParam.InsuranceDoc.Insurer", null, data.name]
+            [this.row, "dpInsurerId", null, data.venderId],
+            [this.row, "LedgerParam.insuranceDoc.insurer", null, data.name]
           ],
           "edit"
         )
@@ -1154,16 +1154,16 @@ export default {
         this.firmName = firm
       } else {
 
-        tools.setDataForKey(this.tableData[this.row], "DPMaintainerID", data.venderId)
-        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], "LedgerParam.operationMainte.maintainer", data.name)
         this.handleUpdataTable(
           [
-            [this.row, "DPMaintainerID", null, data.venderId],
-            [this.row, "LedgerParam.OperationMainte.Maintainer", null, data.name]
+            [this.row, "dpMaintainerId", null, data.venderId],
+            [this.row, "LedgerParam.operationMainte.maintainer", null, data.name]
           ],
           "edit"
         )
-        // this.handleUpdataTable([[this.row, "LedgerParam.OperationMainte.Maintainer", null, data.name]], "edit")
+        // this.handleUpdataTable([[this.row, "LedgerParam.operationMainte.maintainer", null, data.name]], "edit")
       }
     },
     //修改关联的资产
@@ -1252,20 +1252,20 @@ export default {
       this.firmDataType = 'dialog'
       switch (code) {
         //品牌型号弹窗
-        case 'DPManufacturerID':
+        case 'dpManufacturerId':
           // this.dataFirmType = 'dia'
           this.myDialog.firm = true;
           break;
         //供应商信息弹窗
-        case 'DPSupplierID':
+        case 'dpSupplierId':
           this.myDialog.supplier = true;
           break;
         //维修商信息弹窗
-        case 'DPMaintainerID':
+        case 'dpMaintainerId':
           this.myDialog.maintainer = true;
           break;
         //保险公司信息
-        case 'DPInsurerID':
+        case 'dpInsurerId':
           this.myDialog.insurer = true;
           break;
       }

+ 46 - 41
src/components/ledger/handsontables/device.vue

@@ -1014,7 +1014,7 @@ export default {
       let param = [];
       params.map(item => {
         this.deleteCode = item.classCode;
-        param.push({ equipId: item.equipId });
+        param.push({ id: item.id });
       });
       this.$confirm("此操作将删除设备,是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -1115,20 +1115,20 @@ export default {
       this.firmDataType = "dialog";
       switch (code) {
         //品牌型号弹窗
-        case "DPManufacturerID":
+        case "dpManufacturerId":
           // this.dataFirmType = 'dia'
           this.myDialog.firm = true;
           break;
         //供应商信息弹窗
-        case "DPSupplierID":
+        case "dpSupplierId":
           this.myDialog.supplier = true;
           break;
         //维修商信息弹窗
-        case "DPMaintainerID":
+        case "dpMaintainerId":
           this.myDialog.maintainer = true;
           break;
         //保险公司信息
-        case "DPInsurerID":
+        case "dpInsurerId":
           this.myDialog.insurer = true;
           break;
       }
@@ -1341,34 +1341,34 @@ export default {
           }
           return false;
         //品牌型号弹窗
-        case "DPManufacturerID":
+        case "dpManufacturerId":
           if (!this.onlyRead) {
             this.myDialog.firm = true;
           }
           return false;
         //供应商信息弹窗
-        case "DPSupplierID":
+        case "dpSupplierId":
           if (!this.onlyRead) {
             this.myDialog.supplier = true;
           }
           return false;
         //维修商信息弹窗
-        case "DPMaintainerID":
+        case "dpMaintainerId":
           if (!this.onlyRead) {
             this.myDialog.maintainer = true;
           }
           return false;
         //保险公司信息
-        case "DPInsurerID":
+        case "dpInsurerId":
           if (!this.onlyRead) {
             this.myDialog.insurer = true;
           }
           return false;
         //供应合同编号(B1)
-        case "infos.supplierContractID":
+        case "infos.supplierContractId":
           if (!this.onlyRead) {
             let ContractIDflag = null;
-            let DPSdata = this.tableData[row.row].DPSupplierID;
+            let DPSdata = this.tableData[row.row].dpSupplierId;
             if (DPSdata) {
               ContractIDflag = DPSdata.split("-")[0];
             }
@@ -1384,7 +1384,7 @@ export default {
         case "infos.insuranceNum":
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
-            let DPIdata = this.tableData[row.row].DPInsurerID;
+            let DPIdata = this.tableData[row.row].dpInsurerId;
             if (DPIdata) {
               DPInsurerIDflag = DPIdata.split("-")[0];
             }
@@ -1520,18 +1520,18 @@ export default {
       } else {
         tools.setDataForKey(
           this.tableData[this.row],
-          "DPSupplierID",
+          "dpSupplierId",
           data.venderId
         );
         tools.setDataForKey(
           this.tableData[this.row],
-          "infos.SupplyPurchase.Supplier",
+          "infos.supplier",
           data.name
         );
         this.handleUpdataTable(
           [
-            [this.row, "DPSupplierID", null, data.venderId],
-            [this.row, "infos.SupplyPurchase.Supplier", null, data.name]
+            [this.row, "dpSupplierId", null, data.venderId],
+            [this.row, "infos.supplier", null, data.name]
           ],
           "edit"
         );
@@ -1542,7 +1542,7 @@ export default {
     supplyChange(data) {
       tools.setDataForKey(
         this.tableData[this.row],
-        "infos.SupplyPurchase.SupplierContractID",
+        "infos.supplierContractID",
         { id: data }
       );
     },
@@ -1576,62 +1576,67 @@ export default {
         //如果是表格操作
         tools.setDataForKey(
           this.tableData[this.row],
-          "DPManufacturerID",
+          "dpManufacturerId",
           data.venderId
         ); //生产商ID
         tools.setDataForKey(
           this.tableData[this.row],
-          "DPBrandID",
+          "dpBrandId",
           data.brandId
         ); //品牌ID
         tools.setDataForKey(
           this.tableData[this.row],
-          "DPSpecificationID",
+          "dpSpecificationId",
           data.specificationId
         ); //型号ID
         tools.setDataForKey(
           this.tableData[this.row],
-          "infos.testReport",
+          "testReport",
           data.venderName
         );
         tools.setDataForKey(
           this.tableData[this.row],
-          "infos.Brand",
-          data.brandName
+          "infos.manufacturer",
+          data.venderName
         );
         tools.setDataForKey(
           this.tableData[this.row],
-          "infos.specification",
+          "infos.brand",
           data.name
         );
+        tools.setDataForKey(
+          this.tableData[this.row],
+          "infos.specification",
+          data.brandName
+        );
         this.handleUpdataTable(
           [
-            [this.row, "DPManufacturerID", null, data.venderId],
-            [this.row, "DPBrandID", null, data.brandId],
-            [this.row, "DPSpecificationID", null, data.specificationId],
+            [this.row, "dpManufacturerId", null, data.venderId],
+            [this.row, "dpBrandId", null, data.brandId],
+            [this.row, "dpSpecificationId", null, data.specificationId],
             [
               this.row,
-              "infos.EquipManufactor.Manufacturer",
+              "infos.manufacturer",
               null,
               data.venderName
             ],
             [
               this.row,
-              "infos.EquipManufactor.Brand",
+              "infos.brand",
               null,
               data.brandName
             ],
             [
               this.row,
-              "infos.EquipManufactor.Specification",
+              "infos.specification",
               null,
               data.name
             ]
           ],
           "edit"
         );
-        // this.handleUpdataTable([[this.row, "infos.EquipManufactor.Brand", null, data.brand]], "edit")
-        // this.handleUpdataTable([[this.row, "infos.EquipManufactor.Specification", null, data.name]], "edit")
+        // this.handleUpdataTable([[this.row, "infos.equipManufactor.Brand", null, data.brand]], "edit")
+        // this.handleUpdataTable([[this.row, "infos.equipManufactor.Specification", null, data.name]], "edit")
       }
     },
     //保险商变更
@@ -1642,18 +1647,18 @@ export default {
       } else {
         tools.setDataForKey(
           this.tableData[this.row],
-          "DPInsurerID",
+          "dpInsurerId",
           data.venderId
         );
         tools.setDataForKey(
           this.tableData[this.row],
-          "infos.InsuranceDoc.Insurer",
+          "infos.insurer",
           data.name
         );
         this.handleUpdataTable(
           [
-            [this.row, "DPInsurerID", null, data.venderId],
-            [this.row, "infos.InsuranceDoc.Insurer", null, data.name]
+            [this.row, "dpInsurerId", null, data.venderId],
+            [this.row, "infos.insurer", null, data.name]
           ],
           "edit"
         );
@@ -1668,27 +1673,27 @@ export default {
       } else {
         tools.setDataForKey(
           this.tableData[this.row],
-          "DPMaintainerID",
+          "dpMaintainerId",
           data.venderId
         );
         tools.setDataForKey(
           this.tableData[this.row],
-          "infos.OperationMainte.Maintainer",
+          "infos.maintainer",
           data.name
         );
         this.handleUpdataTable(
           [
-            [this.row, "DPMaintainerID", null, data.venderId],
+            [this.row, "dpMaintainerId", null, data.venderId],
             [
               this.row,
-              "infos.OperationMainte.Maintainer",
+              "infos.maintainer",
               null,
               data.name
             ]
           ],
           "edit"
         );
-        // this.handleUpdataTable([[this.row, "infos.OperationMainte.Maintainer", null, data.name]], "edit")
+        // this.handleUpdataTable([[this.row, "infos.operationMainte.maintainer", null, data.name]], "edit")
       }
     },
     //修改关联的资产

+ 2 - 2
src/components/ledger/lib/addDevice.vue

@@ -225,7 +225,7 @@ export default {
         }
 
         if (
-          item.infoPointCode == "Maintainer" ||
+          item.infoPointCode == "maintainer" ||
           item.infoPointCode == "Supplier" ||
           item.infoPointCode == "Insurer" ||
           item.infoPointCode == "InsurerContactor"
@@ -439,7 +439,7 @@ export default {
       }
 
       if (
-        val == "infos.Maintainer" ||
+        val == "infos.maintainer" ||
         val == "infos.Supplier" ||
         val == "infos.Insurer" ||
         val == "infos.InsurerContactor"

+ 17 - 17
src/utils/buildData/buildJson.js

@@ -117,23 +117,23 @@ function updateInsurance(param, success) {
 
 let arr = [{
         name: "生产商",
-        infosArr: ["Manufacturer"],
+        infosArr: ["manufacturer"],
         createFunc: createManufacturer,
         getList: getList,
-        infosKey: "DPManufacturerID",
+        infosKey: "dpManufacturerId",
         update: "",
         updateVender: updateVenderManufacturer,
         options: [{
             key: "vender.name",
             label: "生产商名称",
-            optLabel: "Manufacturer",
+            optLabel: "manufacturer",
             type: "Str"
         }]
     },
     {
         name: "品牌",
         infosArr: ["Brand"],
-        infosKey: "DPBrandID",
+        infosKey: "dpBrandId",
         createFunc: createBrand,
         getList: getManufacturer,
         update: "",
@@ -147,58 +147,58 @@ let arr = [{
     },
     {
         name: "保险商",
-        infosArr: ["Insurer", "InsurerContactor", "InsurerPhone", "InsurerEmail", "InsurerWeb", "InsurerFax"],
+        infosArr: ["insurer", "insurerContactor", "insurerPhone", "insurerEmail", "insurerWeb", "insurerFax"],
         createFunc: createInsurance,
         getList: getList,
-        infosKey: "DPInsurerID",
+        infosKey: "dpInsurerId",
         getWebSite: "",
         updateVender: updateVenderInsurer,
         update: updateInsurance,
         options: [{
                 key: "vender.name",
                 label: "保险公司名称",
-                optLabel: "Insurer",
+                optLabel: "insurer",
                 type: "Str"
             },
             {
                 key: "vender.website",
                 label: "保险公司网址",
-                optLabel: "InsurerWeb",
+                optLabel: "insurerWeb",
                 type: "Str"
             },
             {
                 key: "contact.name",
                 label: "联系人",
-                optLabel: "InsurerContactor",
+                optLabel: "insurerContactor",
                 type: "Str"
             },
             {
                 key: "contact.phone",
                 label: "联系人电话",
-                optLabel: "InsurerPhone",
+                optLabel: "insurerPhone",
                 type: "Num"
             }, {
                 key: "contact.email",
                 label: "联系人邮箱",
-                optLabel: "InsurerEmail",
+                optLabel: "insurerEmail",
                 type: "Str"
             }, {
                 key: "contact.fax",
                 label: "联系人传真",
-                optLabel: "InsurerFax",
+                optLabel: "insurerFax",
                 type: "Str"
             }
         ],
     },
     {
         name: "维修商",
-        infosArr: ["Maintainer", "MaintainerContactor", "MaintainerPhone", "MaintainerEmail", "MaintainerWeb", "MaintainerFax"],
+        infosArr: ["maintainer", "MaintainerContactor", "MaintainerPhone", "MaintainerEmail", "MaintainerWeb", "MaintainerFax"],
         createFunc: createMaintainance,
         updateVender: updateVenderMaintainer,
         options: [{
                 key: "vender.name",
                 label: "维修商单位名称",
-                optLabel: "Maintainer",
+                optLabel: "maintainer",
                 type: "Str"
             },
             {
@@ -231,7 +231,7 @@ let arr = [{
         ],
         getList: getList,
         update: updateMaintainance,
-        infosKey: "DPMaintainerID",
+        infosKey: "dpMaintainerId",
         getWebSite: "",
     },
     {
@@ -275,7 +275,7 @@ let arr = [{
         ],
         getList: getList,
         update: updateSupplier,
-        infosKey: "DPSupplierID",
+        infosKey: "dpSupplierId",
         getWebSite: "",
     },
     {
@@ -287,7 +287,7 @@ let arr = [{
         update: "",
         options: [],
         updateVender: updateVenderSpecification,
-        infosKey: "DPSpecificationID",
+        infosKey: "dpSpecificationId",
         getWebSite: ""
     }
 ]

+ 10 - 10
src/utils/handsontable/mainText.js

@@ -63,21 +63,21 @@ const text = {
     //四大厂商
     idType: (instance, td, row, col, prop, value, cellProperties) => {
         let html = ''
-        let Manufacturer = instance.getDataAtRowProp(row,'LedgerParam.EquipManufactor.Manufacturer')?instance.getDataAtRowProp(row,'LedgerParam.EquipManufactor.Manufacturer'):'空',
-            Brand = instance.getDataAtRowProp(row,'LedgerParam.EquipManufactor.Brand')?instance.getDataAtRowProp(row,'LedgerParam.EquipManufactor.Brand'):'空',
-            Specification = instance.getDataAtRowProp(row,'LedgerParam.EquipManufactor.Specification')?instance.getDataAtRowProp(row,'LedgerParam.EquipManufactor.Specification'):'空';
+        let Manufacturer = instance.getDataAtRowProp(row,'infos.manufacturer') || '空',
+            Brand = instance.getDataAtRowProp(row,'infos.brand') || '空',
+            Specification = instance.getDataAtRowProp(row,'infos.specification') || '空';
         switch (prop){
-            case 'DPManufacturerID':
+            case 'dpManufacturerId':
                 html = Manufacturer + '/' + Brand + '/' + Specification
                 break;
-            case 'DPSupplierID':
-                html = instance.getDataAtRowProp(row,'LedgerParam.SupplyPurchase.Supplier')
+            case 'dpSupplierId':
+                html = instance.getDataAtRowProp(row,'infos.supplier')
                 break;
-            case 'DPMaintainerID':
-                html = instance.getDataAtRowProp(row,'LedgerParam.OperationMainte.Maintainer')
+            case 'dpMaintainerId':
+                html = instance.getDataAtRowProp(row,'infos.maintainer')
                 break;
-            case 'DPInsurerID':
-                html = instance.getDataAtRowProp(row,'LedgerParam.InsuranceDoc.Insurer')
+            case 'dpInsurerId':
+                html = instance.getDataAtRowProp(row,'infos.insurer')
                 break;
             default:
                 break;

+ 36 - 36
src/utils/handsontable/notShow.js

@@ -68,46 +68,46 @@ let firmArr = [
   "insurerPhone", //保险公司联系电话
   'insurerEmail', //保险公司电子邮件
   "insurerWeb", //保险公司网址
-  "insurerFax" //保险公司传真
-  // "DPManufacturerID",//品牌型号Id
-  // "DPSupplierID",//供应商信息Id
-  // "DPMaintainerID",//维修商信息Id
-  // "DPInsurerID"//保险公司信息Id
+  "insurerFax", //保险公司传真
+  // "dpManufacturerId",//品牌型号Id
+  // "dpSupplierId",//供应商信息Id
+  // "dpMaintainerId",//维修商信息Id
+  // "dpInsurerId"//保险公司信息Id
 ]
 
 let cutArr = [{
   name: "品牌型号",
-  code: "DPManufacturerID",
+  code: "dpManufacturerId",
   num: 2,
 }, {
   name: "供应商信息",
-  code: "DPSupplierID",
+  code: "dpSupplierId",
   num: 5
 }, {
   name: "维修商信息",
-  code: "DPMaintainerID",
+  code: "dpMaintainerId",
   num: 19
 }, {
   name: "保险公司信息",
-  code: "DPInsurerID",
+  code: "dpInsurerId",
   num: 25
 }]
 
 let newData = [{
   name: "品牌型号",
-  code: "DPManufacturerID",
+  code: "dpManufacturerId",
   num: 2,
 }, {
   name: "供应商信息",
-  code: "DPSupplierID",
+  code: "dpSupplierId",
   num: 8
 }, {
   name: "维修商信息",
-  code: "DPMaintainerID",
+  code: "dpMaintainerId",
   num: 35
 }, {
   name: "保险公司信息",
-  code: "DPInsurerID",
+  code: "dpInsurerId",
   num: 42
 }]
 //创建部件固定不显示-管理部件固定不显示(即编辑模式)
@@ -126,7 +126,7 @@ let partsAddNoShow = [
   'SupplierEmail',
   'SupplierWeb',
   'SupplierFax',
-  'Maintainer',
+  'maintainer',
   'MaintainerContactor',
   'MaintainerPhone',
   'MaintainerEmail',
@@ -269,14 +269,14 @@ const showTools = {
           arr.splice(item, 0, {
             dataType: "STR",
             firstName: "基本信息",
-            aliasCode: "DPInsurerID",
+            aliasCode: "dpInsurerId",
             aliasName: "保险公司信息",
             name: "保险公司信息",
-            code: "DPInsurerID",
-            origCode: "DPInsurerID",
+            code: "dpInsurerId",
+            origCode: "dpInsurerId",
             origDataType: "Str",
             inputMode: "X",
-            path: "DPInsurerID",
+            path: "dpInsurerId",
             priority: "S",
             editable: true,
             visible: true
@@ -285,14 +285,14 @@ const showTools = {
           arr.splice(item, 0, {
             dataType: "STR",
             firstName: "基本信息",
-            aliasCode: "DPMaintainerID",
+            aliasCode: "dpMaintainerId",
             aliasName: "维修商信息",
             name: "维修商信息",
-            code: "DPMaintainerID",
-            origCode: "DPMaintainerID",
+            code: "dpMaintainerId",
+            origCode: "dpMaintainerId",
             origDataType: "Str",
             inputMode: "X",
-            path: "DPMaintainerID",
+            path: "dpMaintainerId",
             priority: "S",
             editable: true,
             visible: true
@@ -301,14 +301,14 @@ const showTools = {
           arr.splice(item, 0, {
             dataType: "STR",
             firstName: "基本信息",
-            aliasCode: "DPSupplierID",
+            aliasCode: "dpSupplierId",
             aliasName: "供应商信息",
             name: "供应商信息",
-            code: "DPSupplierID",
-            origCode: "DPSupplierID",
+            code: "dpSupplierId",
+            origCode: "dpSupplierId",
             origDataType: "Str",
             inputMode: "X",
-            path: "DPSupplierID",
+            path: "dpSupplierId",
             priority: "S",
             editable: true,
             visible: true
@@ -317,14 +317,14 @@ const showTools = {
           arr.splice(item, 0, {
             dataType: "STR",
             firstName: "基本信息",
-            aliasCode: "DPManufacturerID",
+            aliasCode: "dpManufacturerId",
             aliasName: "生产厂家/品牌/型号",
             name: "生产厂家/品牌/型号",
-            code: "DPManufacturerID",
-            origCode: "DPManufacturerID",
+            code: "dpManufacturerId",
+            origCode: "dpManufacturerId",
             origDataType: "Str",
             inputMode: "X",
-            path: "DPManufacturerID",
+            path: "dpManufacturerId",
             priority: "S",
             editable: true,
             visible: true
@@ -1027,6 +1027,7 @@ const showTools = {
     }
   },
   textFormat(item, onlyRead) {
+    console.log(item.path);
     if (
       // item.code == "EquipQRCode" ||
       // item.code == "RoomQRCode"
@@ -1120,7 +1121,6 @@ const showTools = {
       item.inputMode == "L2" ||
       item.inputMode == "L" ||
       item.inputMode == "M") { //文本输入
-      // console.log(item)
       return {
         data: item.path,
         readOnly: onlyRead
@@ -1183,10 +1183,10 @@ const showTools = {
 
     //四大厂商
     if (
-      item.code == "DPSupplierID" ||
-      item.code == "DPMaintainerID" ||
-      item.code == "DPInsurerID" ||
-      item.code == "DPManufacturerID"
+      item.code == "dpSupplierId" ||
+      item.code == "dpMaintainerId" ||
+      item.code == "dpInsurerId" ||
+      item.code == "dpManufacturerId"
     ) {
       return {
         data: item.path,
@@ -1195,7 +1195,7 @@ const showTools = {
       }
     }
     if (!item.inputMode) {
-      this.$message.error('新版字典不支持')
+      console.log('新版字典无输入类型', item)
     }
 
     if (item.inputMode == "D1" || item.inputMode == "E1" || item.inputMode == "D1L") { //单选输入

+ 13 - 13
src/views/ledger/facility/addfacility.vue

@@ -431,9 +431,9 @@ 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], "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.brandName)
       tools.setDataForKey(this.tableData[this.row], "infos.specification", data.name)
@@ -444,7 +444,7 @@ export default {
     //如果选择供应商之后
     supplierChange(data) {
       tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name)
-      tools.setDataForKey(this.tableData[this.row], "DPSupplierID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId)
     },
     //保险合同
     guaranteeChange(data) {
@@ -469,12 +469,12 @@ export default {
     //维修商变更
     changeMaintainer(data) {
       tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name)
-      tools.setDataForKey(this.tableData[this.row], "DPMaintainerID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId)
     },
     //保险商变更
     changeInsurer(data) {
       tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name)
-      tools.setDataForKey(this.tableData[this.row], "DPInsurerID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId)
     },
     //设备图片弹窗改变事件
     changePics(keys) {
@@ -568,34 +568,34 @@ export default {
           }
           break;
         //品牌型号弹窗
-        case 'DPManufacturerID':
+        case 'dpManufacturerId':
           if (!this.onlyRead) {
             this.myDialog.firm = true;
           }
           break;
         //供应商信息弹窗
-        case 'DPSupplierID':
+        case 'dpSupplierId':
           if (!this.onlyRead) {
             this.myDialog.supplier = true;
           }
           break;
         //维修商信息弹窗
-        case 'DPMaintainerID':
+        case 'dpMaintainerId':
           if (!this.onlyRead) {
             this.myDialog.maintainer = true;
           }
           break;
         //保险公司信息
-        case 'DPInsurerID':
+        case 'dpInsurerId':
           if (!this.onlyRead) {
             this.myDialog.insurer = true;
           }
           break;
         //供应合同编号
-        case 'infos.supplierContractID':
+        case 'infos.supplierContractId':
           if (!this.onlyRead) {
             let ContractIDflag = null;
-            let DPSdata = this.tableData[row.row].DPSupplierID;
+            let DPSdata = this.tableData[row.row].dpSupplierId;
             if (DPSdata) {
               ContractIDflag = DPSdata.split("-")[0];
             }
@@ -611,7 +611,7 @@ export default {
         case 'infos.insuranceNum':
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
-            let DPIdata = this.tableData[row.row].DPInsurerID;
+            let DPIdata = this.tableData[row.row].dpInsurerId;
             if (DPIdata) {
               DPInsurerIDflag = DPIdata.split("-")[0];
             }

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

@@ -318,25 +318,25 @@ export default {
         this.myDialog.systemType = true;
       }
       //品牌型号弹窗
-      if (val == "DPManufacturerID") {
+      if (val == "dpManufacturerId") {
         this.myDialog.firm = true;
       }
       //供应商信息弹窗
-      if (val == "DPSupplierID") {
+      if (val == "dpSupplierId") {
         this.myDialog.supplier = true;
       }
       //维修商信息弹窗
-      if (val == "DPMaintainerID") {
+      if (val == "dpMaintainerId") {
         this.myDialog.maintainer = true;
       }
       //保险公司信息
-      if (val == "DPInsurerID") {
+      if (val == "dpInsurerId") {
         this.myDialog.insurer = true;
       }
       //供应合同编号
       if (val == "LedgerParam.SupplyPurchase.SupplierContractID") {
         let falg = null;
-        let data = this.tableData[row.row].DPSupplierID;
+        let data = this.tableData[row.row].dpSupplierId;
         if (data) {
           falg = data.split("-")[0];
         }
@@ -351,7 +351,7 @@ export default {
       if (val == "LedgerParam.InsuranceDoc.InsuranceNum") {
         //选择保单
         let falg = null;
-        let data = this.tableData[row.row].DPInsurerID;
+        let data = this.tableData[row.row].dpInsurerId;
         if (data) {
           falg = data.split("-")[0];
         }
@@ -367,12 +367,12 @@ export default {
         val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
         val == "LedgerParam.PhotoDoc.Archive" || //设备文档
         val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
-        val == "LedgerParam.OperationMainte.MaintainManual" || //维修保养手册
+        val == "LedgerParam.operationMainte.MaintainManual" || //维修保养手册
         val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
         val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
         val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
-        val == "LedgerParam.EquipManufactor.OriginalCertificate" || //原厂证明
-        val == "LedgerParam.EquipManufactor.TestReport" || //检测报告
+        val == "LedgerParam.equipManufactor.OriginalCertificate" || //原厂证明
+        val == "LedgerParam.equipManufactor.TestReport" || //检测报告
         val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
         val == "LedgerParam.Siteinstall.InstallInstruction" || //
         val == 'LedgerParam.SupplyPurchase.SupplierContract' || //供应合同

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

@@ -358,27 +358,27 @@ 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], "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)
     },
     //供应商变更
     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)
     },
     //保险商变更
     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)
     },
     //维修商变更
     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], "LedgerParam.operationMainte.maintainer", data.name)
+      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId)
     },
     supplyChange(data) {
       tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContractID", { id: data });
@@ -465,25 +465,25 @@ export default {
         this.myDialog.systemType = true;
       }
       //品牌型号弹窗
-      if (val == "DPManufacturerID") {
+      if (val == "dpManufacturerId") {
         this.myDialog.firm = true;
       }
       //供应商信息弹窗
-      if (val == "DPSupplierID") {
+      if (val == "dpSupplierId") {
         this.myDialog.supplier = true;
       }
       //维修商信息弹窗
-      if (val == "DPMaintainerID") {
+      if (val == "dpMaintainerId") {
         this.myDialog.maintainer = true;
       }
       //保险公司信息
-      if (val == "DPInsurerID") {
+      if (val == "dpInsurerId") {
         this.myDialog.insurer = true;
       }
       //供应合同编号
       if (val == "LedgerParam.SupplyPurchase.SupplierContractID") {
         let falg = null;
-        let data = this.tableData[row.row].DPSupplierID;
+        let data = this.tableData[row.row].dpSupplierId;
         if (data) {
           falg = data.split("-")[0];
         }
@@ -498,7 +498,7 @@ export default {
       if (val == "LedgerParam.InsuranceDoc.InsuranceNum") {
         //选择保单
         let falg = null;
-        let data = this.tableData[row.row].DPInsurerID
+        let data = this.tableData[row.row].dpInsurerId
         if (data) {
           falg = data.split("-")[0];
         }
@@ -514,12 +514,12 @@ export default {
         val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
         val == "LedgerParam.PhotoDoc.Archive" || //设备文档
         val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
-        val == "LedgerParam.OperationMainte.MaintainManual" || //维修保养手册
+        val == "LedgerParam.operationMainte.MaintainManual" || //维修保养手册
         val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
         val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
         val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
-        val == "LedgerParam.EquipManufactor.OriginalCertificate" || //原厂证明
-        val == "LedgerParam.EquipManufactor.TestReport" || //检测报告
+        val == "LedgerParam.equipManufactor.OriginalCertificate" || //原厂证明
+        val == "LedgerParam.equipManufactor.TestReport" || //检测报告
         val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
         val == "LedgerParam.Siteinstall.InstallInstruction" || //安装说明书
         val == 'LedgerParam.SupplyPurchase.SupplierContract' || //供应合同

+ 34 - 34
src/views/ledger/facility/partsmanage/index.vue

@@ -486,33 +486,33 @@ 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], "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)
       this.handleUpdataTable(
         [
-          [this.row, "DPManufacturerID", null, data.venderId],
-          [this.row, "DPBrandID", null, data.brandId],
-          [this.row, "DPSpecificationID", null, data.specificationId],
-          [this.row, "LedgerParam.EquipManufactor.Manufacturer", null, data.venderName],
-          [this.row, "LedgerParam.EquipManufactor.Brand", null, data.brandName],
-          [this.row, "LedgerParam.EquipManufactor.Specification", null, data.name]
+          [this.row, "dpManufacturerId", null, data.venderId],
+          [this.row, "dpBrandId", null, data.brandId],
+          [this.row, "dpSpecificationId", null, data.specificationId],
+          [this.row, "LedgerParam.equipManufactor.manufacturer", null, data.venderName],
+          [this.row, "LedgerParam.equipManufactor.Brand", null, data.brandName],
+          [this.row, "LedgerParam.equipManufactor.Specification", null, data.name]
         ],
         "edit"
       )
-      // this.handleUpdataTable([[this.row, "LedgerParam.EquipManufactor.Brand", null, data.brand]], "edit")
-      // this.handleUpdataTable([[this.row, "LedgerParam.EquipManufactor.Specification", null, data.name]], "edit")
+      // this.handleUpdataTable([[this.row, "LedgerParam.equipManufactor.Brand", null, data.brand]], "edit")
+      // this.handleUpdataTable([[this.row, "LedgerParam.equipManufactor.Specification", null, data.name]], "edit")
     },
     //供应商变更
     supplierChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "DPSupplierID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId)
       tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.Supplier", data.name)
       this.handleUpdataTable(
         [
-          [this.row, "DPSupplierID", null, data.venderId],
+          [this.row, "dpSupplierId", null, data.venderId],
           [this.row, "LedgerParam.SupplyPurchase.Supplier", null, data.name]
         ],
         "edit"
@@ -521,12 +521,12 @@ export default {
     },
     //保险商变更
     changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row], "DPInsurerID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId)
       tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.Insurer", data.name)
       this.handleUpdataTable(
         [
-          [this.row, "DPInsurerID", null, data.venderId],
-          [this.row, "LedgerParam.InsuranceDoc.Insurer", null, data.name]
+          [this.row, "dpInsurerId", null, data.venderId],
+          [this.row, "LedgerParam.insuranceDoc.insurer", null, data.name]
         ],
         "edit"
       )
@@ -534,16 +534,16 @@ export default {
     },
     //维修商变更
     changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row], "DPMaintainerID", data.venderId)
-      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], "LedgerParam.operationMainte.maintainer", data.name)
       this.handleUpdataTable(
         [
-          [this.row, "DPMaintainerID", null, data.venderId],
-          [this.row, "LedgerParam.OperationMainte.Maintainer", null, data.name]
+          [this.row, "dpMaintainerId", null, data.venderId],
+          [this.row, "LedgerParam.operationMainte.maintainer", null, data.name]
         ],
         "edit"
       )
-      // this.handleUpdataTable([[this.row, "LedgerParam.OperationMainte.Maintainer", null, data.name]], "edit")
+      // this.handleUpdataTable([[this.row, "LedgerParam.operationMainte.maintainer", null, data.name]], "edit")
     },
     supplyChange(data) {
       tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContractID", { id: data });
@@ -656,25 +656,25 @@ export default {
           }
           break;
         //品牌型号弹窗
-        case 'DPManufacturerID':
+        case 'dpManufacturerId':
           if (!this.onlyRead) {
             this.myDialog.firm = true;
           }
           break;
         //供应商信息弹窗
-        case 'DPSupplierID':
+        case 'dpSupplierId':
           if (!this.onlyRead) {
             this.myDialog.supplier = true;
           }
           break;
         //维修商信息弹窗
-        case 'DPMaintainerID':
+        case 'dpMaintainerId':
           if (!this.onlyRead) {
             this.myDialog.maintainer = true;
           }
           break;
         //保险公司信息
-        case 'DPInsurerID':
+        case 'dpInsurerId':
           if (!this.onlyRead) {
             this.myDialog.insurer = true;
           }
@@ -683,7 +683,7 @@ export default {
         case 'LedgerParam.SupplyPurchase.SupplierContractID':
           if (!this.onlyRead) {
             let ContractIDflag = null;
-            let DPSdata = this.tableData[row.row].DPSupplierID;
+            let DPSdata = this.tableData[row.row].dpSupplierId;
             if (DPSdata) {
               ContractIDflag = DPSdata.split("-")[0];
             }
@@ -696,10 +696,10 @@ export default {
           }
           break;
         //保险单号
-        case 'LedgerParam.InsuranceDoc.InsuranceNum':
+        case 'LedgerParam.insuranceDoc.insuranceNum':
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
-            let DPIdata = this.tableData[row.row].DPInsurerID;
+            let DPIdata = this.tableData[row.row].dpInsurerId;
             if (DPIdata) {
               DPInsurerIDflag = DPIdata.split("-")[0];
             }
@@ -715,12 +715,12 @@ export default {
         case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
         case 'LedgerParam.PhotoDoc.Archive': //设备文档
         case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
-        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.operationMainte.MaintainManual': //维修保养手册
         case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
         case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
         case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
-        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
-        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.equipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.equipManufactor.TestReport': //检测报告
         case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
         case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
         case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同

+ 12 - 12
src/views/ledger/property/addproperty.vue

@@ -292,9 +292,9 @@ 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], "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.brandName)
       tools.setDataForKey(this.tableData[this.row], "infos.specification", data.name)
@@ -305,7 +305,7 @@ export default {
     //如果选择供应商之后
     supplierChange(data) {
       tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name)
-      tools.setDataForKey(this.tableData[this.row], "DPSupplierID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpSupplierId", data.venderId)
     },
     //保险合同
     guaranteeChange(data) {
@@ -330,12 +330,12 @@ export default {
     //维修商变更
     changeMaintainer(data) {
       tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name)
-      tools.setDataForKey(this.tableData[this.row], "DPMaintainerID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpMaintainerId", data.venderId)
     },
     //保险商变更
     changeInsurer(data) {
       tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name)
-      tools.setDataForKey(this.tableData[this.row], "DPInsurerID", data.venderId)
+      tools.setDataForKey(this.tableData[this.row], "dpInsurerId", data.venderId)
     },
     //设备图片弹窗改变事件
     changePics(keys) {
@@ -389,25 +389,25 @@ export default {
       let val = this.tableExample.colToProp(row.col);
       switch (val) {
         //品牌型号弹窗
-        case 'DPManufacturerID':
+        case 'dpManufacturerId':
           if (!this.onlyRead) {
             this.myDialog.firm = true;
           }
           break;
         //供应商信息弹窗
-        case 'DPSupplierID':
+        case 'dpSupplierId':
           if (!this.onlyRead) {
             this.myDialog.supplier = true;
           }
           break;
         //维修商信息弹窗
-        case 'DPMaintainerID':
+        case 'dpMaintainerId':
           if (!this.onlyRead) {
             this.myDialog.maintainer = true;
           }
           break;
         //保险公司信息
-        case 'DPInsurerID':
+        case 'dpInsurerId':
           if (!this.onlyRead) {
             this.myDialog.insurer = true;
           }
@@ -416,7 +416,7 @@ export default {
         case 'infos.supplierContractID':
           if (!this.onlyRead) {
             let ContractIDflag = null;
-            let DPSdata = this.tableData[row.row].DPSupplierID;
+            let DPSdata = this.tableData[row.row].dpSupplierId;
             if (DPSdata) {
               ContractIDflag = DPSdata.split("-")[0];
             }
@@ -432,7 +432,7 @@ export default {
         case 'infos.insuranceNum':
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
-            let DPIdata = this.tableData[row.row].DPInsurerID;
+            let DPIdata = this.tableData[row.row].dpInsurerId;
             if (DPIdata) {
               DPInsurerIDflag = DPIdata.split("-")[0];
             }