Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -428,7 +428,7 @@
                     <el-form-item prop="baseCount" label="基本数量">
                       <el-input
                         placeholder="请输入"
-                        :disabled="isView"
+                        disabled
                         v-model.number="form.baseCount"
                       >
                       </el-input>
@@ -1653,11 +1653,15 @@
         this.resourceBomId = resourceBomId;
         this.attributeData = attributeData;
 
-        if (rowData.baseCount) {
-          this.form.baseCount = rowData.baseCount;
-        } else {
-          this.form.baseCount = 1;
-        }
+        this.form.baseCount = attributeData.baseCount;
+
+        // if (rowData.baseCount) {
+        //   this.form.baseCount = rowData.baseCount;
+        // } else {
+        //   this.form.baseCount = attributeData.baseCount
+        //     ? attributeData.baseCount
+        //     : 1;
+        // }
 
         // if (this.attributeData) {
         //   this.form.baseCount = this.attributeData.baseCount;