diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index d71b855..b253276 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -8,29 +8,43 @@ 短信 - - + + - - - {{ user.userName }} - + + + {{ user.userName }} + - + @@ -40,19 +54,14 @@ - + - + - - + + @@ -67,8 +76,8 @@ @@ -81,7 +90,7 @@ import { ref } from 'vue'; import { ComponentInternalInstance } from 'vue'; import { ElForm } from 'element-plus'; -import { completeTask, backProcess, getTaskById,transferTask,terminationTask,getTaskNodeList,delegateTask } from '@/api/workflow/task'; +import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getTaskNodeList, delegateTask } from '@/api/workflow/task'; import UserSelect from '@/components/UserSelect'; import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -91,7 +100,7 @@ const userSelectCopyRef = ref>(); const transferTaskRef = ref>(); const delegateTaskRef = ref>(); - //加签组件 +//加签组件 const multiInstanceUserRef = ref>(); const props = defineProps({ @@ -103,7 +112,7 @@ const props = defineProps({ //遮罩层 const loading = ref(true); //按钮 -const buttonLoading = ref(true); +const buttonDisabled = ref(true); //任务id const taskId = ref(''); //抄送人 @@ -166,23 +175,23 @@ const backForm = ref>({ messageType: ['1'] }); const closeDialog = () => { - dialog.visible = false -} + dialog.visible = false; +}; //打开弹窗 const openDialog = (id?: string) => { - selectCopyUserIds.value = undefined - selectCopyUserList.value = [] - form.value.fileId = undefined + selectCopyUserIds.value = undefined; + selectCopyUserList.value = []; + form.value.fileId = undefined; taskId.value = id; form.value.message = undefined; dialog.visible = true; loading.value = true; - buttonLoading.value = true; + buttonDisabled.value = true; nextTick(() => { getTaskById(taskId.value).then((response) => { task.value = response.data; loading.value = false; - buttonLoading.value = false; + buttonDisabled.value = false; }); }); }; @@ -194,42 +203,42 @@ const emits = defineEmits(['submitCallback', 'cancelCallback']); const handleCompleteTask = async () => { form.value.taskId = taskId.value; form.value.taskVariables = props.taskVariables; - if(selectCopyUserList && selectCopyUserList.value.length > 0){ - let wfCopyList = [] - selectCopyUserList.value.forEach( e=> { + if (selectCopyUserList.value && selectCopyUserList.value.length > 0) { + let wfCopyList = []; + selectCopyUserList.value.forEach((e) => { let copyUser = { userId: e.userId, userName: e.nickName - } - wfCopyList.push(copyUser) - }) - form.value.wfCopyList = wfCopyList + }; + wfCopyList.push(copyUser); + }); + form.value.wfCopyList = wfCopyList; } await proxy?.$modal.confirm('是否确认提交？'); loading.value = true; - buttonLoading.value = true; + buttonDisabled.value = true; try { await completeTask(form.value); dialog.visible = false; emits('submitCallback'); proxy?.$modal.msgSuccess('操作成功'); } finally { - loading.value = false - buttonLoading.value = false + loading.value = false; + buttonDisabled.value = false; } }; /** 驳回弹窗打开 */ 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 -} + 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 () => { backForm.value.taskId = taskId.value; @@ -238,14 +247,14 @@ const handleBackProcess = async () => { backLoading.value = true; await backProcess(backForm.value).finally(() => (loading.value = false)); dialog.visible = false; - backLoading.value = false + backLoading.value = false; emits('submitCallback'); proxy?.$modal.msgSuccess('操作成功'); }; //取消 const cancel = async () => { dialog.visible = false; - buttonLoading.value = false; + buttonDisabled.value = false; emits('cancelCallback'); }; //打开抄送人员 @@ -254,11 +263,11 @@ const openUserSelectCopy = () => { }; //确认抄送人员 const userSelectCopyCallBack = (data: UserVO[]) => { - if(data && data.length > 0){ - selectCopyUserList.value = data + if (data && data.length > 0) { + selectCopyUserList.value = data; selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(','); } -} +}; //删除抄送人员 const handleCopyCloseTag = (user: UserVO) => { const userId = user.userId; @@ -286,63 +295,62 @@ const openTransferTask = () => { transferTaskRef.value.open(); }; //转办 -const handleTransferTask = async (data) => { - if(data && data.length > 0){ +const handleTransferTask = async (data) => { + if (data && data.length > 0) { let params = { taskId: taskId.value, userId: data[0].userId, comment: form.value.message - } + }; await proxy?.$modal.confirm('是否确认提交？'); loading.value = true; - buttonLoading.value = true; + buttonDisabled.value = true; await transferTask(params).finally(() => (loading.value = false)); dialog.visible = false; emits('submitCallback'); proxy?.$modal.msgSuccess('操作成功'); - }else{ + } else { proxy?.$modal.msgWarning('请选择用户！'); } -} +}; //打开委托 const openDelegateTask = () => { delegateTaskRef.value.open(); }; //委托 -const handleDelegateTask = async (data) => { - if(data && data.length > 0){ +const handleDelegateTask = async (data) => { + if (data && data.length > 0) { let params = { taskId: taskId.value, userId: data[0].userId, nickName: data[0].nickName - } + }; await proxy?.$modal.confirm('是否确认提交？'); loading.value = true; - buttonLoading.value = true; + buttonDisabled.value = true; await delegateTask(params).finally(() => (loading.value = false)); dialog.visible = false; emits('submitCallback'); proxy?.$modal.msgSuccess('操作成功'); - }else{ + } else { proxy?.$modal.msgWarning('请选择用户！'); } -} +}; //终止任务 -const handleTerminationTask = async (data) => { - let params = { - taskId: taskId.value, - comment: form.value.message - } - await proxy?.$modal.confirm('是否确认终止？'); - loading.value = true; - buttonLoading.value = true; - await terminationTask(params).finally(() => (loading.value = false)); - dialog.visible = false; - emits('submitCallback'); - proxy?.$modal.msgSuccess('操作成功'); - -} +const handleTerminationTask = async (data) => { + let params = { + taskId: taskId.value, + comment: form.value.message + }; + await proxy?.$modal.confirm('是否确认终止？'); + loading.value = true; + buttonDisabled.value = true; + await terminationTask(params).finally(() => (loading.value = false)); + dialog.visible = false; + emits('submitCallback'); + proxy?.$modal.msgSuccess('操作成功'); +}; /** * 对外暴露子组件方法