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 | 135 +++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 72 deletions(-) diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index c9f068a..339077d 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -4,14 +4,19 @@ <div v-show="showSearch" class="mb-[10px]"> <el-card shadow="hover"> <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true"> - <el-form-item label="浠诲姟鍚嶇О" prop="name"> - <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" @keyup.enter="handleQuery" /> + <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,66 +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 align="center" type="index" label="搴忓彿" width="60"></el-table-column> - <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О"> + <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"> - <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span> - </template> - </el-table-column> - <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column> - <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column> - <el-table-column align="center" prop="assigneeName" 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" label="娴佺▼鐘舵��" min-width="70"> + <el-table-column align="center" label="娴佺▼鐘舵��" prop="flowStatusName" min-width="70"> <template #default="scope"> - <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-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> @@ -95,16 +72,24 @@ @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>(); // 閬僵灞� @@ -121,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(); @@ -141,6 +132,9 @@ queryFormRef.value?.resetFields(); queryParams.value.pageNum = 1; queryParams.value.pageSize = 10; + queryParams.value.createByIds = []; + userSelectCount.value = 0; + selectUserIds.value = []; handleQuery(); }; // 澶氶�夋閫変腑鏁版嵁 @@ -152,37 +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) => { +const handleOpen = async (row: FlowTaskVO) => { const routerJumpVo = reactive<RouterJumpVo>({ - wfDefinitionConfigVo: row.wfDefinitionConfigVo, - wfNodeConfigVo: row.wfNodeConfigVo, - businessKey: row.businessKey, + businessId: row.businessId, taskId: row.id, - type: 'approval' + type: 'approval', + formCustom: row.formCustom, + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; - -/** 璁ら浠诲姟 */ -const handleClaimTask = async (taskId: string) => { - loading.value = true; - await claim(taskId).finally(() => (loading.value = false)); - getWaitingList(); - proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); +//鎵撳紑鐢宠浜洪�夋嫨 +const openUserSelect = () => { + userSelectRef.value.open(); }; - -/** 褰掕繕浠诲姟 */ -const handleReturnTask = async (taskId: string) => { - loading.value = true; - await returnTask(taskId).finally(() => (loading.value = false)); - getWaitingList(); - proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛'); +//纭閫夋嫨鐢宠浜� +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; + } }; </script> -- Gitblit v1.9.3