From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/workflow/task/taskCopyList.vue | 94 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 112c95b..6224fff 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -3,15 +3,15 @@
<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-item label="浠诲姟鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" @keyup.enter="handleQuery" />
+ <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="浠诲姟鍚嶇О" prop="nodeName">
+ <el-input v-model="queryParams.nodeName" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="娴佺▼瀹氫箟鍚嶇О" label-width="100" prop="processDefinitionName">
- <el-input v-model="queryParams.processDefinitionName" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" @keyup.enter="handleQuery" />
+ <el-form-item label="娴佺▼瀹氫箟鍚嶇О" label-width="100" prop="flowName">
+ <el-input v-model="queryParams.flowName" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="娴佺▼瀹氫箟KEY" label-width="100" prop="processDefinitionKey">
- <el-input v-model="queryParams.processDefinitionKey" placeholder="璇疯緭鍏ユ祦绋嬪畾涔塊EY" @keyup.enter="handleQuery" />
+ <el-form-item label="娴佺▼瀹氫箟缂栫爜" label-width="100" prop="flowCode">
+ <el-input v-model="queryParams.flowCode" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夌紪鐮�" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
@@ -24,38 +24,27 @@
<el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
- <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+ <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
</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" 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" prop="flowName" align="center" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
+ <el-table-column align="center" prop="flowCode" label="娴佺▼瀹氫箟KEY"></el-table-column>
+ <el-table-column align="center" prop="version" label="鐗堟湰鍙�" width="90">
+ <template #default="scope"> v{{ scope.row.version }}.0</template>
+ </el-table-column>
+ <el-table-column align="center" prop="nodeName" label="浠诲姟鍚嶇О"></el-table-column>
+ <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<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">
- {{ item }}
- </el-tag>
- </template>
- <template v-else>
- <el-tag type="success">
- {{ scope.row.assigneeName }}
- </el-tag>
- </template>
+ <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
</template>
</el-table-column>
- <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70">
+ <el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
- <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 +56,18 @@
@pagination="handleQuery"
/>
</el-card>
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
</div>
</template>
<script lang="ts" setup>
-import { getPageByTaskCopy} from '@/api/workflow/task';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import { pageByTaskCopy } 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);
// 閫変腑鏁扮粍
@@ -98,19 +86,10 @@
const queryParams = ref<TaskQuery>({
pageNum: 1,
pageSize: 10,
- name: undefined,
- processDefinitionName: undefined,
- processDefinitionKey: undefined
+ nodeName: undefined,
+ flowName: undefined,
+ flowCode: undefined
});
-onMounted(() => {
- getTaskCopyList();
-});
-//瀹℃壒璁板綍
-const handleApprovalRecord = (row: TaskVO) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(row.processInstanceId);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
getTaskCopyList();
@@ -131,11 +110,26 @@
//鍒嗛〉
const getTaskCopyList = () => {
loading.value = true;
- getPageByTaskCopy(queryParams.value).then((resp) => {
+ pageByTaskCopy(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
});
};
+/** 鏌ョ湅鎸夐挳鎿嶄綔 */
+const handleView = (row) => {
+ const routerJumpVo = reactive<RouterJumpVo>({
+ businessId: row.businessId,
+ taskId: row.id,
+ type: 'view',
+ formCustom: row.formCustom,
+ formPath: row.formPath
+ });
+ workflowCommon.routerJump(routerJumpVo, proxy);
+};
+
+onMounted(() => {
+ getTaskCopyList();
+});
</script>
--
Gitblit v1.9.3