bug修复

src/views/batchRecord/components/editModal.vue

@@ -1305,6 +1305,7 @@
         this.statisticsType = '1';
         this.details = null;
         this.workOrderInfo = null;
+        this.rulesDetail = null;
         this.$nextTick(() => {
           this.$refs.formRef.clearValidate();
           this.visible = false;

src/views/produce/components/prenatalExamination/material.vue

@@ -303,7 +303,7 @@
             prop: 'feedQuantity',
             minWidth: 120,
             formatter: (row) => {
-              return (row.quantity || '') + (row.unit || '');
+              return (row.quantity || 0) + (row.unit || '');
             }
           },
           {
@@ -376,7 +376,7 @@
                     );
 
                   if (!materialQuotaItem) {
-                    return;
+                    return 0 + (row.unit || '');
                   }
 
                   // 计算比例
@@ -758,6 +758,7 @@
             return;
           }
           this.materialQuotaInfo = data;
+          console.log('this.materialQuotaInfo', this.materialQuotaInfo);
         }
       },
       // qualifiedQuantityMax 最大合格数量
@@ -1044,14 +1045,6 @@
             );
             return false;
           }
-
-          // 判断当次合格数量 和 不合格数量 之和需要等于 报工数量
-          if (!item.qualifiedQuantity) {
-            this.$message.warning(
-              `请填写产出清单【${item.categoryName}】的当次合格数量`
-            );
-            return false;
-          }
         }
 
         if (this.outputType == 1) {