diff --git a/src/api/workflow/definition/index.ts b/src/api/workflow/definition/index.ts index 5a9446b..02d7019 100644 --- a/src/api/workflow/definition/index.ts +++ b/src/api/workflow/definition/index.ts @@ -53,6 +53,7 @@ export const deleteDefinition = (id: string | string[]) => { /** * 挂起/激活 * @param definitionId 流程定义id + * @param activityStatus 状态 * @returns */ export const active = (definitionId: string, activityStatus: boolean) => { @@ -60,7 +61,7 @@ export const active = (definitionId: string, activityStatus: boolean) => { url: `/workflow/definition/active/${definitionId}`, method: 'put', params: { - activityStatus: activityStatus + active: activityStatus } }); }; diff --git a/src/api/workflow/definition/types.ts b/src/api/workflow/definition/types.ts index 4755e4b..c09a276 100644 --- a/src/api/workflow/definition/types.ts +++ b/src/api/workflow/definition/types.ts @@ -11,7 +11,7 @@ export interface FlowDefinitionVo { flowCode: string; version: string; isPublish: number; - activityStatus: boolean; + activityStatus: number; createTime: Date; updateTime: Date; } diff --git a/src/api/workflow/instance/types.ts b/src/api/workflow/instance/types.ts index 9c2f59f..64ff5a9 100644 --- a/src/api/workflow/instance/types.ts +++ b/src/api/workflow/instance/types.ts @@ -16,7 +16,7 @@ export interface FlowInstanceVO extends BaseEntity { flowCode: string; version: string; businessId: string; - activityStatus?: any; + activityStatus: number; tenantId: string; createTime: string; createBy: string; diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue index 7db23d0..64f0c57 100644 --- a/src/views/workflow/leave/index.vue +++ b/src/views/workflow/leave/index.vue @@ -224,7 +224,7 @@ const handleCancelProcessApply = async (id: string) => { loading.value = true; let data = { businessId: id, - message: '撤销流程!' + message: '申请人撤销流程!' }; await cancelProcessApply(data).finally(() => (loading.value = false)); await getList(); diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index 7f8cf33..7c413d0 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -71,7 +71,7 @@ 激活 - +