diff --git a/client/src/api/leave.ts b/client/src/api/leave.ts
index 5e5386aa..2c6db939 100644
--- a/client/src/api/leave.ts
+++ b/client/src/api/leave.ts
@@ -90,6 +90,7 @@ export type LeaveWorkingDaysPreview = {
weekendDayCount: number;
adjustedWorkdayCount: number;
calendarApplied: boolean;
+ isNonWorkingRange: boolean;
};
export type LeaveListQuery = {
diff --git a/client/src/pages/LeaveRequestPage.tsx b/client/src/pages/LeaveRequestPage.tsx
index b1c2d127..e8dcfaac 100644
--- a/client/src/pages/LeaveRequestPage.tsx
+++ b/client/src/pages/LeaveRequestPage.tsx
@@ -303,6 +303,7 @@ export function LeaveRequestPage() {
const effectiveRequestedDaysPreview =
workingDaysPreviewQuery.data?.requestedDays ?? localRequestedDaysPreview;
+ const isNonWorkingPreview = Boolean(workingDaysPreviewQuery.data?.isNonWorkingRange);
const balanceSummary = useMemo(() => {
return (balancesQuery.data?.items ?? []).reduce(
@@ -784,7 +785,15 @@ export function LeaveRequestPage() {
) : null}
- {workingDaysPreviewQuery.data && workingDaysPreviewQuery.data.holidayDayCount > 0 ? (
+ {isNonWorkingPreview ? (
+
+ 所选日期范围均为非工作日,无需提交请假
+
+ ) : null}
+
+ {workingDaysPreviewQuery.data &&
+ !isNonWorkingPreview &&
+ workingDaysPreviewQuery.data.holidayDayCount > 0 ? (
选择的日期范围内包含 {workingDaysPreviewQuery.data.holidayDayCount} 天法定假日,实际请假天数为{" "}
{workingDaysPreviewQuery.data.requestedDays} 天
@@ -893,7 +902,7 @@ export function LeaveRequestPage() {
) : null}