Переглянути джерело

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu 5 роки тому
батько
коміт
76646e270e

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

@@ -280,7 +280,7 @@ export default {
           readOnly: true
         },
         {
-          data: "PropertyName",
+          data: "PropertyLocalName",
           readOnly: true
         }
       );

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

@@ -208,7 +208,8 @@ export default {
             delete item[key];
           }
         });
-        if (keys.length && Object.keys(item).length) {
+        let newK = Object.keys(item)
+        if ((item.Checked&&newK.length>1) || (!item.Checked&&newK.length)) {
           return item;
         }
       });
@@ -216,13 +217,23 @@ export default {
         this.$message("创建信息为空,请录入信息后再创建!");
         return;
       }
-      let data = {
-        ParentId: this.category.deviceId, //当前设备id
-        Category: this.category.Code //当前部件分类
-      };
+      let flag = false;
+      newData.map(item=>{
+        if(item.Checked&&!item.EquipLocalName){
+          flag = true;
+        }
+      })
+      if (flag) {
+        this.$message.info("存在设备的本地名称为空,请检查")
+        return;
+      }
       let params = { projectId: this.projectId }
 
       for (let i = 0; i < newData.length; i++) {
+        let data = {
+          ParentId: this.category.deviceId, //当前设备id
+          Category: this.category.Code //当前部件分类
+        };
         params.data = Object.assign(data, newData[i]);
         await createPart(params).then(res => {
           let response = res.data;
@@ -358,6 +369,7 @@ export default {
     },
     //选择型号修改
     firmChange(data) {
+      console.log(this.row)
       tools.setDataForKey(this.tableData[this.row],"DPSpecificationID",data.specificationId)
       tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Brand",data.brand)
       tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Specification",data.name)

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

@@ -427,7 +427,7 @@ export default {
           readOnly: true
         },
         {
-          data: "PropertyName",
+          data: "PropertyLocalName",
           readOnly: true
         }
       );