From b3cdb967634dddba8a88bca2550f7e07c9ac262c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 29 十二月 2023 16:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/quality/packageinspect/packageInspect-form.vue |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 4dc8c5c..25ea7fe 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -253,18 +253,23 @@
       changeResult(){
         let result = ''
         let data = this.list
+        let passNum = 0
+        let unPassNum = 0
         if(data){
-          result='鍚堟牸'
           data.forEach(item=>{
             if(item.children){
               item.children.forEach(ele=>{
                 if(ele.result=='涓嶅悎鏍�'){
-                  result='涓嶅悎鏍�'
+                  unPassNum+=1
+                }
+                if(ele.result=='鍚堟牸'){
+                  passNum+=1
                 }
               })
             }
           })
         }
+        result = (passNum+unPassNum)>0 ? unPassNum>0 ? '涓嶅悎鏍�' :'鍚堟牸' : ''
         this.conclusionTable[0].result = result
       },
       //涓婃姤

--
Gitblit v1.9.3