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/myDocument.vue | 138 +++++++++++++++++++++------------------------
1 files changed, 64 insertions(+), 74 deletions(-)
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 0a2ef19..baee949 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -10,7 +10,7 @@
class="mt-2"
node-key="id"
:data="categoryOptions"
- :props="{ label: 'categoryName', children: 'children' }"
+ :props="{ label: 'label', children: 'children' }"
:expand-on-click-node="false"
:filter-node-method="filterNode"
highlight-current
@@ -24,8 +24,8 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
- <el-form-item label="娴佺▼瀹氫箟鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ユ祦绋嬪畾涔夊悕绉�" @keyup.enter="handleQuery" />
+ <el-form-item label="娴佺▼瀹氫箟缂栫爜" 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>
@@ -46,14 +46,10 @@
<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 v-if="false" align="center" prop="id" label="id"></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="processDefinitionVersion" label="鐗堟湰鍙�" width="90">
- <template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template>
+ <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 v-if="tab === 'running'" align="center" prop="isSuspended" label="鐘舵��" min-width="70">
<template #default="scope">
@@ -63,33 +59,30 @@
</el-table-column>
<el-table-column align="center" label="娴佺▼鐘舵��" 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="startTime" label="鍚姩鏃堕棿" width="160"></el-table-column>
- <el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="缁撴潫鏃堕棿" width="160"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column align="center" prop="createTime" label="鍚姩鏃堕棿" width="160"></el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="162">
<template #default="scope">
- <el-tooltip
- v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
- content="淇敼"
- placement="top"
- >
- <el-button link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
- </el-tooltip>
- <el-tooltip
- v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
- content="鍒犻櫎"
- placement="top"
- >
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
- </el-tooltip>
- <el-tooltip placement="top" content="鏌ョ湅">
- <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
- </el-tooltip>
- <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="鎾ら攢" placement="top">
- <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
- </el-tooltip>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
+ <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row, 'update')">缂栬緫</el-button>
+ </el-col>
+ <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
+ <el-button type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" size="small" icon="View" @click="handleOpen(scope.row, 'view')">鏌ョ湅</el-button>
+ </el-col>
+ <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">
+ <el-button type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)"
+ >鎾ら攢</el-button
+ >
+ </el-col>
+ </el-row>
</template>
</el-table-column>
</el-table>
@@ -109,10 +102,10 @@
</template>
<script lang="ts" setup>
-import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@/api/workflow/processInstance';
-import { listCategory } from '@/api/workflow/category';
-import { CategoryVO } from '@/api/workflow/category/types';
-import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
+import { pageByCurrent, deleteByInstanceIds, cancelProcessApply } from '@/api/workflow/instance';
+import { categoryTree } from '@/api/workflow/category';
+import { CategoryTreeVO } from '@/api/workflow/category/types';
+import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -123,7 +116,8 @@
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
-const businessKeys = ref<Array<any>>([]);
+const businessIds = ref<Array<number | string>>([]);
+const instanceIds = ref<Array<number | string>>([]);
// 闈炲崟涓鐢�
const single = ref(true);
// 闈炲涓鐢�
@@ -133,24 +127,18 @@
// 鎬绘潯鏁�
const total = ref(0);
// 妯″瀷瀹氫箟琛ㄦ牸鏁版嵁
-const processInstanceList = ref<ProcessInstanceVO[]>([]);
+const processInstanceList = ref<FlowInstanceVO[]>([]);
-const categoryOptions = ref<CategoryOption[]>([]);
+const categoryOptions = ref<CategoryTreeVO[]>([]);
const categoryName = ref('');
-
-interface CategoryOption {
- categoryCode: string;
- categoryName: string;
- children?: CategoryOption[];
-}
const tab = ref('running');
// 鏌ヨ鍙傛暟
-const queryParams = ref<ProcessInstanceQuery>({
+const queryParams = ref<FlowInstanceQuery>({
pageNum: 1,
pageSize: 10,
- name: undefined,
- categoryCode: undefined
+ flowCode: undefined,
+ category: undefined
});
onMounted(() => {
@@ -159,10 +147,10 @@
});
/** 鑺傜偣鍗曞嚮浜嬩欢 */
-const handleNodeClick = (data: CategoryVO) => {
- queryParams.value.categoryCode = data.categoryCode;
- if (data.categoryCode === 'ALL') {
- queryParams.value.categoryCode = '';
+const handleNodeClick = (data: CategoryTreeVO) => {
+ queryParams.value.category = data.id;
+ if (data.id === '0') {
+ queryParams.value.category = '';
}
handleQuery();
};
@@ -183,11 +171,8 @@
/** 鏌ヨ娴佺▼鍒嗙被涓嬫媺鏍戠粨鏋� */
const getTreeselect = async () => {
- const res = await listCategory();
- categoryOptions.value = [];
- const data: CategoryOption = { categoryCode: 'ALL', categoryName: '椤剁骇鑺傜偣', children: [] };
- data.children = proxy?.handleTree<CategoryOption>(res.data, 'id', 'parentId');
- categoryOptions.value.push(data);
+ const res = await categoryTree();
+ categoryOptions.value = res.data;
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -197,21 +182,22 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
- queryParams.value.categoryCode = '';
+ queryParams.value.category = '';
queryParams.value.pageNum = 1;
queryParams.value.pageSize = 10;
handleQuery();
};
// 澶氶�夋閫変腑鏁版嵁
-const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
- businessKeys.value = selection.map((item: any) => item.businessKey);
+const handleSelectionChange = (selection: FlowInstanceVO[]) => {
+ businessIds.value = selection.map((item: any) => item.businessId);
+ instanceIds.value = selection.map((item: FlowInstanceVO) => item.id);
single.value = selection.length !== 1;
multiple.value = !selection.length;
};
//鍒嗛〉
const getList = () => {
loading.value = true;
- getPageByCurrent(queryParams.value).then((resp) => {
+ pageByCurrent(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -219,23 +205,27 @@
};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-const handleDelete = async (row: ProcessInstanceVO) => {
- const businessKey = row.businessKey || businessKeys.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎涓氬姟id涓恒��' + businessKey + '銆戠殑鏁版嵁椤癸紵');
+const handleDelete = async (row: FlowInstanceVO) => {
+ const instanceIdList = row.id || instanceIds.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎锛�');
loading.value = true;
if ('running' === tab.value) {
- await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
+ await deleteByInstanceIds(instanceIdList).finally(() => (loading.value = false));
getList();
}
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
};
/** 鎾ら攢鎸夐挳鎿嶄綔 */
-const handleCancelProcessApply = async (businessKey: string) => {
+const handleCancelProcessApply = async (businessId: string) => {
await proxy?.$modal.confirm('鏄惁纭鎾ら攢褰撳墠鍗曟嵁锛�');
loading.value = true;
if ('running' === tab.value) {
- await cancelProcessApply(businessKey).finally(() => (loading.value = false));
+ let data = {
+ businessId: businessId,
+ message: '鐢宠浜烘挙閿�娴佺▼锛�'
+ };
+ await cancelProcessApply(data).finally(() => (loading.value = false));
getList();
}
proxy?.$modal.msgSuccess('鎾ら攢鎴愬姛');
@@ -244,11 +234,11 @@
//鍔炵悊
const handleOpen = async (row, type) => {
const routerJumpVo = reactive<RouterJumpVo>({
- wfDefinitionConfigVo: row.wfDefinitionConfigVo,
- wfNodeConfigVo: row.wfNodeConfigVo,
- businessKey: row.businessKey,
+ businessId: row.businessId,
taskId: row.id,
- type: type
+ type: type,
+ formCustom: row.formCustom,
+ formPath: row.formPath
});
workflowCommon.routerJump(routerJumpVo, proxy);
};
--
Gitblit v1.9.3