From 75736702d06d577b336ac10ea594a667ddf52b69 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 15:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/personnelManagement/dimission/components/formDia.vue | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/views/personnelManagement/dimission/components/formDia.vue b/src/views/personnelManagement/dimission/components/formDia.vue
index 2b8a7fd..6d3cb46 100644
--- a/src/views/personnelManagement/dimission/components/formDia.vue
+++ b/src/views/personnelManagement/dimission/components/formDia.vue
@@ -97,6 +97,18 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="绂昏亴鏃ユ湡锛�" prop="leaveDate">
+ <el-date-picker
+ v-model="form.leaveDate"
+ type="date"
+ placeholder="璇烽�夋嫨绂昏亴鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="绂昏亴鍘熷洜锛�" prop="reason">
<el-select v-model="form.reason" placeholder="璇烽�夋嫨绂昏亴鍘熷洜" style="width: 100%" @change="handleSelectDimissionReason">
<el-option
@@ -108,6 +120,8 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="澶囨敞锛�" prop="remark" v-if="form.reason === 'other'">
<el-input
@@ -168,11 +182,13 @@
const data = reactive({
form: {
staffOnJobId: undefined,
+ leaveDate: "",
reason: "",
remark: "",
},
rules: {
staffName: [{ required: true, message: "璇烽�夋嫨浜哄憳" }],
+ leaveDate: [{ required: true, message: "璇烽�夋嫨绂昏亴鏃ユ湡", trigger: "change" }],
reason: [{ required: true, message: "璇烽�夋嫨绂昏亴鍘熷洜"}],
},
dimissionReasonOptions: [
@@ -193,6 +209,7 @@
if (operationType.value === 'edit') {
currentStaffRecord.value = row
form.value.staffOnJobId = row.staffOnJobId
+ form.value.leaveDate = row.leaveDate
form.value.reason = row.reason
form.value.remark = row.remark
personList.value = [
@@ -239,6 +256,7 @@
// 琛ㄥ崟宸叉敞閲婏紝鎵嬪姩閲嶇疆琛ㄥ崟鏁版嵁
form.value = {
staffOnJobId: undefined,
+ leaveDate: "",
reason: "",
remark: "",
};
--
Gitblit v1.9.3