From 23cb1649f5abc88b1d291a63fe65d8fba6346126 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 4 Jan 2024 15:18:18 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=AB=E0=B8=A2=E0=B8=B8=E0=B8=94?= =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=97=E0=B8=B4?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leave/api.leave.ts | 3 + src/modules/05_leave/components/Calendar.vue | 649 +++++++++---------- 2 files changed, 312 insertions(+), 340 deletions(-) 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 @@