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 } }); }