From a87d9a561f147ddbd8a8e0fc52778bd609688a4d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 07 十一月 2025 17:01:12 +0800
Subject: [PATCH] 给请假审批加上请假事由，以及开始和结束时间， 报销管理加一个报销金额字段 出差管理加一个地点字段
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index e0af994..ad7b1d1 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -42,9 +42,9 @@
<!-- 璇峰亣鏃堕棿锛堜粎褰� approveType 涓� 2 鏃舵樉绀猴級 -->
<el-row :gutter="30" v-if="props.approveType == 2">
<el-col :span="12">
- <el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="leaveStartTime">
+ <el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="startDate">
<el-date-picker
- v-model="form.leaveStartTime"
+ v-model="form.startDate"
type="date"
placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
value-format="YYYY-MM-DD"
@@ -55,9 +55,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="leaveEndTime">
+ <el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="endDate">
<el-date-picker
- v-model="form.leaveEndTime"
+ v-model="form.endDate"
type="date"
placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
value-format="YYYY-MM-DD"
@@ -71,9 +71,9 @@
<!-- 鎶ラ攢閲戦锛堜粎褰� approveType 涓� 4 鏃舵樉绀猴級 -->
<el-row v-if="props.approveType == 4">
<el-col :span="24">
- <el-form-item label="鎶ラ攢閲戦锛�" prop="reimbursementAmount">
+ <el-form-item label="鎶ラ攢閲戦锛�" prop="price">
<el-input-number
- v-model="form.reimbursementAmount"
+ v-model="form.price"
placeholder="璇疯緭鍏ユ姤閿�閲戦"
:min="0"
:precision="2"
@@ -87,9 +87,9 @@
<!-- 鍑哄樊鍦扮偣锛堜粎褰� approveType 涓� 3 鏃舵樉绀猴級 -->
<el-row v-if="props.approveType == 3">
<el-col :span="24">
- <el-form-item label="鍑哄樊鍦扮偣锛�" prop="businessTripLocation">
+ <el-form-item label="鍑哄樊鍦扮偣锛�" prop="location">
<el-input
- v-model="form.businessTripLocation"
+ v-model="form.location"
placeholder="璇疯緭鍏ュ嚭宸湴鐐�"
clearable
/>
@@ -233,10 +233,10 @@
checkResult: "",
tempFileIds: [],
approverList: [], // 鏂板瀛楁锛屽瓨鍌ㄦ墍鏈夎妭鐐圭殑瀹℃壒浜篿d
- leaveStartTime: "", // 璇峰亣寮�濮嬫椂闂�
- leaveEndTime: "", // 璇峰亣缁撴潫鏃堕棿
- reimbursementAmount: null, // 鎶ラ攢閲戦
- businessTripLocation: "" // 鍑哄樊鍦扮偣
+ startDate: "", // 璇峰亣寮�濮嬫椂闂�
+ endDate: "", // 璇峰亣缁撴潫鏃堕棿
+ price: null, // 鎶ラ攢閲戦
+ location: "" // 鍑哄樊鍦扮偣
},
rules: {
approveTime: [{ required: false, message: "璇疯緭鍏�", trigger: "change" },],
@@ -245,10 +245,10 @@
approveDeptId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
approveReason: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- leaveStartTime: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
- leaveEndTime: [{ required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" }],
- reimbursementAmount: [{ required: true, message: "璇疯緭鍏ユ姤閿�閲戦", trigger: "blur" }],
- businessTripLocation: [{ required: true, message: "璇疯緭鍏ュ嚭宸湴鐐�", trigger: "blur" }],
+ startDate: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
+ endDate: [{ required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" }],
+ price: [{ required: true, message: "璇疯緭鍏ユ姤閿�閲戦", trigger: "blur" }],
+ location: [{ required: true, message: "璇疯緭鍏ュ嚭宸湴鐐�", trigger: "blur" }],
},
});
const { form, rules } = toRefs(data);
@@ -344,30 +344,30 @@
}
// 褰� approveType 涓� 2 鏃讹紝鏍￠獙璇峰亣鏃堕棿
if (props.approveType == 2) {
- if (!form.value.leaveStartTime) {
+ if (!form.value.startDate) {
proxy.$modal.msgError("璇烽�夋嫨璇峰亣寮�濮嬫椂闂达紒")
return
}
- if (!form.value.leaveEndTime) {
+ if (!form.value.endDate) {
proxy.$modal.msgError("璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�")
return
}
// 鏍￠獙缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�
- if (new Date(form.value.leaveEndTime) < new Date(form.value.leaveStartTime)) {
+ if (new Date(form.value.endDate) < new Date(form.value.startDate)) {
proxy.$modal.msgError("璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒")
return
}
}
// 褰� approveType 涓� 3 鏃讹紝鏍￠獙鍑哄樊鍦扮偣
if (props.approveType == 3) {
- if (!form.value.businessTripLocation || form.value.businessTripLocation.trim() === '') {
+ if (!form.value.location || form.value.location.trim() === '') {
proxy.$modal.msgError("璇疯緭鍏ュ嚭宸湴鐐癸紒")
return
}
}
// 褰� approveType 涓� 4 鏃讹紝鏍￠獙鎶ラ攢閲戦
if (props.approveType == 4) {
- if (!form.value.reimbursementAmount || form.value.reimbursementAmount <= 0) {
+ if (!form.value.price || form.value.price <= 0) {
proxy.$modal.msgError("璇疯緭鍏ユ湁鏁堢殑鎶ラ攢閲戦锛�")
return
}
--
Gitblit v1.9.3