From e6b1ff023a83c3185354696eaad2329ed7f5c21c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 10:49:48 +0800
Subject: [PATCH] fix(hrm): 节假日日期改为范围选择,新增弹框加宽到 800px
---
src/views/hrm/attendance/holiday/data.ts | 13 +++++++++----
src/views/hrm/attendance/holiday/modules/form.vue | 17 ++++++++++++-----
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/views/hrm/attendance/holiday/data.ts b/src/views/hrm/attendance/holiday/data.ts
index 822451b..d082daa 100644
--- a/src/views/hrm/attendance/holiday/data.ts
+++ b/src/views/hrm/attendance/holiday/data.ts
@@ -31,9 +31,9 @@
{
fieldName: 'date',
label: '鏃ユ湡',
- component: 'DatePicker',
+ component: 'RangePicker',
componentProps: {
- placeholder: '閫夋嫨鏃ユ湡',
+ placeholder: ['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡'],
valueFormat: 'YYYY-MM-DD',
style: { width: '100%' },
},
@@ -44,7 +44,12 @@
label: '绫诲瀷',
component: 'RadioGroup',
componentProps: {
- options: getDictOptions(DICT_TYPE.HRM_HOLIDAY_TYPE, 'number'),
+ options: getDictOptions(DICT_TYPE.HRM_HOLIDAY_TYPE, 'number').length
+ ? getDictOptions(DICT_TYPE.HRM_HOLIDAY_TYPE, 'number')
+ : [
+ { label: '浼戞伅鏃�', value: 1 },
+ { label: '宸ヤ綔鏃�', value: 2 },
+ ],
},
rules: 'selectRequired',
},
@@ -160,4 +165,4 @@
},
},
];
-}
\ No newline at end of file
+}
diff --git a/src/views/hrm/attendance/holiday/modules/form.vue b/src/views/hrm/attendance/holiday/modules/form.vue
index 2ae9c5d..1287f19 100644
--- a/src/views/hrm/attendance/holiday/modules/form.vue
+++ b/src/views/hrm/attendance/holiday/modules/form.vue
@@ -53,12 +53,18 @@
return;
}
modalApi.lock();
- const data = (await formApi.getValues()) as HrmAttendanceHolidayApi.Holiday;
+ const data = (await formApi.getValues()) as HrmAttendanceHolidayApi.Holiday & {
+ date: string | string[];
+ };
try {
if (formType.value === 'update') {
+ data.date = Array.isArray(data.date) ? data.date[0] : data.date;
await updateAttendanceHoliday(data);
} else {
- await createAttendanceHoliday(data);
+ const dates = Array.isArray(data.date) ? data.date : [data.date];
+ for (const date of dates) {
+ await createAttendanceHoliday({ ...data, date });
+ }
}
await modalApi.close();
emit('success');
@@ -81,7 +87,8 @@
}
modalApi.lock();
try {
- await formApi.setValues(await getAttendanceHoliday(data.id));
+ const detail = await getAttendanceHoliday(data.id);
+ await formApi.setValues({ ...detail, date: [detail.date, detail.date] });
} finally {
modalApi.unlock();
}
@@ -90,7 +97,7 @@
</script>
<template>
- <Modal :title="getTitle" class="w-[600px]">
+ <Modal :title="getTitle" class="w-[800px]">
<Form class="mx-4" />
</Modal>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.3