Selaa lähdekoodia

优化质检工单计算逻辑,新增noSetSampleList参数控制样品清单更新

yusheng 9 kuukautta sitten
vanhempi
commit
151067c327

+ 2 - 2
src/views/inspectionWork/components/baseInfo.vue

@@ -515,7 +515,7 @@
           this.form[val].replace(/[^\d]/g, '').replace(/^0+/, '') || '0';
       },
       // *** 计算合格数 不合格数
-      quantityCalculation(e) {
+      quantityCalculation(e,noSetSampleList) {
         console.log(this.form,'执行没有');
         // return
         // return
@@ -543,7 +543,7 @@
         let failureRate = ((noQualifiedNumber / total) * 100).toFixed(2);
         this.form.qualificationRate = passRate + '%';
         this.form.noQualificationRate = failureRate + '%';
-         if (this.form.qualityMode == 1 && this.form.isUnpack == 2) {
+         if (this.form.qualityMode == 1 && this.form.isUnpack == 2&&!noSetSampleList) {
           this.$emit('quantityCalculation', qualifiedNumber);
         }
         return true;

+ 1 - 1
src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -858,7 +858,7 @@
           data['measureQuantity'] = 1;
           data['qualityResults'] = 2;
           data['qualityStatus'] = 1;
-          
+          data['qualitySampleTemplateList'] = [];
           data['id'] = '';
           data['weight'] = parseFloat(weight).toFixed(2);
           arr.push(data);

+ 16 - 9
src/views/inspectionWork/edit.vue

@@ -1250,8 +1250,7 @@
             }
           });
         }
-        console.log(selectedData,'selectedData')
-        
+        console.log(selectedData, 'selectedData');
 
         this.$refs.detailRef.openDia(
           index,
@@ -1439,15 +1438,20 @@
           }
         } else {
           this.$set(this, 'sampleList', list);
+
           // console.log(this.sampleList, 'this.sampleList');
           // return
           // this.sampleList = list;
           this.calculate(this.sampleList);
+          console.log(this.sampleList, 'this.sampleList');
         }
         this.activeName = '2';
         // *** 选完批量质检调用
         // this.countQualityResults();
-        this.$refs.baseInfoRefs.quantityCalculation('noQualifiedNumber');
+        this.$refs.baseInfoRefs.quantityCalculation(
+          'noQualifiedNumber',
+          'noSetSampleList'
+        );
         console.log('质检没有 2');
       },
       // 批量质检
@@ -1468,20 +1472,23 @@
         }
 
         if (this.schemeList.length != 0) {
-          // alert(1)
-
           this.sampleList.forEach((item, index) => {
             if (item.qualitySampleTemplateList.length == 0) {
-              let arr=JSON.parse(JSON.stringify(this.schemeList))
+              let arr = JSON.parse(JSON.stringify(this.schemeList));
               arr.forEach((el) => {
                 el.qualityResults = item.qualityResults;
               });
-           console.log(arr,'aaa')
-              this.$set(this.sampleList[index], 'qualitySampleTemplateList', arr);
+
+              this.$set(
+                this.sampleList[index],
+                'qualitySampleTemplateList',
+                arr
+              );
             }
           });
         }
-  
+        console.log(this.sampleList, 'dsds');
+
         this.$refs.detailRef.openDia(
           null,
           null,