From e5418f401992502bc8f4ec9d7041561734f5c333 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 6 Aug 2024 17:06:58 +0800
Subject: [PATCH] tj
---
src/views/Pers/Employee/Comp/DialogEmployee.vue | 12 ++++++++++++
src/views/Pers/Employee/index.vue | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/views/Pers/Employee/Comp/DialogEmployee.vue b/src/views/Pers/Employee/Comp/DialogEmployee.vue
index 798b15e..7fc2ae9 100644
--- a/src/views/Pers/Employee/Comp/DialogEmployee.vue
+++ b/src/views/Pers/Employee/Comp/DialogEmployee.vue
@@ -114,6 +114,17 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="离职日期" prop="retireDate">
+ <el-date-picker
+ v-model="formData.retireDate"
+ type="date"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ placeholder="选择日期时间"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
@@ -230,6 +241,7 @@ const resetForm = () => {
remark: '',
status: CommonStatusEnum.ENABLE,
hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
+ retireDate: undefined,
attendanceSettingId: undefined,
instanceIds: []
}
diff --git a/src/views/Pers/Employee/index.vue b/src/views/Pers/Employee/index.vue
index 7a3affd..0214cd3 100644
--- a/src/views/Pers/Employee/index.vue
+++ b/src/views/Pers/Employee/index.vue
@@ -30,7 +30,7 @@
<el-table v-loading="loading" :data="tableList" border stripe>
<el-table-column type="index" width="50" />
- <el-table-column label="用户姓名" prop="name" />
+ <el-table-column label="姓名" prop="name" />
<el-table-column label="职位" prop="post" />
<el-table-column label="手机号码" prop="mobile" width="120" />
<el-table-column label="考勤方案" prop="attendanceSettingName" />