From 492802e4fc1b371ba21a2a490c8dcd67d7c8b29c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 14:03:40 +0800
Subject: [PATCH] fix: 出差和请假审批新增开始与结束日期
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index cee3eeb..e486fe4 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -47,11 +47,11 @@
</el-form-item>
</el-col>
</el-row>
- <!-- 璇峰亣鏃堕棿锛堜粎褰� approveType 涓� 2 鏃舵樉绀猴級 -->
+ <!-- 璇峰亣/鍑哄樊鏃堕棿锛堝綋 approveType 涓� 2 鎴� 3 鏃舵樉绀猴級 -->
<el-row :gutter="30"
- v-if="props.approveType == 2">
+ v-if="props.approveType == 2 || props.approveType == 3">
<el-col :span="12">
- <el-form-item label="璇峰亣寮�濮嬫椂闂达細"
+ <el-form-item :label="props.approveType == 2 ? '璇峰亣寮�濮嬫椂闂达細' : '寮�濮嬫椂闂达細'"
prop="startDate">
<el-date-picker v-model="form.startDate"
type="date"
@@ -63,7 +63,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璇峰亣缁撴潫鏃堕棿锛�"
+ <el-form-item :label="props.approveType == 2 ? '璇峰亣缁撴潫鏃堕棿锛�' : '缁撴潫鏃堕棿锛�'"
prop="endDate">
<el-date-picker v-model="form.endDate"
type="date"
@@ -258,10 +258,10 @@
approveReason: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
startDate: [
- { required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" },
+ { required: true, message: "璇烽�夋嫨寮�濮嬫椂闂�", trigger: "change" },
],
endDate: [
- { required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" },
+ { required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change" },
],
price: [{ required: true, message: "璇疯緭鍏ユ姤閿�閲戦", trigger: "blur" }],
location: [{ required: true, message: "璇疯緭鍏ュ嚭宸湴鐐�", trigger: "blur" }],
@@ -388,19 +388,19 @@
proxy.$modal.msgError("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜猴紒");
return;
}
- // 褰� approveType 涓� 2 鏃讹紝鏍￠獙璇峰亣鏃堕棿
- if (props.approveType == 2) {
+ // 褰� approveType 涓� 2 鎴� 3 鏃讹紝鏍￠獙璇峰亣/鍑哄樊鏃堕棿
+ if (props.approveType == 2 || props.approveType == 3) {
if (!form.value.startDate) {
- proxy.$modal.msgError("璇烽�夋嫨璇峰亣寮�濮嬫椂闂达紒");
+ proxy.$modal.msgError(props.approveType == 2 ? "璇烽�夋嫨璇峰亣寮�濮嬫椂闂达紒" : "璇烽�夋嫨寮�濮嬫椂闂达紒");
return;
}
if (!form.value.endDate) {
- proxy.$modal.msgError("璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�");
+ proxy.$modal.msgError(props.approveType == 2 ? "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�" : "璇烽�夋嫨缁撴潫鏃堕棿锛�");
return;
}
// 鏍￠獙缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�
if (new Date(form.value.endDate) < new Date(form.value.startDate)) {
- proxy.$modal.msgError("璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒");
+ proxy.$modal.msgError(props.approveType == 2 ? "璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒" : "缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒");
return;
}
}
--
Gitblit v1.9.3