From b8de520fa696d8a95393aa3ff544c5a6f5c36001 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 15:33:41 +0800
Subject: [PATCH] 宁夏万通需求:出库单行支持主/辅单位录入;物料型号维护;考勤节假日配置时间段;设备批量删除;质检导出按筛选条件
---
src/views/hrm/attendance/holiday/modules/form.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/views/hrm/attendance/holiday/modules/form.vue b/src/views/hrm/attendance/holiday/modules/form.vue
index 2ae9c5d..614daa0 100644
--- a/src/views/hrm/attendance/holiday/modules/form.vue
+++ b/src/views/hrm/attendance/holiday/modules/form.vue
@@ -53,7 +53,15 @@
return;
}
modalApi.lock();
- const data = (await formApi.getValues()) as HrmAttendanceHolidayApi.Holiday;
+ const values = (await formApi.getValues()) as HrmAttendanceHolidayApi.Holiday & {
+ dateRange?: string[];
+ };
+ const { dateRange, ...rest } = values;
+ const data: HrmAttendanceHolidayApi.Holiday = {
+ ...rest,
+ startDate: dateRange?.[0],
+ endDate: dateRange?.[1],
+ };
try {
if (formType.value === 'update') {
await updateAttendanceHoliday(data);
@@ -81,7 +89,14 @@
}
modalApi.lock();
try {
- await formApi.setValues(await getAttendanceHoliday(data.id));
+ const detail = await getAttendanceHoliday(data.id);
+ await formApi.setValues({
+ ...detail,
+ dateRange:
+ detail.startDate && detail.endDate
+ ? [detail.startDate, detail.endDate]
+ : undefined,
+ });
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3