From c1a2185dfa1275e8cbd4c19df8c6b89d31e9c0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Tue, 17 Mar 2026 10:20:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(workflow):=20=E6=B7=BB=E5=8A=A0=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E6=94=BE=E8=A1=8C=E5=8A=9F=E8=83=BD=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在流程实例列表中新增特殊放行列显示 - 在审批对话框中添加特殊放行选择选项 - 初始化审批数据时设置默认特殊放行为否 - 审批提交时传递特殊放行参数到后端 - 移除待办任务列表页面及其相关API接口 - 清理相关的任务管理API调用和方法 --- src/api/workFlow/workFlow.js | 29 -- .../modules/workFlow/flowInstanceList.vue | 24 +- src/views/modules/workFlow/flowTaskList.vue | 472 ------------------ 3 files changed, 21 insertions(+), 504 deletions(-) delete mode 100644 src/views/modules/workFlow/flowTaskList.vue diff --git a/src/api/workFlow/workFlow.js b/src/api/workFlow/workFlow.js index 80501dc..e15ca97 100644 --- a/src/api/workFlow/workFlow.js +++ b/src/api/workFlow/workFlow.js @@ -29,14 +29,6 @@ export const searchUserList = data => createAPI(`/workFlow/template/searchUserLi // 查询部门列表 - rqrq export const searchDepartmentList = data => createAPI(`/workFlow/template/searchDepartmentList`, 'post', data) -// ========== 审批任务相关API - rqrq ========== - -// 查询待办任务列表(所有任务) -export const searchPendingTaskList = data => createAPI(`/workFlow/task/allPendingList`, 'post', data) - -// 查询已办任务列表(所有任务) -export const searchCompletedTaskList = data => createAPI(`/workFlow/task/allCompletedList`, 'post', data) - // ========== 流程实例相关API - rqrq ========== // 查询流程实例列表 @@ -56,24 +48,3 @@ export const getFlowPreview = data => createAPI(`/workFlow/instance/flowPreview` // 重新审批流程实例 - rqrq export const restartFlowInstance = data => createAPI(`/workFlow/instance/restart`, 'post', data) - -// 获取任务详情 -export const getTaskDetail = data => createAPI(`/workFlow/task/detail`, 'post', data) - -// 查询审批记录 -export const getApprovalHistory = data => createAPI(`/workFlow/task/history`, 'post', data) - -// 审批通过 -export const approveTask = data => createAPI(`/workFlow/task/approve`, 'post', data) - -// 审批驳回 -export const rejectTask = data => createAPI(`/workFlow/task/reject`, 'post', data) - -// 启动审批流程 -export const startFlow = data => createAPI(`/workFlow/task/startFlow`, 'post', data) - -// 获取待办任务数量 -export const getPendingTaskCount = data => createAPI(`/workFlow/task/pendingCount`, 'post', data) - -// 撤回审批 -export const withdrawTask = data => createAPI(`/workFlow/task/withdraw`, 'post', data) diff --git a/src/views/modules/workFlow/flowInstanceList.vue b/src/views/modules/workFlow/flowInstanceList.vue index 5733083..6876402 100644 --- a/src/views/modules/workFlow/flowInstanceList.vue +++ b/src/views/modules/workFlow/flowInstanceList.vue @@ -103,14 +103,19 @@ {{ getNodeStatusText(scope.row.status) }} + + + @@ -176,6 +181,16 @@ + + + + + + + + + + @@ -299,6 +314,7 @@ export default { site: '', orderType: '', comment: '', + specialRelease: 'N', flowCode: '', flowVersion: null }, @@ -443,6 +459,7 @@ export default { site: this.currentInstance.site, orderType: this.currentInstance.orderType, comment: '', + specialRelease: 'N', flowCode: this.currentInstance.flowCode, flowVersion: this.currentInstance.flowVersion } @@ -461,7 +478,8 @@ export default { site: this.approveData.site, orderType: this.approveData.orderType, action: action, - comment: this.approveData.comment + comment: this.approveData.comment, + specialRelease: this.approveData.specialRelease }).then(({ data }) => { if (data && data.code === 0) { this.$message.success(action === 'APPROVED' ? '审批通过成功' : '驳回成功') diff --git a/src/views/modules/workFlow/flowTaskList.vue b/src/views/modules/workFlow/flowTaskList.vue deleted file mode 100644 index 7ff2fc9..0000000 --- a/src/views/modules/workFlow/flowTaskList.vue +++ /dev/null @@ -1,472 +0,0 @@ - - - - -