From 40a75dae3182cb55b30a2e8093c5eed82465f59c Mon Sep 17 00:00:00 2001 From: LiuHao <liuhaoai545@gmail.com> Date: 星期一, 15 四月 2024 10:40:33 +0800 Subject: [PATCH] fix 修复代码缩进. --- src/views/workflow/task/taskFinish.vue | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index 8be09d1..7c84487 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -30,14 +30,18 @@ <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"> <el-tag type="success"> - {{ scope.row.assigneeName }} + {{ scope.row.assigneeName || '鏃�' }} </el-tag> </template> </el-table-column> @@ -62,6 +66,8 @@ <script lang="ts" setup> import { getPageByTaskFinish } 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 queryFormRef = ref<ElFormInstance>(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -113,15 +119,15 @@ }); }; /** 鏌ョ湅鎸夐挳鎿嶄綔 */ -const handleView = (row) => { - if(row.wfFormDefinitionVo){ - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view` - }) - }else{ - proxy?.$modal.msgError('璇峰埌娴佺▼瀹氫箟鑿滃崟閰嶇疆璺敱锛�'); - } +const handleView = (row: TaskVO) => { + const routerJumpVo = reactive<RouterJumpVo>({ + wfDefinitionConfigVo: row.wfDefinitionConfigVo, + wfNodeConfigVo: row.wfNodeConfigVo, + businessKey: row.businessKey, + taskId: row.id, + type: 'view' + }); + workflowCommon.routerJump(routerJumpVo, proxy); }; onMounted(() => { -- Gitblit v1.9.3