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/taskCopyList.vue | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 6348024..88c38ed 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -28,9 +28,9 @@
</el-row>
</template>
- <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+ <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="50"></el-table-column>
+ <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>
@@ -43,19 +43,19 @@
</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 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>
@@ -67,19 +67,18 @@
@pagination="handleQuery"
/>
</el-card>
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
</div>
</template>
<script lang="ts" setup>
-import { getTaskCopyByPage} from '@/api/workflow/task';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import { getPageByTaskCopy} from '@/api/workflow/task';
+import { TaskQuery } 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;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
@@ -102,15 +101,6 @@
processDefinitionName: undefined,
processDefinitionKey: undefined
});
-onMounted(() => {
- getTaskCopyList();
-});
-//瀹℃壒璁板綍
-const handleApprovalRecord = (row: TaskVO) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(row.processInstanceId);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
getTaskCopyList();
@@ -131,11 +121,27 @@
//鍒嗛〉
const getTaskCopyList = () => {
loading.value = true;
- getTaskCopyByPage(queryParams.value).then((resp) => {
+ getPageByTaskCopy(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
});
};
+/** 鏌ョ湅鎸夐挳鎿嶄綔 */
+const handleView = (row) => {
+ const routerJumpVo = reactive<RouterJumpVo>({
+ wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+ wfNodeConfigVo: row.wfNodeConfigVo,
+ businessKey: row.businessKey,
+ taskId: row.id,
+ type: 'view'
+ });
+ workflowCommon.routerJump(routerJumpVo,proxy)
+};
+
+
+onMounted(() => {
+ getTaskCopyList();
+});
</script>
--
Gitblit v1.9.3