diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts
index 1a5b5ecb..d5d0c05c 100644
--- a/src/api/bpm/processInstance/index.ts
+++ b/src/api/bpm/processInstance/index.ts
@@ -47,7 +47,7 @@ export const cancelProcessInstance = async (id: number, reason: string) => {
return await request.delete({ url: '/bpm/process-instance/cancel', data: data })
}
-export const getProcessInstance = async (id: number) => {
+export const getProcessInstance = async (id: string) => {
return await request.get({ url: '/bpm/process-instance/get?id=' + id })
}
diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts
index de575244..6592542d 100644
--- a/src/api/bpm/task/index.ts
+++ b/src/api/bpm/task/index.ts
@@ -4,23 +4,23 @@ export type TaskVO = {
id: number
}
-export const getTodoTaskPage = async (params) => {
+export const getTodoTaskPage = async (params: any) => {
return await request.get({ url: '/bpm/task/todo-page', params })
}
-export const getDoneTaskPage = async (params) => {
+export const getDoneTaskPage = async (params: any) => {
return await request.get({ url: '/bpm/task/done-page', params })
}
-export const approveTask = async (data) => {
+export const approveTask = async (data: any) => {
return await request.put({ url: '/bpm/task/approve', data })
}
-export const rejectTask = async (data) => {
+export const rejectTask = async (data: any) => {
return await request.put({ url: '/bpm/task/reject', data })
}
-export const getTaskListByProcessInstanceId = async (processInstanceId) => {
+export const getTaskListByProcessInstanceId = async (processInstanceId: string) => {
return await request.get({
url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId
})
@@ -46,23 +46,17 @@ export const transferTask = async (data: any) => {
return await request.put({ url: '/bpm/task/transfer', data })
}
-/**
- * 加签
- */
-export const taskAddSign = async (data) => {
+// 加签
+export const signCreateTask = async (data: any) => {
return await request.put({ url: '/bpm/task/create-sign', data })
}
-/**
- * 获取减签任务列表
- */
-export const getChildrenTaskList = async (id: string) => {
- return await request.get({ url: '/bpm/task/children-list?parentId=' + id })
-}
-
-/**
- * 减签
- */
-export const taskSubSign = async (data) => {
+// 减签
+export const signDeleteTask = async (data: any) => {
return await request.delete({ url: '/bpm/task/delete-sign', data })
}
+
+// 获取减签任务列表
+export const getChildrenTaskList = async (id: string) => {
+ return await request.get({ url: '/bpm/task/list-by-parent-task-id?parentTaskId=' + id })
+}
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
index e9b9d64d..ba573a2c 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
@@ -50,8 +50,9 @@
-
-
+
+
+
diff --git a/src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue b/src/views/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue
similarity index 85%
rename from src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue
rename to src/views/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue
index 40cd200e..9e4998c1 100644
--- a/src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue
+++ b/src/views/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue
@@ -7,8 +7,8 @@
:rules="formRules"
label-width="110px"
>
-
-
+
+
{
formLoading.value = true
formData.value.type = type
try {
- await TaskApi.taskAddSign(formData.value)
+ await TaskApi.signCreateTask(formData.value)
message.success('加签成功')
dialogVisible.value = false
// 发送操作成功的事件
@@ -89,8 +90,9 @@ const submitForm = async (type: string) => {
const resetForm = () => {
formData.value = {
id: '',
- userIdList: [],
- type: ''
+ userIds: [],
+ type: '',
+ reason: ''
}
formRef.value?.resetFields()
}
diff --git a/src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue b/src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue
similarity index 80%
rename from src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
rename to src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue
index 61f7d68c..19bb2dce 100644
--- a/src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
+++ b/src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue
@@ -9,8 +9,10 @@
>
-
- {{ item.name }}({{ item.assigneeUser.deptName }}{{ item.assigneeUser.nickname }}--审批)
+
+ {{ item.name }}
+ ({{ item.assigneeUser?.deptName || item.ownerUser?.deptName }} -
+ {{ item.assigneeUser?.nickname || item.ownerUser?.nickname }})
@@ -24,10 +26,12 @@
-
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index 4f889b8f..2aac5fad 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -92,7 +92,7 @@
-
+
-
+