695593266@qq.com пре 5 месеци
родитељ
комит
17fdec0938
1 измењених фајлова са 16 додато и 15 уклоњено
  1. 16 15
      src/views/produceOrder/workReport.vue

+ 16 - 15
src/views/produceOrder/workReport.vue

@@ -805,26 +805,27 @@
             data: [this.workOrderInfo]
           };
 
-          let resultValue = '0';
-          await parameterGetByCode({
-            code: 'first_article_dual_inspection_for_report'
-          }).then((res) => {
-            resultValue = res.value;
-          });
+          // let resultValue = '0';
+          // await parameterGetByCode({
+          //   code: 'first_article_dual_inspection_for_report'
+          // }).then((res) => {
+          //   resultValue = res.value;
+          // });
 
-          if (resultValue == '1') {
-            const result = await this.checkQualityResult();
-            if (!result) return;
+          // if (resultValue == '1') {
+          const result = await this.checkQualityResult();
+          this.isFinalCheckProduction = false;
+          if (!result) return;
 
-            const firstArticleResult =
-              result.firstArticleDualInspectionResult ?? true;
+          const firstArticleResult =
+            result.firstArticleDualInspectionResult ?? true;
 
-            this.isFinalCheckProduction = firstArticleResult;
+          this.isFinalCheckProduction = firstArticleResult;
 
-            if (!firstArticleResult) {
-              return this.$message.warning('请完成首件两检再报工!');
-            }
+          if (!firstArticleResult) {
+            return this.$message.warning('请完成首件两检再报工!');
           }
+          // }
 
           // const isWorkCenter =
           //   this.$store.state.user.info.workCenterIds.includes(