质检工单合格率不合格率计算更改

src/views/inspectionWork/edit.vue

@@ -262,8 +262,9 @@
           if (!newVal || newVal.length == 0) {
             return;
           }
-          // 计算重量跟数量
-          // this.calculate(newVal);
+          console.log(newVal, 'newVal 12');
+          // 默认赋值质检结果
+          this.setInspectionResults(newVal);
         },
         deep: true,
         immediate: true
@@ -292,6 +293,26 @@
       }
     },
     methods: {
+      setInspectionResults(list) {
+        this.$nextTick(() => {
+          let qualityResults = this.form.qualityResults;
+          let showArrange = this.$refs.baseInfoRefs.showArrange;
+          if (showArrange == '1') return;
+          if (qualityResults == null || qualityResults == undefined) {
+            for (let i = 0; i < list.length; i++) {
+              let el = list[i];
+              if (el.qualityResults == 2) {
+                this.$set(this.form, 'qualityResults', 2);
+                return;
+              }
+            }
+            this.$set(this.form, 'qualityResults', 1);
+            console.log(list, 'list');
+            console.log(this.form.qualityResults, '质检结果');
+          }
+        });
+      },
+
       //
       calculate(list) {
         if (list.length == 0) {
@@ -338,21 +359,34 @@
             sampleNoQualificationRate = sampleNoQualificationRate + '%';
           }
         }
-
         // let resultsTotal = this.form.total - sampleQuantity;
-        if (sampleQuantity == sampleQualifiedNumber) {
-          // this.$set(this.form, 'qualifiedNumber', resultsTotal);
-          // this.$set(this.form, 'noQualifiedNumber', 0);
-          this.$set(this.form, 'qualificationRate', '100%');
-          this.$set(this.form, 'noQualificationRate', '0');
-          this.$set(this.form, 'qualityResults', 1);
-        } else {
-          // this.$set(this.form, 'noQualifiedNumber', resultsTotal);
-          // this.$set(this.form, 'qualifiedNumber', 0);
-          this.$set(this.form, 'qualificationRate', '0');
-          this.$set(this.form, 'noQualificationRate', '100%');
-          this.$set(this.form, 'qualityResults', 2);
-        }
+        // if (sampleQuantity == sampleQualifiedNumber) {
+        //   // this.$set(this.form, 'qualifiedNumber', resultsTotal);
+        //   // this.$set(this.form, 'noQualifiedNumber', 0);
+        //   this.$set(this.form, 'qualificationRate', '100%');
+        //   this.$set(this.form, 'noQualificationRate', '0');
+        //   this.$set(this.form, 'qualityResults', 1);
+        // } else {
+        //   // this.$set(this.form, 'noQualifiedNumber', resultsTotal);
+        //   // this.$set(this.form, 'qualifiedNumber', 0);
+        //   this.$set(this.form, 'qualificationRate', '0');
+        //   this.$set(this.form, 'noQualificationRate', '100%');
+        //   this.$set(this.form, 'qualityResults', 2);
+        // }
+        this.$nextTick(() => {
+          let showArrange = this.$refs.baseInfoRefs.showArrange;
+          if (showArrange != '1' && sampleQuantity == sampleQualifiedNumber) {
+            this.$set(this.form, 'qualificationRate', '100%');
+            this.$set(this.form, 'noQualificationRate', '0');
+            this.$set(this.form, 'qualityResults', 1);
+          }
+
+          if (showArrange != '1' && sampleQuantity != sampleQualifiedNumber) {
+            this.$set(this.form, 'qualificationRate', '0');
+            this.$set(this.form, 'noQualificationRate', '100%');
+            this.$set(this.form, 'qualityResults', 2);
+          }
+        });
 
         // this.$set(this.form, 'resultsTotal', resultsTotal);
         this.$set(
@@ -1391,7 +1425,7 @@
         this.activeName = '2';
         // *** 选完批量质检调用
         // this.countQualityResults();
-        console.log('质检没有 2')
+        console.log('质检没有 2');
         this.$refs.baseInfoRefs.quantityCalculation('noQualifiedNumber');
       },
       // 批量质检
@@ -1804,6 +1838,7 @@
       },
       //计算合格率
       countQualityResults() {
+        console.log(321);
         let sampleList = this.sampleList; //样品清单
         let sampleNumber = this.form.total; //样品总数
         // let qualifiedNumber = sampleList.filter(item => item.qualityResults == 1 || item.qualityResults == 3).length;