From 8cecc1e596c9aca35684af8aeb546352cc3a42c3 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Mon, 27 Nov 2023 16:31:45 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B8=81=20API=20=E0=B8=A5?= =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=81=E0=B8=A3?= =?UTF-8?q?=E0=B8=93=E0=B8=B5=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/09_leave/api.leave.ts | 5 + .../components/4_ChangeRound/DialogForm.vue | 1 + .../4_specialTime/DialogApprove.vue | 60 ++++-- .../09_leave/stores/ChangeRoundStore.ts | 2 +- .../09_leave/stores/SpecialTimeStore.ts | 176 +++++++++++++++--- .../09_leave/views/ChangeRoundMain.vue | 1 + .../09_leave/views/SpecialTimeMain.vue | 149 +++++++++------ 7 files changed, 296 insertions(+), 98 deletions(-) diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts index 2951e57ac..e419b80dc 100644 --- a/src/api/09_leave/api.leave.ts +++ b/src/api/09_leave/api.leave.ts @@ -8,7 +8,12 @@ export default { logRecord: () => `${leave}/log-record`, timeRecord: () => `${leave}/time-record`, timeRecordById: (id: string) => `${leave}/time-record/${id}`, + /** เปลี่ยนแปลงลงเวลา*/ leaveSearch: () => `${leave}/search`, leaveRound: () => `${leave}/round`, leaveRoundById: (id: string) => `${leave}/round/${id}`, + /**ลงเวลาพิเศษ */ + specialTime: () => `${leave}/admin/edit`, + specialTimeApprove: (id: string) => `${leave}/admin/edit/approve/${id}`, + specialTimeReject: (id: string) => `${leave}/admin/edit/reject/${id}`, }; diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue index 7afec33c1..4cd1565b0 100644 --- a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue +++ b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue @@ -306,6 +306,7 @@ watch( dense class="custom-header-table" :visible-columns="dataStore.visibleColumnsHistory" + :rows-per-page-options="[10, 25, 50, 100]" >