Просмотр исходного кода

修复质检工单合格率计算逻辑

yusheng 7 месяцев назад
Родитель
Сommit
fb459e8314
1 измененных файлов с 16 добавлено и 8 удалено
  1. 16 8
      src/views/inspectionWork/edit.vue

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

@@ -133,7 +133,6 @@
     <pickOrderList
       :list="form.orderInfoList"
       v-show="activeComp == 'pickOrderListShow'"
-      
     ></pickOrderList>
     <sampleListDialog
       ref="detailRef"
@@ -406,20 +405,24 @@
         //   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.$nextTick(() => {
+        let showArrange = this.$refs.baseInfoRefs?.showArrange;
+        if (showArrange != '1') {
+          if (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) {
+            //样品数量和样品合格数相等 默认合格率100% 不合格率0% 质检结果合格
+            this.$set(this.form, 'qualifiedNumber', this.form.total);
+            this.$set(this.form, 'noQualifiedNumber', 0);
+          } else {
             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(
@@ -441,10 +444,12 @@
           sampleNoQualifiedNumber
         );
         // 数量赋值
+
         this.quantityAssignment();
       },
       // 计算合格数不合格数
       quantityAssignment() {
+        let showArrange = this.$refs.baseInfoRefs?.showArrange;
         let noQualifiedNumber = 0;
         let qualifiedNumber = 0;
         let data = this.form;
@@ -458,6 +463,9 @@
         }
         this.$set(this.form, 'qualifiedNumber', qualifiedNumber);
         this.$set(this.form, 'noQualifiedNumber', noQualifiedNumber);
+        if (showArrange != '1') {
+          return;
+        }
         this.$set(
           this.form,
           'qualificationRate',