From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 14:11:00 +0800
Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签，减签 * update 调整加签，减签 * add 增加流程查看 * update 调整委托，转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务，流程实例 ，流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办，未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例，待办查询 * add 添加代办人，调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow
---
src/views/workflow/task/allTaskWaiting.vue | 271 +++++++++++++++++++++++------------------------------
1 files changed, 118 insertions(+), 153 deletions(-)
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 0bcfd31..1a01be2 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -1,25 +1,19 @@
<template>
<div class="p-2">
- <div class="mb-[10px]">
- <el-card shadow="hover" class="text-center">
- <el-radio-group v-model="tab" @change="changeTab(tab)">
- <el-radio-button value="waiting">寰呭姙浠诲姟</el-radio-button>
- <el-radio-button value="finish">宸插姙浠诲姟</el-radio-button>
- </el-radio-group>
- </el-card>
- </div>
<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">
- <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>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
@@ -32,122 +26,103 @@
<el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">淇敼鍔炵悊浜�</el-button>
+ <el-col :span="1.5" v-if="tab === 'waiting'">
+ <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">淇敼鍔炵悊浜� </el-button>
</el-col>
<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="娴佺▼瀹氫箟鍚嶇О">
- <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 v-if="tab === 'waiting'" #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>
+ <el-tabs v-model="tab" @tab-click="changeTab">
+ <el-tab-pane name="waiting" label="寰呭姙浠诲姟"> </el-tab-pane>
+ <el-tab-pane name="finish" label="宸插姙浠诲姟"> </el-tab-pane>
+ <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" 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="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" prop="createByName" label="鐢宠浜�"></el-table-column>
+ <el-table-column align="center" label="鍔炵悊浜�">
+ <template #default="scope">
+ <template v-if="tab === 'waiting'">
+ <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"> 鏃�</el-tag>
+ </template>
+ </template>
+ <template v-else>
+ <el-tag type="success"> {{ scope.row.approveName }}</el-tag>
+ </template>
</template>
- <template v-else>
- <el-tag type="success">
- {{ scope.row.assigneeName || '鏃�' }}
- </el-tag>
+ </el-table-column>
+ <el-table-column align="center" label="娴佺▼鐘舵��" prop="flowStatus" min-width="70">
+ <template #default="scope">
+ <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
</template>
- </template>
- <template v-else-if="tab === 'finish'" #default="scope">
- <el-tag type="success">
- {{ scope.row.assigneeName || '鏃�' }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
- <template #default="scope">
- <dict-tag v-if="tab === 'waiting'" :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
- <el-tag v-else type="success">宸插畬鎴�</el-tag>
- </template>
- </el-table-column>
- <el-table-column v-if="tab === 'waiting'" align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
- <el-table-column v-if="tab === 'finish'" align="center" prop="startTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" :width="tab === 'finish' ? '80' : '151'">
- <template #default="scope">
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
- </el-col>
- <el-col v-if="tab === 'waiting'" :span="1.5">
- <el-button link type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)">娴佺▼鍙橀噺</el-button>
- </el-col>
- </el-row>
- <el-row v-if="scope.row.multiInstance" :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="Remove" @click="deleteMultiInstanceUser(scope.row)">鍑忕</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="CirclePlus" @click="addMultiInstanceUser(scope.row)">鍔犵</el-button>
- </el-col>
- </el-row>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="total > 0"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- :total="total"
- @pagination="handleQuery"
- />
+ </el-table-column>
+ <el-table-column v-if="tab === 'finish'" align="center" label="浠诲姟鐘舵��" prop="flowTaskStatus" min-width="70">
+ <template #default="scope">
+ <dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></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="tab === 'finish' ? '88' : '188'">
+ <template #default="scope">
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5" v-if="tab === 'waiting' || tab === 'finish'">
+ <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
+ </el-col>
+ <el-col :span="1.5" v-if="tab === 'waiting'">
+ <el-button type="primary" size="small" icon="Setting" @click="handleMeddle(scope.row)">娴佺▼骞查 </el-button>
+ </el-col>
+ </el-row>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total > 0"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ :total="total"
+ @pagination="handleQuery"
+ />
+ </el-tabs>
</el-card>
- <!-- 鍔犵缁勪欢 -->
- <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="handleQuery" />
<!-- 閫変汉缁勪欢 -->
<UserSelect ref="userSelectRef" :multiple="false" @confirm-call-back="submitCallback"></UserSelect>
- <!-- 娴佺▼鍙橀噺寮�濮� -->
- <el-dialog v-model="variableVisible" draggable title="娴佺▼鍙橀噺" width="60%" :close-on-click-modal="false">
- <el-card v-loading="variableLoading" class="box-card">
- <template #header>
- <div class="clearfix">
- <span
- >娴佺▼瀹氫箟鍚嶇О锛�<el-tag>{{ processDefinitionName }}</el-tag></span
- >
- </div>
- </template>
- <div v-for="(v, index) in variableList" :key="index">
- <el-form v-if="v.key !== '_FLOWABLE_SKIP_EXPRESSION_ENABLED'" :label-position="'right'" label-width="150px">
- <el-form-item :label="v.key + '锛�'">
- {{ v.value }}
- </el-form-item>
- </el-form>
- </div>
- </el-card>
- </el-dialog>
- <!-- 娴佺▼鍙橀噺缁撴潫 -->
+ <!-- 閫変汉缁勪欢 -->
+ <processMeddle ref="processMeddleRef" @submitCallback="getWaitingList"></processMeddle>
+ <!-- 鐢宠浜� -->
+ <UserSelect ref="applyUserSelectRef" :multiple="true" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></UserSelect>
</div>
</template>
<script lang="ts" setup>
-import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstanceVariable } from '@/api/workflow/task';
-import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
+import { pageByAllTaskWait, pageByAllTaskFinish, updateAssignee } from '@/api/workflow/task';
import UserSelect from '@/components/UserSelect';
-import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types';
+import { TaskQuery } from '@/api/workflow/task/types';
import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-//瀹℃壒璁板綍缁勪欢
-//鍔犵缁勪欢
-const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
+import processMeddle from '@/components/Process/processMeddle';
+import { UserVO } from '@/api/system/user/types';
+import { TabsPaneContext } from 'element-plus';
//閫変汉缁勪欢
const userSelectRef = ref<InstanceType<typeof UserSelect>>();
-
+//娴佺▼骞查缁勪欢
+const processMeddleRef = ref<InstanceType<typeof processMeddle>>();
+//閫変汉缁勪欢
+const applyUserSelectRef = ref<InstanceType<typeof UserSelect>>();
const queryFormRef = ref<ElFormInstance>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
@@ -163,40 +138,21 @@
// 妯″瀷瀹氫箟琛ㄦ牸鏁版嵁
const taskList = ref([]);
const title = ref('');
-// 娴佺▼鍙橀噺鏄惁鏄剧ず
-const variableVisible = ref(false);
-const variableLoading = ref(true);
-// 娴佺▼鍙橀噺
-const variableList = ref<VariableVo>({
- key: '',
- value: ''
-});
-//娴佺▼瀹氫箟鍚嶇О
-const processDefinitionName = 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: []
});
const tab = ref('waiting');
-//鍔犵
-const addMultiInstanceUser = (row: TaskVO) => {
- if (multiInstanceUserRef.value) {
- title.value = '鍔犵浜哄憳';
- multiInstanceUserRef.value.getAddMultiInstanceList(row.id, []);
- }
-};
-//鍑忕
-const deleteMultiInstanceUser = (row: TaskVO) => {
- if (multiInstanceUserRef.value) {
- title.value = '鍑忕浜哄憳';
- multiInstanceUserRef.value.getDeleteMultiInstanceList(row.id);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
if ('waiting' === tab.value) {
@@ -210,6 +166,8 @@
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.pageSize = 10;
+ queryParams.value.createByIds = [];
+ userSelectCount.value = 0;
handleQuery();
};
// 澶氶�夋閫変腑鏁版嵁
@@ -218,10 +176,10 @@
single.value = selection.length !== 1;
multiple.value = !selection.length;
};
-const changeTab = async (data: string) => {
+const changeTab = async (data: TabsPaneContext) => {
taskList.value = [];
queryParams.value.pageNum = 1;
- if ('waiting' === data) {
+ if ('waiting' === data.paneName) {
getWaitingList();
} else {
getFinishList();
@@ -230,7 +188,7 @@
//鍒嗛〉
const getWaitingList = () => {
loading.value = true;
- getPageByAllTaskWait(queryParams.value).then((resp) => {
+ pageByAllTaskWait(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -238,7 +196,7 @@
};
const getFinishList = () => {
loading.value = true;
- getPageByAllTaskFinish(queryParams.value).then((resp) => {
+ pageByAllTaskFinish(queryParams.value).then((resp) => {
taskList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -260,26 +218,33 @@
proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
}
};
-//鏌ヨ娴佺▼鍙橀噺
-const handleInstanceVariable = async (row: TaskVO) => {
- variableLoading.value = true;
- variableVisible.value = true;
- processDefinitionName.value = row.processDefinitionName;
- let data = await getInstanceVariable(row.id);
- variableList.value = data.data;
- variableLoading.value = false;
-};
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
const handleView = (row) => {
const routerJumpVo = reactive<RouterJumpVo>({
- wfDefinitionConfigVo: row.wfDefinitionConfigVo,
- wfNodeConfigVo: row.wfNodeConfigVo,
- businessKey: row.businessKey,
+ businessId: row.businessId,
taskId: row.id,
- type: 'view'
+ type: 'view',
+ formCustom: row.formCustom,
+ formPath: row.formPath
});
workflowCommon.routerJump(routerJumpVo, proxy);
};
+const handleMeddle = (row) => {
+ processMeddleRef.value.open(row.id);
+};
+//鎵撳紑鐢宠浜洪�夋嫨
+const openUserSelect = () => {
+ applyUserSelectRef.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;
+ }
+};
onMounted(() => {
getWaitingList();
});
--
Gitblit v1.9.3