From c206ab5b4a38f99bec4ee34d7b01bbabc83fa120 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 19 六月 2024 14:29:44 +0800 Subject: [PATCH] update 优化 三方登录不同域名问题 采用新方案 --- src/views/workflow/task/taskWaiting.vue | 73 +++++++++++++----------------------- 1 files changed, 27 insertions(+), 46 deletions(-) diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index 99a1a64..dc6546a 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -3,7 +3,7 @@ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <div v-show="showSearch" class="mb-[10px]"> <el-card shadow="hover"> - <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px"> + <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true"> <el-form-item label="浠诲姟鍚嶇О" prop="name"> <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" @keyup.enter="handleQuery" /> </el-form-item> @@ -30,11 +30,15 @@ <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> - <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> - <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�"> + <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column> + <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <template #default="scope"> + <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> + </template> + </el-table-column> + <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> + <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> + <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�"> <template #default="scope"> <template v-if="scope.row.participantVo && scope.row.assignee === null"> <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success"> @@ -43,25 +47,20 @@ </template> <template v-else> <el-tag type="success"> - {{ scope.row.assigneeName }} + {{ scope.row.assigneeName || '鏃�' }} </el-tag> </template> </template> </el-table-column> - <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70"> <template #default="scope"> - <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag> + <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag> </template> </el-table-column> <el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column> <el-table-column label="鎿嶄綔" align="center" width="200"> <template #default="scope"> - <el-button v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)" - type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button> - <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === true" - type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">褰掕繕</el-button> - <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === false" - type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">璁ら</el-button> + <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button> </template> </el-table-column> </el-table> @@ -77,11 +76,14 @@ </template> <script lang="ts" setup> -import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task'; +import { getPageByTaskWait } from '@/api/workflow/task'; import { TaskQuery, TaskVO } from '@/api/workflow/task/types'; +import workflowCommon from '@/api/workflow/workflowCommon'; +import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; +const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status')); //鎻愪氦缁勪欢 const queryFormRef = ref<ElFormInstance>(); -const { proxy } = getCurrentInstance() as ComponentInternalInstance; // 閬僵灞� const loading = ref(true); // 閫変腑鏁扮粍 @@ -135,34 +137,13 @@ }; //鍔炵悊 const handleOpen = async (row: TaskVO) => { - if(row.wfFormDefinitionVo){ - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${row.wfFormDefinitionVo.path}`, - query: { - id: row.businessKey, - type: 'approval', - taskId: row.id - } - }) - }else{ - proxy?.$modal.msgError('璇峰埌娴佺▼瀹氫箟鑿滃崟閰嶇疆璺敱锛�'); - } -}; - -/** 璁ら浠诲姟 */ -const handleClaimTask = async (taskId: string) => { - loading.value = true; - await claim(taskId).finally(() => (loading.value = false)); - getWaitingList(); - proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); -}; - -/** 褰掕繕浠诲姟 */ -const handleReturnTask = async (taskId: string) => { - loading.value = true; - await returnTask(taskId).finally(() => (loading.value = false)); - getWaitingList(); - proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); + const routerJumpVo = reactive<RouterJumpVo>({ + wfDefinitionConfigVo: row.wfDefinitionConfigVo, + wfNodeConfigVo: row.wfNodeConfigVo, + businessKey: row.businessKey, + taskId: row.id, + type: 'approval' + }); + workflowCommon.routerJump(routerJumpVo, proxy); }; </script> -- Gitblit v1.9.3