From b2a415728547d5aa0fa77f5653ddb7b8e6a5a8a2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 24 一月 2025 13:08:48 +0800
Subject: [PATCH] !175 发布 5.3.0 新春版 祝大家新年快乐 Merge pull request !175 from 疯狂的狮子Li/dev
---
src/views/workflow/task/taskWaiting.vue | 137 ++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 63 deletions(-)
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 99a1a64..339077d 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -3,15 +3,20 @@
<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>
+ <el-badge :value="userSelectCount" :max="10" class="item">
+ <el-button type="primary" @click="openUserSelect">閫夋嫨鐢宠浜�</el-button>
+ </el-badge>
</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="浠诲姟鍚嶇О" prop="nodeName">
+ <el-input v-model="queryParams.nodeName" 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="flowName">
+ <el-input v-model="queryParams.flowName" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <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,44 +29,38 @@
<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" 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" prop="flowName" align="center" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
+ <el-table-column align="center" prop="flowCode" label="娴佺▼瀹氫箟缂栫爜"></el-table-column>
+ <el-table-column align="center" prop="nodeName" label="浠诲姟鍚嶇О"></el-table-column>
+ <el-table-column align="center" prop="createByName" label="鐢宠浜�"></el-table-column>
+ <el-table-column align="center" label="鍔炵悊浜�">
<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 }}
+ <template v-if="scope.row.assigneeNames">
+ <el-tag v-for="(name, index) in scope.row.assigneeNames.split(',')" :key="index" type="success">
+ {{ name }}
</el-tag>
</template>
<template v-else>
- <el-tag type="success">
- {{ scope.row.assigneeName }}
- </el-tag>
+ <el-tag type="success"> 鏃�</el-tag>
</template>
</template>
</el-table-column>
- <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70">
+ <el-table-column align="center" label="娴佺▼鐘舵��" prop="flowStatusName" min-width="70">
<template #default="scope">
- <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-button v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)"
- type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button>
- <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === true"
- type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">褰掕繕</el-button>
- <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === false"
- type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">璁ら</el-button>
+ <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button>
</template>
</el-table-column>
</el-table>
@@ -73,15 +72,26 @@
@pagination="handleQuery"
/>
</el-card>
+ <!-- 鐢宠浜� -->
+ <UserSelect ref="userSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
</div>
</template>
<script lang="ts" setup>
-import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import { pageByTaskWait } from '@/api/workflow/task';
+import { TaskQuery, FlowTaskVO } 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'));
+import UserSelect from '@/components/UserSelect';
+import { ref } from 'vue';
+import { UserVO } from '@/api/system/user/types';
+
+const userSelectRef = ref<InstanceType<typeof UserSelect>>();
//鎻愪氦缁勪欢
const queryFormRef = ref<ElFormInstance>();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
@@ -96,13 +106,19 @@
const total = ref(0);
// 妯″瀷瀹氫箟琛ㄦ牸鏁版嵁
const taskList = ref([]);
+
+//鐢宠浜篿d
+const selectUserIds = ref<Array<number | string>>([]);
+//鐢宠浜洪�夋嫨鏁伴噺
+const userSelectCount = ref(0);
// 鏌ヨ鍙傛暟
const queryParams = ref<TaskQuery>({
pageNum: 1,
pageSize: 10,
- name: undefined,
- processDefinitionName: undefined,
- processDefinitionKey: undefined
+ nodeName: undefined,
+ flowName: undefined,
+ flowCode: undefined,
+ createByIds: []
});
onMounted(() => {
getWaitingList();
@@ -116,6 +132,9 @@
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.pageSize = 10;
+ queryParams.value.createByIds = [];
+ userSelectCount.value = 0;
+ selectUserIds.value = [];
handleQuery();
};
// 澶氶�夋閫変腑鏁版嵁
@@ -127,42 +146,34 @@
//鍒嗛〉
const getWaitingList = () => {
loading.value = true;
- getPageByTaskWait(queryParams.value).then((resp) => {
+ pageByTaskWait(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
});
};
//鍔炵悊
-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 handleOpen = async (row: FlowTaskVO) => {
+ const routerJumpVo = reactive<RouterJumpVo>({
+ businessId: row.businessId,
+ taskId: row.id,
+ type: 'approval',
+ formCustom: row.formCustom,
+ formPath: row.formPath
+ });
+ workflowCommon.routerJump(routerJumpVo, proxy);
+};
+//鎵撳紑鐢宠浜洪�夋嫨
+const openUserSelect = () => {
+ userSelectRef.value.open();
+};
+//纭閫夋嫨鐢宠浜�
+const userSelectCallBack = (data: UserVO[]) => {
+ userSelectCount.value = 0;
+ if (data && data.length > 0) {
+ userSelectCount.value = data.length;
+ selectUserIds.value = data.map((item) => item.userId);
+ queryParams.value.createByIds = selectUserIds.value;
}
-};
-
-/** 璁ら浠诲姟 */
-const handleClaimTask = async (taskId: string) => {
- loading.value = true;
- await claim(taskId).finally(() => (loading.value = false));
- getWaitingList();
- proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
-};
-
-/** 褰掕繕浠诲姟 */
-const handleReturnTask = async (taskId: string) => {
- loading.value = true;
- await returnTask(taskId).finally(() => (loading.value = false));
- getWaitingList();
- proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
};
</script>
--
Gitblit v1.9.3