From ef0c3a4140ba4af8b629838c7a34884e39a64126 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 十一月 2023 13:03:53 +0800
Subject: [PATCH] 	modified:   .gitignore 	modified:   src/views/quality/rawMaterial/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-print.vue 	modified:   vue.config.js

---
 src/views/quality/rawMaterial/rawMaterial-form.vue |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index a432a06..3523721 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -385,9 +385,11 @@
           let resultVal = '1'
           this.list.forEach(item=>{
               if(item.children){
-                if(obj.testState == 0){
-                    resultVal = '0'
-                }
+                item.children.forEach(ele=>{
+                  if(ele.testState == 0){
+                      resultVal = '0'
+                  }
+                })
               }
           })
           this.resultVal = resultVal
@@ -417,13 +419,15 @@
           number: this.unqualifiedNum,
         }
         updateRawInspectsById(data).then(res => {
-          if(res.data.code == 0){
+          if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
             sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
             this.$message.success("涓婃姤鎴愬姛");
-            this.dialogVisible = false
+          }else{
+            this.$message.error("涓婃姤澶辫触锛�",res.data.data);
           }
+          this.dialogVisible = false
+          this.checkTestState()
         });
-        this.checkTestState()
       },
       addTeatValueColumn(){
         this.empiricalValueAdd = this.empiricalValueAdd + 1;
@@ -490,7 +494,6 @@
         }
       },
       updateTestValue(row,index){
-        console.log(row);
         if(row.rpId == null){
           return
         }
@@ -582,7 +585,6 @@
         }
       },
       changeState(row, index) {
-          console.log(row)
           if (row.rpId != null && row.rpId != '') {
             let val = row.testValueList.join(",")
             if (val === undefined || val === '' || val === null) {

--
Gitblit v1.9.3