!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
2025-01-13 06:11:00 +00:00
parent 100f44e197
commit e423d8afcf
78 changed files with 1955 additions and 8762 deletions
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -1,15 +1,15 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import { TaskQuery, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';

 /**
 * 查询待办列表
 * @param query
 * @returns {*}
 */
-export const getPageByTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
  return request({
-    url: '/workflow/task/getPageByTaskWait',
+    url: '/workflow/task/pageByTaskWait',
    method: 'get',
    params: query
  });
@@ -20,9 +20,9 @@ export const getPageByTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
 * @param query
 * @returns {*}
 */
-export const getPageByTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
  return request({
-    url: '/workflow/task/getPageByTaskFinish',
+    url: '/workflow/task/pageByTaskFinish',
    method: 'get',
    params: query
  });
@@ -33,9 +33,9 @@ export const getPageByTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> =>
 * @param query
 * @returns {*}
 */
-export const getPageByTaskCopy = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByTaskCopy = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
  return request({
-    url: '/workflow/task/getPageByTaskCopy',
+    url: '/workflow/task/pageByTaskCopy',
    method: 'get',
    params: query
  });
@@ -46,9 +46,9 @@ export const getPageByTaskCopy = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
 * @param query
 * @returns {*}
 */
-export const getPageByAllTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByAllTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
  return request({
-    url: '/workflow/task/getPageByAllTaskWait',
+    url: '/workflow/task/pageByAllTaskWait',
    method: 'get',
    params: query
  });
@@ -59,9 +59,9 @@ export const getPageByAllTaskWait = (query: TaskQuery): AxiosPromise<TaskVO[]> =
 * @param query
 * @returns {*}
 */
-export const getPageByAllTaskFinish = (query: TaskQuery): AxiosPromise<TaskVO[]> => {
+export const pageByAllTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
  return request({
-    url: '/workflow/task/getPageByAllTaskFinish',
+    url: '/workflow/task/pageByAllTaskFinish',
    method: 'get',
    params: query
  });
@@ -93,30 +93,6 @@ export const completeTask = (data: object) => {
  });
 };

-/**
- * 认领任务
- * @param taskId
- * @returns {*}
- */
-export const claim = (taskId: string): any => {
-  return request({
-    url: '/workflow/task/claim/' + taskId,
-    method: 'post'
-  });
-};
-
-/**
- * 归还任务
- * @param taskId
- * @returns {*}
- */
-export const returnTask = (taskId: string): any => {
-  return request({
-    url: '/workflow/task/returnTask/' + taskId,
-    method: 'post'
-  });
-};
-
 /**
 * 任务驳回
 * @param data
@@ -135,61 +111,24 @@ export const backProcess = (data: any): any => {
 * @param taskId
 * @returns
 */
