From 423a401d4b7808e47a5945f43f98c00d678addce Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 10 四月 2026 13:38:09 +0800
Subject: [PATCH] fix(approvalProcess): 请假表单时间选择器从日期改为日期时间并修正校验逻辑
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 998fa33..df88ad8 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -46,10 +46,10 @@
<el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="startDate">
<el-date-picker
v-model="form.startDate"
- type="date"
- placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
+ type="datetime"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
clearable
style="width: 100%"
/>
@@ -59,10 +59,10 @@
<el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="endDate">
<el-date-picker
v-model="form.endDate"
- type="date"
- placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
+ type="datetime"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
clearable
style="width: 100%"
/>
@@ -381,9 +381,8 @@
proxy.$modal.msgError("璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�")
return
}
- // 鏍￠獙缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�
- if (new Date(form.value.endDate) < new Date(form.value.startDate)) {
- proxy.$modal.msgError("璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒")
+ if (new Date(form.value.startDate).getTime() >= new Date(form.value.endDate).getTime()) {
+ proxy.$modal.msgError("璇峰亣寮�濮嬫椂闂村繀椤绘棭浜庣粨鏉熸椂闂达紒")
return
}
}
@@ -473,4 +472,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3