From f95f6e8390c355bd601849de26b338bb64c97b90 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: 星期五, 07 六月 2024 21:38:17 +0800 Subject: [PATCH] update 优化审批按钮判断 --- src/components/Process/submitVerify.vue | 234 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 167 insertions(+), 67 deletions(-) diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index ead353b..bcbc657 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -8,36 +8,81 @@ <el-checkbox label="3" name="type">鐭俊</el-checkbox> </el-checkbox-group> </el-form-item> - <el-form-item label="闄勪欢" v-if="task.businessStatus === 'waiting'"> - <fileUpload v-model="form.fileId" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :fileSize="'20'"/> + <el-form-item v-if="task.businessStatus === 'waiting'" label="闄勪欢"> + <fileUpload v-model="form.fileId" :file-type="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :file-size="'20'" /> </el-form-item> <el-form-item label="鎶勯��"> - <el-button type="primary" @click="openUserSelectCopy" icon="Plus" circle /> - <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)"> - {{ user.userName }} - </el-tag> + <el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" /> + <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)"> + {{ user.userName }} + </el-tag> </el-form-item> - <el-form-item label="瀹℃壒鎰忚" v-if="task.businessStatus === 'waiting'"> + <el-form-item v-if="task.businessStatus === 'waiting'" label="瀹℃壒鎰忚"> <el-input v-model="form.message" type="textarea" resize="none" /> </el-form-item> </el-form> <template #footer> <span class="dialog-footer"> - <el-button v-loading="buttonLoading" type="primary" @click="handleCompleteTask"> 鎻愪氦 </el-button> - <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="primary" @click="openTransferTask"> 杞姙 </el-button> - <el-button v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="addMultiInstanceUser"> 鍔犵 </el-button> - <el-button v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="deleteMultiInstanceUser"> 鍑忕 </el-button> - <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="danger" @click="handleTerminationTask"> 缁堟 </el-button> - <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="danger" @click="handleBackProcess"> 閫�鍥� </el-button> - <el-button v-loading="buttonLoading" @click="cancel">鍙栨秷</el-button> + <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 鎻愪氦 </el-button> + <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 濮旀墭 </el-button> + <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 杞姙 </el-button> + <el-button + v-if="task.businessStatus === 'waiting' && task.multiInstance" + :disabled="buttonDisabled" + type="primary" + @click="addMultiInstanceUser" + > + 鍔犵 + </el-button> + <el-button + v-if="task.businessStatus === 'waiting' && task.multiInstance" + :disabled="buttonDisabled" + type="primary" + @click="deleteMultiInstanceUser" + > + 鍑忕 + </el-button> + <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 缁堟 </el-button> + <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 閫�鍥� </el-button> + <el-button :disabled="buttonDisabled" @click="cancel">鍙栨秷</el-button> </span> </template> <!-- 鎶勯�� --> - <UserSelect ref="userSelectCopyRef" :multiple="userMultiple" :data="selectCopyUserIds" @confirm-call-back="userSelectCopyCallBack"></UserSelect> + <UserSelect ref="userSelectCopyRef" :multiple="true" :data="selectCopyUserIds" @confirm-call-back="userSelectCopyCallBack"></UserSelect> <!-- 杞姙 --> - <UserSelect ref="transferTaskRef" :multiple="userMultiple" @confirm-call-back="handleTransferTask"></UserSelect> + <UserSelect ref="transferTaskRef" :multiple="false" @confirm-call-back="handleTransferTask"></UserSelect> + <!-- 濮旀墭 --> + <UserSelect ref="delegateTaskRef" :multiple="false" @confirm-call-back="handleDelegateTask"></UserSelect> <!-- 鍔犵缁勪欢 --> - <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback='closeDialog' /> + <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="closeDialog" /> + + <!-- 椹冲洖寮�濮� --> + <el-dialog v-model="backVisible" draggable title="椹冲洖" width="40%" :close-on-click-modal="false"> + <el-form v-if="task.businessStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px"> + <el-form-item label="椹冲洖鑺傜偣"> + <el-select v-model="backForm.targetActivityId" clearable placeholder="璇烽�夋嫨" style="width: 300px"> + <el-option v-for="item in taskNodeList" :key="item.nodeId" :label="item.nodeName" :value="item.nodeId" /> + </el-select> + </el-form-item> + <el-form-item label="娑堟伅鎻愰啋"> + <el-checkbox-group v-model="backForm.messageType"> + <el-checkbox label="1" name="type" disabled>绔欏唴淇�</el-checkbox> + <el-checkbox label="2" name="type">閭欢</el-checkbox> + <el-checkbox label="3" name="type">鐭俊</el-checkbox> + </el-checkbox-group> + </el-form-item> + <el-form-item label="瀹℃壒鎰忚"> + <el-input v-model="backForm.message" type="textarea" resize="none" /> + </el-form-item> + </el-form> + <template #footer> + <div class="dialog-footer" style="float: right; padding-bottom: 20px"> + <el-button :disabled="backButtonDisabled" type="primary" @click="handleBackProcess">纭</el-button> + <el-button :disabled="backButtonDisabled" @click="backVisible = false">鍙栨秷</el-button> + </div> + </template> + </el-dialog> + <!-- 椹冲洖缁撴潫 --> </el-dialog> </template> @@ -45,7 +90,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, delegateTask } from '@/api/workflow/task'; import UserSelect from '@/components/UserSelect'; import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -53,7 +98,9 @@ import { TaskVO } from '@/api/workflow/task/types'; const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>(); const transferTaskRef = ref<InstanceType<typeof UserSelect>>(); - //鍔犵缁勪欢 +const delegateTaskRef = ref<InstanceType<typeof UserSelect>>(); + +//鍔犵缁勪欢 const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>(); const props = defineProps({ @@ -65,16 +112,19 @@ //閬僵灞� const loading = ref(true); //鎸夐挳 -const buttonLoading = ref(true); +const buttonDisabled = ref(true); //浠诲姟id const taskId = ref<string>(''); //鎶勯�佷汉 const selectCopyUserList = ref<UserVO[]>([]); //鎶勯�佷汉id const selectCopyUserIds = ref<string>(undefined); -//鏄惁澶氶�変汉鍛� -const userMultiple = ref(false); - +// 椹冲洖鏄惁鏄剧ず +const backVisible = ref(false); +const backLoading = ref(true); +const backButtonDisabled = ref(true); +// 鍙┏鍥炲緱浠诲姟鑺傜偣 +const taskNodeList = ref([]); //浠诲姟 const task = ref<TaskVO>({ id: undefined, @@ -100,7 +150,9 @@ processDefinitionName: undefined, processDefinitionKey: undefined, participantVo: undefined, - multiInstance: undefined + multiInstance: undefined, + businessKey: undefined, + wfNodeConfigVo: undefined }); //鍔犵 鍑忕鏍囬 const title = ref(''); @@ -116,24 +168,31 @@ messageType: ['1'], wfCopyList: [] }); +const backForm = ref<Record<string, any>>({ + taskId: undefined, + targetActivityId: undefined, + message: undefined, + variables: {}, + 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; }); }); }; @@ -145,55 +204,75 @@ 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; - await completeTask(form.value).finally(() => (loading.value = false)); - dialog.visible = false; - emits('submitCallback'); - proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); + buttonDisabled.value = true; + try { + await completeTask(form.value); + dialog.visible = false; + emits('submitCallback'); + proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); + } finally { + loading.value = false; + buttonDisabled.value = false; + } }; +/** 椹冲洖寮圭獥鎵撳紑 */ +const handleBackProcessOpen = async () => { + backForm.value = {}; + backForm.value.messageType = ['1']; + backVisible.value = true; + backLoading.value = true; + backButtonDisabled.value = true; + let data = await getTaskNodeList(task.value.processInstanceId); + taskNodeList.value = data.data; + backLoading.value = false; + backButtonDisabled.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; + backButtonDisabled.value = true; + await backProcess(backForm.value).finally(() => (loading.value = false)); dialog.visible = false; + backLoading.value = false; + backButtonDisabled.value = false; emits('submitCallback'); proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); }; //鍙栨秷 const cancel = async () => { dialog.visible = false; - buttonLoading.value = false; + buttonDisabled.value = false; emits('cancelCallback'); }; //鎵撳紑鎶勯�佷汉鍛� const openUserSelectCopy = () => { - userMultiple.value = true userSelectCopyRef.value.open(); }; //纭鎶勯�佷汉鍛� 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; @@ -218,44 +297,65 @@ }; //鎵撳紑杞姙 const openTransferTask = () => { - userMultiple.value = false 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 handleTerminationTask = async (data) => { +//鎵撳紑濮旀墭 +const openDelegateTask = () => { + delegateTaskRef.value.open(); +}; +//濮旀墭 +const handleDelegateTask = async (data) => { + if (data && data.length > 0) { let params = { taskId: taskId.value, - comment: form.value.message - } - await proxy?.$modal.confirm('鏄惁纭缁堟锛�'); + userId: data[0].userId, + nickName: data[0].nickName + }; + await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�'); loading.value = true; - buttonLoading.value = true; - await terminationTask(params).finally(() => (loading.value = false)); + buttonDisabled.value = true; + await delegateTask(params).finally(() => (loading.value = false)); dialog.visible = false; emits('submitCallback'); proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); - -} + } else { + proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�'); + } +}; +//缁堟浠诲姟 +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('鎿嶄綔鎴愬姛'); +}; /** * 瀵瑰鏆撮湶瀛愮粍浠舵柟娉� -- Gitblit v1.9.3