From f37d45b8998ea08a42002579ecc103244bdac17b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 11:06:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024

---
 src/views/fysp/check/ProCheck.vue |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 30bfb48..f35f1e0 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -253,15 +253,34 @@
     //鑾峰彇浠诲姟闂鐨勫鏍告儏鍐�
     getSubtaskType(s) {
       let type = 0;
+      // 鏃犻棶棰�
       if (s.proNum == 0) {
-        type = 2;
-      } else if (s.proCheckedNum == 0) {
         type = 0;
-      } else if (s.proCheckedNum < s.proNum) {
+      } 
+      // 闂鏈鏍�
+      else if (s.proCheckedNum == 0) {
         type = 1;
-      } else {
+      }
+      // 闂閮ㄥ垎瀹℃牳
+      else if (s.proCheckedNum < s.proNum) {
         type = 2;
       }
+      // 鏈暣鏀� 
+      else if (s.changeNum < s.proNum) {
+        type = 3;
+      }
+      // 鏁存敼鏈鏍�
+      else if (s.changeCheckedNum == 0) {
+        type = 4;
+      }
+      // 鏁存敼閮ㄥ垎瀹℃牳
+      else if (s.changeCheckedNum < s.changeNum) {
+        type = 5;
+      }
+      // 瀹屽叏瀹℃牳
+      else {
+        type = 6;
+      }
       return type;
     },
     //鐐瑰嚮宸︿晶鑿滃崟浠诲姟浜嬩欢

--
Gitblit v1.9.3