年假管理年份

src/api/home/njgl/index.ts

@@ -6,6 +6,7 @@ export interface NjglVO {
   userName: string // 员工名字
   userId: number // 员工id
   deptName: string // 部门名字
+  year: string // 部门名字
   deptId: number // 部门id
   annualDays: number // 年假总天数
   usedDays: number // 已用年假天数

src/views/Home/njgl/NjglForm.vue

@@ -27,6 +27,11 @@
             <el-input v-model.number="formData.annualDays" placeholder="请输入年假总天数" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="请假年份" prop="year">
+            <el-input v-model.number="formData.year" placeholder="请输入请假年份" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="是否锁定" prop="status">
             <el-radio-group v-model="formData.status">
@@ -118,6 +123,7 @@ const formData = ref({
   userName: undefined,
   userId: undefined,
   deptName: undefined,
+  year: undefined,
   deptId: undefined,
   annualDays: undefined,
   usedDays: undefined,
@@ -145,6 +151,7 @@ const formRules = reactive({
   ],
   startDate: [{ required: true, message: '年假开始日期不能为空', trigger: 'blur' }],
   endDate: [{ required: true, message: '年假结束日期不能为空', trigger: 'blur' }],
+  year: [{ required: true, message: '请假年份不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '是否锁定年假信息不能为空', trigger: 'blur' }],
   dataStatus: [{ required: true, message: '是否启用年假信息不能为空', trigger: 'blur' }],
 })
@@ -228,6 +235,7 @@ const resetForm = () => {
     userName: undefined,
     userId: undefined,
     deptName: undefined,
+    year: undefined,
     deptId: undefined,
     annualDays: undefined,
     usedDays: undefined,

src/views/Home/njgl/index.vue

@@ -26,6 +26,15 @@
           class="!w-240px"
         />
       </el-form-item>
+      <el-form-item label="数据年份" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入数据年份"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item label="已用天数" prop="usedDays">
         <el-input
           v-model="queryParams.usedDays"
@@ -84,7 +93,7 @@
       <el-form-item label="是否启用" prop="dataStatus">
         <el-select
           v-model="queryParams.dataStatus"
-          placeholder="请选择是否锁定年假信息"
+          placeholder="请选择是否启用年假信息"
           clearable
           class="!w-240px"
         >
@@ -129,6 +138,7 @@
       <el-table-column label="年假天数" align="center" prop="annualDays" />
       <el-table-column label="已用天数" align="center" prop="usedDays" />
       <el-table-column label="剩余天数" align="center" prop="remainingDays" />
+      <el-table-column label="请假年数" align="center" prop="year" />
       <el-table-column
         label="年假开始日期"
         align="center"
@@ -210,6 +220,7 @@ const queryParams = reactive({
   userName: undefined,
   userId: undefined,
   deptName: undefined,
+  year: undefined,
   deptId: undefined,
   annualDays: undefined,
   usedDays: undefined,