diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts index aabdd15..07b183d 100644 --- a/src/api/workflow/task/index.ts +++ b/src/api/workflow/task/index.ts @@ -215,3 +215,14 @@ export const getInstanceVariable = (taskId: string) => { method: 'get' }); }; + +/** + * 获取可驳回得任务节点 + * @returns + */ +export const getTaskNodeList = (processInstanceId: string) => { + return request({ + url: `/workflow/task/getTaskNodeList/${processInstanceId}`, + method: 'get' + }); +}; diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index ead353b..0d7e413 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -28,7 +28,7 @@ 加签 减签 终止 - 退回 + 退回 取消 @@ -38,6 +38,39 @@ + + + + + + + + + + + + 站内信 + 邮件 + 短信 + + + + + + + + + @@ -45,7 +78,7 @@ import { ref } from 'vue'; import { ComponentInternalInstance } from 'vue'; import { ElForm } from 'element-plus'; -import { completeTask, backProcess, getTaskById,transferTask,terminationTask } from '@/api/workflow/task'; +import { completeTask, backProcess, getTaskById,transferTask,terminationTask,getTaskNodeList } from '@/api/workflow/task'; import UserSelect from '@/components/UserSelect'; import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -74,7 +107,11 @@ const selectCopyUserList = ref([]); const selectCopyUserIds = ref(undefined); //是否多选人员 const userMultiple = ref(false); - +// 驳回是否显示 +const backVisible = ref(false); +const backLoading = ref(true); +// 可驳回得任务节点 +const taskNodeList = ref([]); //任务 const task = ref({ id: undefined, @@ -116,6 +153,13 @@ const form = ref>({ messageType: ['1'], wfCopyList: [] }); +const backForm = ref>({ + taskId: undefined, + targetActivityId: undefined, + message: undefined, + variables: {}, + messageType: ['1'] +}); const closeDialog = () => { dialog.visible = false } @@ -165,14 +209,26 @@ const handleCompleteTask = async () => { proxy?.$modal.msgSuccess('操作成功'); }; +/** 驳回弹窗打开 */ +const handleBackProcessOpen = async () => { + backForm.value = {} + backForm.value.messageType = ['1'] + backVisible.value = true + backLoading.value = true + let data = await getTaskNodeList(task.value.processInstanceId) + taskNodeList.value = data.data + backLoading.value = false + backForm.value.targetActivityId = taskNodeList.value[0].nodeId +} /** 驳回流程 */ const handleBackProcess = async () => { - form.value.taskId = taskId.value; + backForm.value.taskId = taskId.value; await proxy?.$modal.confirm('是否确认驳回到申请人?'); loading.value = true; - buttonLoading.value = true; - await backProcess(form.value).finally(() => (loading.value = false)); + backLoading.value = true; + await backProcess(backForm.value).finally(() => (loading.value = false)); dialog.visible = false; + backLoading.value = false emits('submitCallback'); proxy?.$modal.msgSuccess('操作成功'); };