From 77096fca733cd5a8a80a3659fe8a60968f2aca4f Mon Sep 17 00:00:00 2001 From: pch <75729660@qq.com> Date: Fri, 24 Jan 2025 11:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E8=AE=B0=E5=BD=95=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bpm/task/index.ts | 2 +- src/api/bpm/taskextendrecord/index.ts | 53 ++++ .../components/UserTaskCustomConfig.vue | 2 +- .../package/penal/form/ElementForm.vue | 11 +- .../detail/ProcessInstanceOperationButton.vue | 21 +- .../bpm/processInstance/detail/index.vue | 1 - .../taskextendrecord/TaskExtendRecordForm.vue | 173 +++++++++++ src/views/bpm/taskextendrecord/index.vue | 274 ++++++++++++++++++ 8 files changed, 519 insertions(+), 18 deletions(-) create mode 100644 src/api/bpm/taskextendrecord/index.ts create mode 100644 src/views/bpm/taskextendrecord/TaskExtendRecordForm.vue create mode 100644 src/views/bpm/taskextendrecord/index.vue diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts index eb498f3..9b91b2f 100644 --- a/src/api/bpm/task/index.ts +++ b/src/api/bpm/task/index.ts @@ -66,7 +66,7 @@ export const rejectTask = async (data: any) => { export const getTaskListByProcessInstanceId = async (processInstanceId: string) => { return await request.get({ - url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId + url: '/bpm/task/list-by-process-instance-id2?processInstanceId=' + processInstanceId }) } diff --git a/src/api/bpm/taskextendrecord/index.ts b/src/api/bpm/taskextendrecord/index.ts new file mode 100644 index 0000000..774aa4d --- /dev/null +++ b/src/api/bpm/taskextendrecord/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +// BPM 流转记录扩展 VO +export interface TaskExtendRecordVO { + id: number // 编号 + taskId: string // 任务id + taskName: string // 任务名称 + startTime: Date // 开始时间 + endTime: Date // 结束时间 + userId: string // 用户id + userName: string // 用户名称 + reason: string // 意见 + durationInMillis: number // 持续时间 + workTimeInMillis: number // 工作时间 + processInstanceId: string // 流程实例id + field1: string // 备用字段1 + field2: string // 备用字段2 + field3: string // 备用字段3 + status: number // 审批状态 +} + +// BPM 流转记录扩展 API +export const TaskExtendRecordApi = { + // 查询BPM 流转记录扩展分页 + getTaskExtendRecordPage: async (params: any) => { + return await request.get({ url: `/bpm/task-extend-record/page`, params }) + }, + + // 查询BPM 流转记录扩展详情 + getTaskExtendRecord: async (id: number) => { + return await request.get({ url: `/bpm/task-extend-record/get?id=` + id }) + }, + + // 新增BPM 流转记录扩展 + createTaskExtendRecord: async (data: TaskExtendRecordVO) => { + return await request.post({ url: `/bpm/task-extend-record/create`, data }) + }, + + // 修改BPM 流转记录扩展 + updateTaskExtendRecord: async (data: TaskExtendRecordVO) => { + return await request.put({ url: `/bpm/task-extend-record/update`, data }) + }, + + // 删除BPM 流转记录扩展 + deleteTaskExtendRecord: async (id: number) => { + return await request.delete({ url: `/bpm/task-extend-record/delete?id=` + id }) + }, + + // 导出BPM 流转记录扩展 Excel + exportTaskExtendRecord: async (params) => { + return await request.download({ url: `/bpm/task-extend-record/export-excel`, params }) + } +} diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue index 77085dc..9726815 100644 --- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue +++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue @@ -51,7 +51,7 @@ - 相邻节点审批人相同 + 审批人与提交人为同一人时
diff --git a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue index b878beb..ca924e7 100644 --- a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue +++ b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue @@ -107,15 +107,6 @@ - - - - - - - - - @@ -130,7 +121,7 @@ - +
操作按钮
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue index 152037a..1cb0af6 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue @@ -300,7 +300,7 @@ + {{delegateForm.delegateUserId}} + {{selectedDelegateUsers}}