From 17c6c07bb2066d1c2c5e3fd27dbd36dc133df032 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Sun, 6 Jul 2025 12:54:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B0=86xgxt=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E5=8A=A0=E5=85=A5=E5=88=B0.gitignore=E3=80=82=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E8=AF=B7=E5=81=87=E5=8D=95=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=B5=81=E7=A8=8B=E7=9A=84=E6=97=B6=E9=97=B4=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E9=97=AE=E9=A2=98=203=E3=80=81=E5=88=A0=E9=99=A4.curs?=
 =?UTF-8?q?orignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cursorignore                              |  0
 .gitignore                                 |  2 +-
 web/src/views/workflow/leave/leaveEdit.vue | 19 ++++++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)
 delete mode 100644 .cursorignore

diff --git a/.cursorignore b/.cursorignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/.gitignore b/.gitignore
index eddc1928..a9d6ffc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,4 +160,4 @@ coverage/
 *.key
 *.crt
 *.p12
-*.keystore
\ No newline at end of file
+*.keystore/xgxt/
diff --git a/web/src/views/workflow/leave/leaveEdit.vue b/web/src/views/workflow/leave/leaveEdit.vue
index 8e5bf625..9830d533 100644
--- a/web/src/views/workflow/leave/leaveEdit.vue
+++ b/web/src/views/workflow/leave/leaveEdit.vue
@@ -191,9 +191,22 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getLeave(routeParams.value.id);
     Object.assign(form.value, res.data);
-    leaveTime.value = [];
-    leaveTime.value.push(form.value.startDate);
-    leaveTime.value.push(form.value.endDate);
+    console.log('res.data:', res.data);
+    console.log('form.value:', form.value);
+    // 为了确保 Element Plus 日期区间组件能够正确渲染，需要直接替换绑定数组引用
+    // 同时将后端返回的日期统一格式化为组件要求的 "YYYY-MM-DD HH:mm:ss"
+    // 后端仅返回 "YYYY-MM-DD"，需要为日期补齐时间，符合 value-format="YYYY-MM-DD HH:mm:ss"
+    const ensureDateTime = (dateStr: string | undefined, endFlag = false) => {
+      if (!dateStr) return '';
+      // 如果已包含时间段，直接返回
+      if (/\d{2}:\d{2}:\d{2}$/.test(dateStr)) {
+        return dateStr;
+      }
+      return endFlag ? `${dateStr} 23:59:59` : `${dateStr} 00:00:00`;
+    };
+    const start = ensureDateTime(form.value.startDate, false);
+    const end = ensureDateTime(form.value.endDate, true);
+    leaveTime.value = [start, end];
     loading.value = false;
     buttonLoading.value = false;
   });