From 891a08847654989c437b0366999ce791f5c703a2 Mon Sep 17 00:00:00 2001
From: lvjunzhao <967725@dms.yudean.com>
Date: Wed, 19 Feb 2025 18:18:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8A=9F=E8=83=BD=20=E6=8A=8AcheckIsAutoAgre?=
 =?UTF-8?q?e=20=E6=96=B9=E6=B3=95=E6=8F=90=E5=87=BA=E6=9D=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/secondDev/approveFlowPage.vue | 40 +++++++++++++++----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue
index df8cb08..4c15173 100644
--- a/src/views/secondDev/approveFlowPage.vue
+++ b/src/views/secondDev/approveFlowPage.vue
@@ -431,24 +431,34 @@
             if (validateSuccess.value || values === 'reject' || values === 'finish') {
                 let params = await getApproveParams();
                 let response = await postApproval(params);
-                // 判断返回值是否带有isAutoAgree 来判断中间是否有自动审批的业务，如有执行判断
-                if (response != null && response.length != 0 && response[0].isAutoAgree == true) {
-                    // 判断待审人员是否包含自己，不包含就直接flowSuccess
-                    if (response[0].approveUserIds.includes(userStore.getUserInfo.id)) {
-                        taskId.value = response[0].taskId;
-                        data.submitLoading = false;
-                        onApproveClick(true);
-                    } else {
-                        flowSuccess();
-                        data.submitLoading = false;
-                    }
-                } else {
-                    flowSuccess();
-                    data.submitLoading = false;
-                }
+                // 判断返回值是否带有isAutoAgree 来判断中间是否有自动审批的业务，如有再执行判断待审人员是否包含自己，不包含就直接flowSuccess
+                if (checkIsAutoAgree(response)) return
+                flowSuccess();
+                data.submitLoading = false;
             }
         } catch (error) {
             flowFail();
         }
     }
+
+    /**
+     * 判断该次审核是否触发自动同意事务，并且检验返回得task 是否是自身作为被审需要弹框再次审核
+     * @param response 
+     */
+     async function checkIsAutoAgree(response) {
+        if (response != null 
+            && response.length != 0 
+            && response[0].isAutoAgree == true //
+            && response[0].approveUserIds.includes(userStore.getUserInfo.id)) {
+            console.error('will reSelect user=', response[0].taskId);
+            // 注入新得taskId
+            taskId.value = response[0].taskId;
+            data.submitLoading = false;
+            onApproveClick(true);
+            return true;
+        } else {
+            return false;
+        }
+        
+    } 
 </script>