diff --git a/src/api/workflow/leave/types.ts b/src/api/workflow/leave/types.ts index b093546..b86c480 100644 --- a/src/api/workflow/leave/types.ts +++ b/src/api/workflow/leave/types.ts @@ -5,7 +5,8 @@ export interface LeaveVO { endDate: string; leaveDays: number; remark: string; - processInstanceVo: any; + status?: string; + processInstanceId?: string; } export interface LeaveForm extends BaseEntity { @@ -15,7 +16,8 @@ export interface LeaveForm extends BaseEntity { endDate?: string; leaveDays?: number; remark?: string; - processInstanceVo?: any; + status?: string; + processInstanceId?: string; } export interface LeaveQuery extends PageQuery { diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index af25fad..3dca4fc 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -4,18 +4,20 @@
暂存 审批 - 流程进度 + 流程进度
返回 @@ -123,7 +125,8 @@ const initFormData: LeaveForm = { endDate: undefined, leaveDays: undefined, remark: undefined, - processInstanceVo: {} + status: undefined, + processInstanceId: undefined }; const data = reactive>({ form: { ...initFormData }, @@ -166,9 +169,6 @@ const getInfo = () => { leaveTime.value = []; leaveTime.value.push(form.value.startDate); leaveTime.value.push(form.value.endDate); - if (form.value.processInstanceVo) { - processInstanceId.value = form.value.processInstanceVo.id; - } loading.value = false; buttonLoading.value = false; });