Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/itdmDevice/ItdmDeviceList.vue

@@ -332,7 +332,7 @@
           this.loadData();
         })
         }
-      }
+      },
     }
   }
 </script>

itdmWeb/src/views/module-iTDM/itdmDevice/modules/ItdmDeviceForm.vue

@@ -95,11 +95,17 @@
         default: false,
         required: false
       },
+      // 某字段禁用
+      editdisabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
     },
     data () {
       return {
-        //禁止编辑
-        editdisabled: true,
+        // //禁止编辑
+        // editdisabled: true,
         model:{
          },
         labelCol: {
@@ -140,7 +146,7 @@
     },
     methods: {
       add () {
-        this.editdisabled= false
+        // this.editdisabled= false
         this.edit(this.modelDefault);
       },
       edit (record) {

itdmWeb/src/views/module-iTDM/itdmDevice/modules/ItdmDeviceModal.vue

@@ -31,13 +31,19 @@
     },
     methods: {
       add () {
+        this.editdisabled=false
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.add();
         })
       },
       edit (record) {
-        this.editdisabled=true
+        console.log(777,record.izDelete)
+        if (record.izDelete == 1) {
+          this.editdisabled=false
+        } else {
+          this.editdisabled=true
+        }
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.edit(record);