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; });