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/taskFinish.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 8bc870f..e6e3d6c 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -37,14 +37,14 @@
<el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�">
<template #default="scope">
<el-tag type="success">
- {{ scope.row.assigneeName }}
+ {{ scope.row.assigneeName || '鏃�'}}
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="startTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">瀹℃壒璁板綍</el-button>
+ <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
</template>
</el-table-column>
</el-table>
@@ -56,17 +56,15 @@
@pagination="handleQuery"
/>
</el-card>
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
</div>
</template>
<script lang="ts" setup>
import { getPageByTaskFinish } from '@/api/workflow/task';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
//瀹℃壒璁板綍缁勪欢
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 閬僵灞�
@@ -91,15 +89,6 @@
processDefinitionName: undefined,
processDefinitionKey: undefined
});
-onMounted(() => {
- getFinishList();
-});
-//瀹℃壒璁板綍
-const handleApprovalRecord = (row: TaskVO) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(row.processInstanceId);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
getFinishList();
@@ -125,4 +114,19 @@
loading.value = false;
});
};
+/** 鏌ョ湅鎸夐挳鎿嶄綔 */
+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(() => {
+ getFinishList();
+});
</script>
--
Gitblit v1.9.3