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/index.vue |   65 +++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/src/views/hrm/attendance/holiday/index.vue b/src/views/hrm/attendance/holiday/index.vue
index 8a33871..da58548 100644
--- a/src/views/hrm/attendance/holiday/index.vue
+++ b/src/views/hrm/attendance/holiday/index.vue
@@ -8,7 +8,12 @@
 import { message, Modal, Tag } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { deleteAttendanceHoliday, exportAttendanceHoliday, getAttendanceHolidayPage } from '#/api/hrm/attendance/holiday';
+import {
+  deleteAttendanceHoliday,
+  deleteAttendanceHolidayRange,
+  exportAttendanceHoliday,
+  getAttendanceHolidayGroupPage,
+} from '#/api/hrm/attendance/holiday';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -29,34 +34,58 @@
   formModalApi.setData({ formType: 'create' }).open();
 }
 
-/** 缂栬緫鑺傚亣鏃� */
-function handleUpdate(row: HrmAttendanceHolidayApi.Holiday) {
-  formModalApi.setData({ id: row.id, formType: 'update' }).open();
+/** 鏃ユ湡鍖洪棿鏍囬锛屽 2026-10-01 ~ 2026-10-03锛堝叡3澶╋級 */
+function rangeText(row: HrmAttendanceHolidayApi.HolidayGroup) {
+  if (!row.endDate || row.endDate === row.date) {
+    return row.date;
+  }
+  return `${row.date} ~ ${row.endDate}`;
+}
+
+/** 缂栬緫鑺傚亣鏃ワ紙鏁翠釜鍖洪棿涓�璧风紪杈戯級 */
+function handleUpdate(row: HrmAttendanceHolidayApi.HolidayGroup) {
+  formModalApi.setData({ id: row.id, row, formType: 'update' }).open();
 }
 
 /** 鏌ョ湅鑺傚亣鏃� */
-function handleDetail(row: HrmAttendanceHolidayApi.Holiday) {
-  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
+function handleDetail(row: HrmAttendanceHolidayApi.HolidayGroup) {
+  formModalApi.setData({ id: row.id, row, formType: 'detail' }).open();
 }
 
-/** 鍒犻櫎鑺傚亣鏃� */
-async function handleDelete(id: number) {
+/** 鍒犻櫎鑺傚亣鏃ワ紙鏁翠釜鍖洪棿涓�璧峰垹闄わ級 */
+async function handleDelete(row: HrmAttendanceHolidayApi.HolidayGroup) {
+  const content =
+    row.ids && row.ids.length > 1
+      ? `纭畾瑕佸垹闄ゃ��${row.name}銆�${rangeText(row)}锛堝叡 ${row.dayCount} 澶╋級鍚楋紵`
+      : '纭畾瑕佸垹闄よ鑺傚亣鏃ュ悧锛�';
   Modal.confirm({
     title: '纭鍒犻櫎',
-    content: '纭畾瑕佸垹闄よ鑺傚亣鏃ュ悧锛�',
+    content,
     okText: '纭畾',
     cancelText: '鍙栨秷',
     onOk: async () => {
-      await deleteAttendanceHoliday(id);
+      if (row.ids && row.ids.length > 0) {
+        await deleteAttendanceHolidayRange(row.ids);
+      } else if (row.id != null) {
+        await deleteAttendanceHoliday(row.id);
+      }
       message.success('鍒犻櫎鎴愬姛');
       handleRefresh();
     },
   });
 }
 
+/** 鎼滅储鏉′欢锛氭棩鏈熷尯闂村瓧娈� date 杞垚鍚庣鎺ユ敹鐨� startDate/endDate */
+function buildQueryParams(formValues: Record<string, any>) {
+  const { date, ...rest } = formValues;
+  const [startDate, endDate] = Array.isArray(date) ? date : [];
+  return { ...rest, startDate, endDate };
+}
+
 /** 瀵煎嚭鑺傚亣鏃� */
 async function handleExport() {
-  const data = await exportAttendanceHoliday(await gridApi.formApi.getValues());
+  const params = buildQueryParams(await gridApi.formApi.getValues());
+  const data = await exportAttendanceHoliday(params);
   downloadFileFromBlobPart({ fileName: '鑺傚亣鏃ラ厤缃�.xls', source: data });
 }
 
@@ -71,10 +100,10 @@
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) =>
-          await getAttendanceHolidayPage({
+          await getAttendanceHolidayGroupPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            ...formValues,
+            ...buildQueryParams(formValues),
           }),
       },
     },
@@ -86,7 +115,7 @@
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<HrmAttendanceHolidayApi.Holiday>,
+  } as VxeTableGridOptions<HrmAttendanceHolidayApi.HolidayGroup>,
 });
 </script>
 
@@ -114,6 +143,12 @@
           ]"
         />
       </template>
+      <template #dateRange="{ row }">
+        <span>{{ row.date }}</span>
+        <span v-if="row.endDate && row.endDate !== row.date">
+          ~ {{ row.endDate }}
+        </span>
+      </template>
       <template #isLegal="{ row }">
         <Tag v-if="row.isLegal === 1" color="red">娉曞畾</Tag>
         <span v-else>-</span>
@@ -137,7 +172,7 @@
               type: 'link',
               danger: true,
               auth: ['hrm:attendance-holiday:delete'],
-              onClick: handleDelete.bind(null, row.id!),
+              onClick: handleDelete.bind(null, row),
             },
           ]"
         />

--
Gitblit v1.9.3