diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue index 0fcc739..2f77f4f 100644 --- a/src/components/SecondDev/OpinionDialog.vue +++ b/src/components/SecondDev/OpinionDialog.vue @@ -46,6 +46,7 @@ let _taskId = ''; let _nextNodes = []; let _callback = null; + let _onCancel = null; const formState = reactive({ nextNodeName: '', @@ -62,7 +63,7 @@ .join('、'); } - function toggleDialog({ isClose, action, callback, processId, taskId, nextNodes } = {}) { + function toggleDialog({ isClose, action, callback, onCancel, processId, taskId, nextNodes } = {}) { if (isClose) { isOpen.value = false; loading.value = false; @@ -71,6 +72,7 @@ isOpen.value = true; _action.value = action; _callback = callback; + _onCancel = onCancel; _processId = processId; _taskId = taskId; _nextNodes = nextNodes; @@ -134,6 +136,9 @@ } function onClickCancel() { + if (_onCancel && typeof _onCancel === 'function') { + _onCancel(); + } isOpen.value = false; } diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue index 9a84a98..dfcdea7 100644 --- a/src/views/secondDev/createFlow.vue +++ b/src/views/secondDev/createFlow.vue @@ -219,6 +219,9 @@ async function approvalCreate() { approvalData.approvedContent = args.opinion; approvalData.nextTaskUser = args.nextTaskUser; onFinish({}); + }, + onCancel:() => { + loading.value = false } }); }