From b0087d1a50b45c64669f15bd0996f858cb46b086 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 01 四月 2024 20:59:52 +0800
Subject: [PATCH] #I96DTG update 类型下拉框和java类名下拉框没有联动
---
src/views/workflow/task/taskWaiting.vue | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 99a1a64..5eb6d83 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -43,14 +43,14 @@
</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>
@@ -79,9 +79,12 @@
<script lang="ts" setup>
import { getPageByTaskWait, claim, returnTask } 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,19 +138,14 @@
};
//鍔炵悊
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 routerJumpVo = reactive<RouterJumpVo>({
+ wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+ wfNodeConfigVo: row.wfNodeConfigVo,
+ businessKey: row.businessKey,
+ taskId: row.id,
+ type: 'approval'
+ });
+ workflowCommon.routerJump(routerJumpVo,proxy)
};
/** 璁ら浠诲姟 */
--
Gitblit v1.9.3