From 42148c39bee969828063f7df2052b58e79f194c0 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Sun, 28 Apr 2024 11:16:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=90=8E=20=E5=8F=96=E6=B6=88loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SecondDev/OpinionDialog.vue | 4 ++--
 src/views/secondDev/createFlow.vue         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index 2f77f4f..1ea4027 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -63,7 +63,7 @@
             .join('、');
     }
 
-    function toggleDialog({ isClose, action, callback, onCancel, processId, taskId, nextNodes } = {}) {
+    function toggleDialog({ isClose, action, callback, rejectCancel, processId, taskId, nextNodes } = {}) {
         if (isClose) {
             isOpen.value = false;
             loading.value = false;
@@ -72,7 +72,7 @@
         isOpen.value = true;
         _action.value = action;
         _callback = callback;
-        _onCancel = onCancel;
+        _onCancel = rejectCancel;
         _processId = processId;
         _taskId = taskId;
         _nextNodes = nextNodes;
diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue
index dfcdea7..2740ab8 100644
--- a/src/views/secondDev/createFlow.vue
+++ b/src/views/secondDev/createFlow.vue
@@ -215,13 +215,13 @@ async function approvalCreate() {
     opinionDlg.value.toggleDialog({
         action: 'agree',
         nextNodes,
+        rejectCancel: () => {
+            loading.value = false;
+        },
         callback: (args) => {
             approvalData.approvedContent = args.opinion;
             approvalData.nextTaskUser = args.nextTaskUser;
             onFinish({});
-        },
-        onCancel:() => {
-            loading.value = false
         }
     });
 }