diff --git a/src/api/home/njgl/index.ts b/src/api/home/njgl/index.ts
index 4c5b374..1368189 100644
--- a/src/api/home/njgl/index.ts
+++ b/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 // 已用年假天数
diff --git a/src/views/Home/njgl/NjglForm.vue b/src/views/Home/njgl/NjglForm.vue
index 5fffd19..e3a54bd 100644
--- a/src/views/Home/njgl/NjglForm.vue
+++ b/src/views/Home/njgl/NjglForm.vue
@@ -27,6 +27,11 @@
+
+
+
+
+
@@ -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,
diff --git a/src/views/Home/njgl/index.vue b/src/views/Home/njgl/index.vue
index 4f2b9c6..e11b6b9 100644
--- a/src/views/Home/njgl/index.vue
+++ b/src/views/Home/njgl/index.vue
@@ -26,6 +26,15 @@
class="!w-240px"
/>
+
+
+
@@ -129,6 +138,7 @@
+