diff --git a/src/api/leave/api.leave.ts b/src/api/leave/api.leave.ts index 7ef7858..29515f2 100644 --- a/src/api/leave/api.leave.ts +++ b/src/api/leave/api.leave.ts @@ -2,6 +2,7 @@ import env from "../index" const retirementResign = `${env.API_URI}/retirement` const leave = `${env.API_URI}/leave` +const holiday = `${env.API_URI}/metadata/holiday/` export default { listUser: () => `${retirementResign}/resign/user`, @@ -24,4 +25,6 @@ export default { leaveCheck: () => `${leave}/user/check`, leaveReport: (id: string) => `${leave}/report/${id}`, leaveSendReport: () => `${leave}/report-template/docx`, + + listHolidayHistoryYearMonth: (year: number, month: number) => `${holiday}${year}/${month}`, } diff --git a/src/modules/05_leave/components/Calendar.vue b/src/modules/05_leave/components/Calendar.vue index e5b8307..636acd1 100644 --- a/src/modules/05_leave/components/Calendar.vue +++ b/src/modules/05_leave/components/Calendar.vue @@ -1,153 +1,184 @@