diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue index 1037910..6c47a8a 100644 --- a/src/components/SecondDev/OpinionDialog.vue +++ b/src/components/SecondDev/OpinionDialog.vue @@ -1,7 +1,7 @@ - + @@ -72,6 +72,7 @@ const isEnd = ref(false); let _action = ref('agree'); + const actionType= ref('') let _processId = ''; let _taskId = ''; let flowNextNodes = ref([]); @@ -95,14 +96,15 @@ return flowNextNodes.value.length > 1 ? '多个节点,请确认流向节点' : flowNextNodes?.value[0]?.activityName; } - function toggleDialog({ isClose, action, callback, rejectCancel, processId, taskId, nextNodes } = {}) { - if (isClose) { - isOpen.value = false; - loading.value = false; - return; - } - isOpen.value = true; - _action.value = action; + function toggleDialog({ isClose, action, callback, rejectCancel, processId, taskId, nextNodes,actionFlowType } = {}) { + if (isClose) { + isOpen.value = false; + loading.value = false; + return; + } + isOpen.value = true; + _action.value = action; + actionType.value = actionFlowType _callback = callback; _onCancel = rejectCancel; _processId = processId; diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue index a73ec84..41cda70 100644 --- a/src/views/secondDev/createFlow.vue +++ b/src/views/secondDev/createFlow.vue @@ -10,7 +10,7 @@ 关闭 - + @@ -271,24 +271,20 @@ data.submitLoading = false; return; } - const nextTaskUser = {}; - let arr = (nextNodes[0]?.userList||[]).map(v =>v.F_UserId) - nextTaskUser[nextNodes[0]?.activityId] = arr.join(',') - approvalData.nextTaskUser = nextTaskUser - onFinish({}) - // opinionDlg.value.toggleDialog({ - // action: 'agree', - // nextNodes, - // rejectCancel: () => { - // loading.value = false; - // data.submitLoading = false; - // }, - // callback: (args) => { - // approvalData.approvedContent = args.opinion; - // approvalData.nextTaskUser = args.nextTaskUser; - // onFinish({}); - // } - // }); + opinionDlg.value.toggleDialog({ + action: 'agree', + actionFlowType: 'submit', + nextNodes, + rejectCancel: () => { + loading.value = false; + data.submitLoading = false; + }, + callback: (args) => { + approvalData.approvedContent = args.opinion; + approvalData.nextTaskUser = args.nextTaskUser; + onFinish({}); + } + }); } catch (error) { loading.value = false; data.submitLoading = false; @@ -372,20 +368,6 @@ disableSubmit.value = false } } - async function saveLaunchSubmit () { - Modal.confirm({ - title: '提示', - content: '请确认是否提交流程,提交后流程不能删除', - okText: '确定', - cancelText: '取消', - onOk: () => { - saveLaunch() - }, - onCancel: () => { - - } - }); - } async function saveLaunchNew() { if (!taskId.value && rDraftsId.value != '0') { try {