From 5cd5a5baa076377f3136338db7a9336d0d570d33 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 19:47:33 +0800
Subject: [PATCH] feat(hrm): 前端同步新疆中亿装配的人力资源模块

---
 src/views/hrm/attendance/holiday/data.ts |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/views/hrm/attendance/holiday/data.ts b/src/views/hrm/attendance/holiday/data.ts
index 29f871a..822451b 100644
--- a/src/views/hrm/attendance/holiday/data.ts
+++ b/src/views/hrm/attendance/holiday/data.ts
@@ -29,10 +29,11 @@
       rules: 'required',
     },
     {
-      fieldName: 'dateRange',
-      label: '鏃ユ湡鍖洪棿',
-      component: 'RangePicker',
+      fieldName: 'date',
+      label: '鏃ユ湡',
+      component: 'DatePicker',
       componentProps: {
+        placeholder: '閫夋嫨鏃ユ湡',
         valueFormat: 'YYYY-MM-DD',
         style: { width: '100%' },
       },
@@ -125,14 +126,7 @@
 export function useGridColumns(): VxeTableGridOptions<HrmAttendanceHolidayApi.Holiday>['columns'] {
   return [
     { field: 'name', title: '鑺傚亣鏃ュ悕绉�', minWidth: 150 },
-    {
-      field: 'startDate',
-      title: '鏃ユ湡鍖洪棿',
-      minWidth: 200,
-      slots: {
-        default: 'dateRange',
-      },
-    },
+    { field: 'date', title: '鏃ユ湡', width: 120 },
     {
       field: 'type',
       title: '绫诲瀷',
@@ -155,7 +149,7 @@
       field: 'createTime',
       title: '鍒涘缓鏃堕棿',
       width: 180,
-      formatter: 'formatDate',
+      formatter: 'formatDateTime',
     },
     {
       title: '鎿嶄綔',

--
Gitblit v1.9.3