From 3546ce0ebc15751fcdc135b69395ed7b683a178b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 29 Nov 2023 15:59:17 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20API=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/09_leave/api.leave.ts                 |  5 +++++
 .../components/2_Leave/ToolBarLeave.vue       | 10 +++++++++
 .../components/4_Result/Table.vue             | 22 ++++++++++++-------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts
index 5e29ef1b2..369549925 100644
--- a/src/api/09_leave/api.leave.ts
+++ b/src/api/09_leave/api.leave.ts
@@ -16,4 +16,9 @@ export default {
   specialTime: () => `${leave}/admin/edit`,
   specialTimeApprove: (id: string) => `${leave}/admin/edit/approve/${id}`,
   specialTimeReject: (id: string) => `${leave}/admin/edit/reject/${id}`,
+
+  /** รายการลา*/
+  leaveType: () => `${leave}/type`,
+  leaveList: () => `${leave}/admin`,
+  leaveListById: (id: string) => `${leave}/admin/${id}`,
 };
diff --git a/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue b/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
index 7744e5841..79bfa610e 100644
--- a/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/ToolBarLeave.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
 import type { DateFilter } from "@/modules/09_leave/interface/request/leave";
 import type {
@@ -106,6 +108,14 @@ const optionStatusMain = ref<DataOption[]>(
 
 async function fetchOption() {
   console.log("loadOption  รอ API");
+  //   await http
+  //     .get(config.API.leaveType())
+  //     .then((res) => {
+  //       console.log(res);
+  //     })
+  //     .catch((err) => {
+  //       console.log(err);
+  //     });
 }
 
 /**
diff --git a/src/modules/11_discipline/components/4_Result/Table.vue b/src/modules/11_discipline/components/4_Result/Table.vue
index 9fff3642d..ea26fb38f 100644
--- a/src/modules/11_discipline/components/4_Result/Table.vue
+++ b/src/modules/11_discipline/components/4_Result/Table.vue
@@ -69,12 +69,13 @@ function resetFilter() {
   filterRef.value.focus();
 }
 
+function updateRowsPerPage(newPagination: any) {
+  pagination.value = newPagination;
+  currentPage.value = 1;
+}
+
 function filterFn() {
-  updatePaging(
-    currentPage.value,
-    Number(pagination.value.rowsPerPage),
-    filter.value
-  );
+  updatePaging(1, Number(pagination.value.rowsPerPage), filter.value);
 }
 
 function updatePaging(p: number, pS: number, key: string) {
@@ -82,7 +83,12 @@ function updatePaging(p: number, pS: number, key: string) {
 }
 
 watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
-  filterFn();
+  emit(
+    "update:queryString",
+    currentPage.value,
+    Number(pagination.value.rowsPerPage),
+    filter.value
+  );
 });
 </script>
 
@@ -109,7 +115,6 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
       ref="filterRef"
       @keydown.enter.prevent="filterFn"
       outlined
-      debounce="300"
       placeholder="ค้นหา"
       style="max-width: 200px"
       class="col-xs-12 col-sm-3 col-md-2"
@@ -148,8 +153,9 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
     virtual-scroll
     :virtual-scroll-sticky-size-start="48"
     dense
-    v-model:pagination="pagination"
     :rows-per-page-options="[10, 25, 50, 100]"
+    :pagination="pagination"
+    @update:pagination="updateRowsPerPage"
   >
     <template v-slot:header="props">
       <q-tr :props="props">