From b6c7b1b383481ecd56fccd36eba65e1942f0d91d Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Fri, 18 Jul 2025 23:13:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E8=A1=A5=E5=85=85=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/typings/api/workflow.api.d.ts | 2 +- src/views/workflow/leave/index.vue | 3 ++- src/views/workflow/leave/modules/leave-search.vue | 10 +++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) 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() { - - + + + + 至 + + - +