From a1e9064bb4c0a41c9a1e389cdd0f0f9bab009309 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 09:45:52 +0800
Subject: [PATCH] feat(hrm): 请假批量导入、加班选申请人、批量排班与节假日区间联动
---
src/views/hrm/attendance/holiday/modules/form.vue | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/views/hrm/attendance/holiday/modules/form.vue b/src/views/hrm/attendance/holiday/modules/form.vue
index 1287f19..354b3da 100644
--- a/src/views/hrm/attendance/holiday/modules/form.vue
+++ b/src/views/hrm/attendance/holiday/modules/form.vue
@@ -9,13 +9,20 @@
import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
-import { createAttendanceHoliday, getAttendanceHoliday, updateAttendanceHoliday } from '#/api/hrm/attendance/holiday';
+import {
+ createAttendanceHolidayRange,
+ getAttendanceHoliday,
+ updateAttendanceHoliday,
+ updateAttendanceHolidayRange,
+} from '#/api/hrm/attendance/holiday';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
+/** 褰撳墠缂栬緫鐨勫尯闂村唴鍏ㄩ儴璁板綍ID锛堝垪琛ㄦ寜杩炵画鍖洪棿鍚堝苟灞曠ず锛岀紪杈戞椂鏁翠綋閲嶅啓锛� */
+const rangeIds = ref<number[]>([]);
const isDetail = computed(() => formType.value === 'detail');
const getTitle = computed(() => {
@@ -57,14 +64,35 @@
date: string | string[];
};
try {
+ const dates = Array.isArray(data.date) ? data.date : [data.date];
+ const startDate = dates[0]!;
+ const endDate = dates[1] || dates[0]!;
if (formType.value === 'update') {
- data.date = Array.isArray(data.date) ? data.date[0] : data.date;
- await updateAttendanceHoliday(data);
- } else {
- const dates = Array.isArray(data.date) ? data.date : [data.date];
- for (const date of dates) {
- await createAttendanceHoliday({ ...data, date });
+ if (rangeIds.value.length > 0) {
+ // 缂栬緫鐨勬槸鍚堝苟鍚庣殑鍖洪棿锛氭暣浣撳垹闄ゅ師璁板綍锛屾寜鏂拌捣姝㈡棩鏈熼噸鍐�
+ await updateAttendanceHolidayRange({
+ ids: rangeIds.value,
+ name: data.name!,
+ startDate,
+ endDate,
+ type: data.type!,
+ isLegal: Boolean(data.isLegal),
+ remark: data.remark,
+ });
+ } else {
+ data.date = startDate;
+ await updateAttendanceHoliday(data);
}
+ } else {
+ // 鎸夋棩鏈熷尯闂翠竴娆℃�у啓鍏ュ尯闂村唴姣忎竴澶╋紙娉曞畾鑺傚亣鏃� 10-01~10-03 闇�鍐欐弧 3 澶╋級
+ await createAttendanceHolidayRange({
+ name: data.name!,
+ startDate,
+ endDate,
+ type: data.type!,
+ isLegal: Boolean(data.isLegal),
+ remark: data.remark,
+ });
}
await modalApi.close();
emit('success');
@@ -77,11 +105,29 @@
if (!isOpen) {
return;
}
- const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ const data = modalApi.getData<{
+ formType: FormType;
+ id?: number;
+ row?: HrmAttendanceHolidayApi.HolidayGroup;
+ }>();
formType.value = data.formType;
formApi.setState({ schema: useFormSchema(data.formType) });
formApi.setDisabled(data.formType === 'detail');
modalApi.setState({ showConfirmButton: data.formType !== 'detail' });
+ // 鍒楄〃琛屽凡甯﹀尯闂翠俊鎭紙id/ids/date/endDate锛夛紝鐩存帴甯﹀叆锛屾棤闇�鍐嶆煡鍗曟棩璁板綍
+ if (data?.row) {
+ rangeIds.value = data.row.ids ?? (data.row.id != null ? [data.row.id] : []);
+ await formApi.setValues({
+ id: data.row.id,
+ name: data.row.name,
+ date: [data.row.date, data.row.endDate || data.row.date],
+ type: data.row.type,
+ isLegal: data.row.isLegal,
+ remark: data.row.remark,
+ });
+ return;
+ }
+ rangeIds.value = [];
if (!data?.id) {
return;
}
--
Gitblit v1.9.3