From 207b036e400c070e95d2c105d61852d2f6feed9e Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 23 Oct 2024 18:07:46 +0800
Subject: [PATCH] 1

---
 src/views/system/components/AddUser.vue | 10 +++++++++-
 src/views/system/user.vue               | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/system/components/AddUser.vue b/src/views/system/components/AddUser.vue
index 6cfc778..13243a6 100644
--- a/src/views/system/components/AddUser.vue
+++ b/src/views/system/components/AddUser.vue
@@ -26,9 +26,15 @@
         <el-form-item label="手机号" prop="mobile">
           <el-input v-model="form.mobile" clearable />
         </el-form-item>
+        <el-form-item label="参加工作时间" prop="start_work_date">
+          <el-date-picker v-model="form.start_work_date" type="month" value-format="yyyy-MM" clearable />
+        </el-form-item>
+        <el-form-item label="年假天数" prop="year_holiday">
+          <el-input-number v-model="form.year_holiday" controls-position="right" clearable />
+        </el-form-item>
         <el-form-item label="部门" prop="department_id">
           <el-select v-model="form.department_id" clearable>
-            <el-option v-for="item in departments" :key="item.id" :value="item.id" :label="item.name"></el-option>
+            <el-option v-for="item in departments" :key="item.id" :value="item.id" :label="item.name" />
           </el-select>
         </el-form-item>
         <el-form-item label="职位" prop="position">
@@ -69,6 +75,8 @@ export default {
         password: '',
         attendance_closed: 0,
         mobile: '',
+        start_work_date: '',
+        year_holiday: '',
         department_id: '',
         position: '',
         sortnumber: 0
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index dda9327..b313b86 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -32,13 +32,19 @@
         <vxe-column field="department.name" width="160" align="center" title="部门" :edit-render="{}">
           <template #edit="{ row }">
             <el-select v-model="row.department_id" size="small">
-              <el-option v-for="item in departments" :value="item.id" :label="item.name"></el-option>
+              <el-option v-for="item in departments" :key="item.id" :value="item.id" :label="item.name" />
             </el-select>
           </template>
         </vxe-column>
         <vxe-column field="position" width="140" title="职位" align="center" :edit-render="{ name: 'input', attrs: { type: 'text'} }" />
         <vxe-column field="attendance_closed" width="130" align="center" title="是否关闭打卡" :edit-render="{ name: 'select', options: [{ value: 1, label: '是' },{ value: 0, label: '否' }] }" />
         <vxe-column field="mobile" width="140" align="center" title="手机号" :edit-render="{ name: 'input', attrs: { type: 'text' } }" />
+        <vxe-column field="start_work_date" title="参加工作时间" width="140" align="center" :edit-render="{}">
+          <template #edit="{ row }">
+            <el-date-picker v-model="row.start_work_date" size="small" style="width: 100%;" type="month" value-format="yyyy-MM" />
+          </template>
+        </vxe-column>
+        <vxe-column field="year_holiday" width="140" title="年假天数" align="center" :edit-render="{ name: 'input', attrs: { type: 'number'} }" />
         <vxe-column field="roles" title="角色" min-width="200" show-overflow="tooltip">
           <template #default="{ row }">
             <div>
@@ -152,6 +158,8 @@ export default {
         username: '',
         password: '',
         department_id: '',
+        start_work_date: '',
+        year_holiday: '',
         position: '',
         sortnumber: 0
       },