-export const getTaskById = (taskId: string) => {
+export const getTask = (taskId: string) => {
  return request({
-    url: '/workflow/task/getTaskById/' + taskId,
+    url: '/workflow/task/getTask/' + taskId,
    method: 'get'
  });
 };

-/**
- * 加签
- * @param data
- * @returns
- */
-export const addMultiInstanceExecution = (data: any) => {
-  return request({
-    url: '/workflow/task/addMultiInstanceExecution',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 减签
- * @param data
- * @returns
- */
-export const deleteMultiInstanceExecution = (data: any) => {
-  return request({
-    url: '/workflow/task/deleteMultiInstanceExecution',
-    method: 'post',
-    data: data
-  });
-};
-
 /**
 * 修改任务办理人
- * @param taskIds
+ * @param taskIdList
 * @param userId
 * @returns
 */
-export const updateAssignee = (taskIds: Array<string>, userId: string) => {
+export const updateAssignee = (taskIdList: Array<string>, userId: string) => {
  return request({
-    url: `/workflow/task/updateAssignee/${taskIds}/${userId}`,
-    method: 'put'
-  });
-};
-
-/**
- * 转办任务
- * @returns
- */
-export const transferTask = (data: any) => {
-  return request({
-    url: `/workflow/task/transferTask`,
-    method: 'post',
-    data: data
+    url: `/workflow/task/updateAssignee/${userId}`,
+    method: 'put',
+    data: taskIdList
  });
 };

@@ -205,60 +144,37 @@ export const terminationTask = (data: any) => {
  });
 };

-/**
- * 查询流程变量
- * @returns
- */
-export const getInstanceVariable = (taskId: string) => {
-  return request({
-    url: `/workflow/task/getInstanceVariable/${taskId}`,
-    method: 'get'
-  });
-};
-
 /**
 * 获取可驳回得任务节点
 * @returns
 */
-export const getTaskNodeList = (processInstanceId: string) => {
+export const getBackTaskNode = (definitionId: string, nodeCode: string) => {
  return request({
-    url: `/workflow/task/getTaskNodeList/${processInstanceId}`,
+    url: `/workflow/task/getBackTaskNode/${definitionId}/${nodeCode}`,
    method: 'get'
  });
 };

 /**
- * 委托任务
+ * 任务操作 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
 * @returns
 */
-export const delegateTask = (data: any) => {
+export const taskOperation = (data: TaskOperationBo, operation: string) => {
  return request({
-    url: `/workflow/task/delegateTask`,
+    url: `/workflow/task/taskOperation/${operation}`,
    method: 'post',
    data: data
  });
 };

 /**
- * 查询工作流任务用户选择加签人员
- * @param taskId
- * @returns {*}
+ * 获取当前任务办理人
+ * @param taskId 任务id
+ * @returns
 */
-export const getTaskUserIdsByAddMultiInstance = (taskId: string) => {
+export const currentTaskAllUser = (taskId: string | number) => {
  return request({
-    url: '/workflow/task/getTaskUserIdsByAddMultiInstance/' + taskId,
-    method: 'get'
-  });
-};
-
-/**
- * 查询工作流选择减签人员
- * @param taskId
- * @returns {*}
- */
-export const getListByDeleteMultiInstance = (taskId: string) => {
-  return request({
-    url: '/workflow/task/getListByDeleteMultiInstance/' + taskId,
+    url: `/workflow/task/currentTaskAllUser/${taskId}`,
    method: 'get'
  });
 };
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -1,9 +1,8 @@
-import { NodeConfigVO } from '@/api/workflow/nodeConfig/types';
-import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types';
 export interface TaskQuery extends PageQuery {
-  name?: string;
-  processDefinitionKey?: string;
-  processDefinitionName?: string;
+  nodeName?: string;
+  flowCode?: string;
+  flowName?: string;
+  createByIds?: string[] | number[];
 }

 export interface ParticipantVo {
@@ -12,38 +11,38 @@ export interface ParticipantVo {
  candidateName: string[];
  claim: boolean;
 }
-
-export interface TaskVO extends BaseEntity {
-  id: string;
-  name: string;
-  description?: string;
-  priority: number;
-  owner?: string;
-  assignee?: string | number;
-  assigneeName?: string;
-  processInstanceId: string;
-  executionId: string;
-  taskDefinitionId?: any;
-  processDefinitionId: string;
-  endTime?: string;
-  taskDefinitionKey: string;
-  dueDate?: string;
-  category?: any;
-  parentTaskId?: any;
-  tenantId: string;
-  claimTime?: string;
-  businessStatus?: string;
-  businessStatusName?: string;
-  processDefinitionName?: string;
-  processDefinitionKey?: string;
-  participantVo?: ParticipantVo;
-  multiInstance?: boolean;
-  businessKey?: string;
-  wfNodeConfigVo?: NodeConfigVO;
-  wfDefinitionConfigVo?: DefinitionConfigVO;
+export interface FlowTaskVO {
+  id: string | number;
+  createTime?: Date;
+  updateTime?: Date;
+  tenantId?: string;
+  definitionId?: string;
+  instanceId: string;
+  flowName: string;
+  businessId: string;
+  nodeCode: string;
+  nodeName: string;
+  flowCode: string;
+  flowStatus: string;
+  formCustom: string;
+  formPath: string;
+  nodeType: number;
+  nodeRatio: string | number;
+  version?: string;
 }

 export interface VariableVo {
  key: string;
  value: string;
 }
+
+export interface TaskOperationBo {
+  //委派/转办人的用户ID（必填，准对委派/转办人操作）
+  userId?: string;
+  //加签/减签人的用户ID列表（必填，针对加签/减签操作）
+  userIds?: string[];
+  //任务ID（必填）
+  taskId: string | number;
+  //意见或备注信息（可选）
+  message?: string;
+}