Merge remote-tracking branch 'origin/master'

src/views/productionInfo/ModelDetails.vue

@@ -295,6 +295,7 @@
           <el-col :span="24" :xs="24">
             <div style="float: right;margin: 10px" v-show="materType === '1'">
               <el-button
+                :disabled="addMaterDisabled"
                 class="redBtn"
                 type="danger"
                 size="small"
@@ -497,6 +498,16 @@ export default {
         })
       })
       return num
+    },
+    addMaterDisabled() {
+      console.log(this.form.modelType, 'this.form.modelType')
+      console.log(this.configuringList, 'this.configuringList')
+      if (this.form.modelType === '2') {
+        if (this.configuringList.length > 0) {
+          return true
+        }
+      }
+      return false
     }
   },
   watch: {
@@ -879,7 +890,7 @@ export default {
     },
     // 禁用
     handleSelectionMaterial(selection, row) {
-      if (this.type !== '3' && this.form.modelType === '1') {
+      if (this.type !== '3' && (this.form.modelType === '1' || this.form.modelType === '' || this.form.modelType === null)) {
         if (!selection.some(item => item.businessId === row.businessId)) {
           delete this.addMaterialMap[row.businessId]
         }