diff --git a/src/typings/api/workflow.api.d.ts b/src/typings/api/workflow.api.d.ts index 9f809abc..0c4e9c4b 100644 --- a/src/typings/api/workflow.api.d.ts +++ b/src/typings/api/workflow.api.d.ts @@ -40,7 +40,7 @@ declare namespace Api { /** leave search params */ type LeaveSearchParams = CommonType.RecordNullable< - Pick & Api.Common.CommonSearchParams + { startLeaveDays: number; endLeaveDays: number } & Api.Common.CommonSearchParams >; /** leave operate params */ diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue index 0c3bdbe2..ac5cec45 100644 --- a/src/views/workflow/leave/index.vue +++ b/src/views/workflow/leave/index.vue @@ -43,7 +43,8 @@ const { pageSize: 10, // if you want to use the searchParams in Form, you need to define the following properties, and the value is null // the value can not be undefined, otherwise the property in Form will not be reactive - leaveDays: null, + startLeaveDays: null, + endLeaveDays: null, params: {} }, columns: () => [ diff --git a/src/views/workflow/leave/modules/leave-search.vue b/src/views/workflow/leave/modules/leave-search.vue index 417fb8f2..6184d80f 100644 --- a/src/views/workflow/leave/modules/leave-search.vue +++ b/src/views/workflow/leave/modules/leave-search.vue @@ -35,10 +35,14 @@ async function search() { - - + + + + + + - +