From 5d165e86102f6bee09affa9366956461654e00c7 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 1 Apr 2025 09:49:06 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../09_leave/components/05_Leave/Tab1.vue     | 22 +++++++++----------
 .../09_leave/components/05_Leave/Tab2.vue     | 22 +++++++++----------
 src/modules/09_leave/stores/LeaveStore.ts     |  1 +
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/Tab1.vue b/src/modules/09_leave/components/05_Leave/Tab1.vue
index 61fd3cae1..9c1e1101b 100644
--- a/src/modules/09_leave/components/05_Leave/Tab1.vue
+++ b/src/modules/09_leave/components/05_Leave/Tab1.vue
@@ -23,7 +23,7 @@ const { showLoader, hideLoader, messageError } = mixin;
 const total = ref<number>(0);
 const totalList = ref<number>(1);
 
-const querySting = reactive<QuerySting>({
+const querySting = ref<QuerySting>({
   year: leaveStore.filter.year, //*ปีในการยื่นขอใบลา(ใช้เป็น คศ.)
   type: leaveStore.filter.type, //*Id ประเภทการลา
   status: leaveStore.filter.status, //*สถานะการของลา
@@ -38,22 +38,22 @@ const querySting = reactive<QuerySting>({
 //** เรียกข้อมูลจาก API*/
 async function fecthLeaveList() {
   leaveStore.rows = [];
-  querySting.keyword = querySting.keyword.trim();
-  querySting.status = await (querySting.status == null
+  querySting.value.keyword = querySting.value.keyword.trim();
+  querySting.value.status = await (querySting.value.status == null
     ? "ALL"
-    : querySting.status);
-  querySting.type = await (querySting.type == null
+    : querySting.value.status);
+  querySting.value.type = await (querySting.value.type == null
     ? "00000000-0000-0000-0000-000000000000"
-    : querySting.type);
+    : querySting.value.type);
 
-  if (querySting.status != null && querySting.type != null) {
+  if (querySting.value.status != null && querySting.value.type != null) {
     showLoader();
     await http
-      .post(config.API.leaveList(), querySting)
+      .post(config.API.leaveList(), querySting.value)
       .then(async (res) => {
         const data = res.data.result;
         totalList.value = Math.ceil(
-          res.data.result.total / querySting.pageSize
+          res.data.result.total / querySting.value.pageSize
         );
         total.value = res.data.result.total;
         await leaveStore.fetchListLeave(data.data); /** ส่งข้อมูลไป stores*/
@@ -82,12 +82,12 @@ async function fetchOption() {
 }
 
 function getSearch() {
-  querySting.page = 1;
+  querySting.value.page = 1;
   fecthLeaveList();
 }
 
 watch(
-  () => querySting.pageSize,
+  () => querySting.value.pageSize,
   async () => {
     getSearch();
   }
diff --git a/src/modules/09_leave/components/05_Leave/Tab2.vue b/src/modules/09_leave/components/05_Leave/Tab2.vue
index d4181f01c..dad4bbe93 100644
--- a/src/modules/09_leave/components/05_Leave/Tab2.vue
+++ b/src/modules/09_leave/components/05_Leave/Tab2.vue
@@ -25,7 +25,7 @@ const $q = useQuasar(); //ใช้ noti quasar
 const total = ref<number>(0);
 const totalList = ref<number>(1);
 
-const querySting = reactive<QuerySting>({
+const querySting = ref<QuerySting>({
   year: leaveStore.filter.year, //*ปีในการยื่นขอใบลา(ใช้เป็น คศ.)
   type: leaveStore.filter.type, //*Id ประเภทการลา
   status: leaveStore.filter.status, //*สถานะการของลา
@@ -39,22 +39,22 @@ const querySting = reactive<QuerySting>({
 //** เรียกข้อมูลจาก API*/
 async function fecthLeaveList() {
   leaveStore.rows = [];
-  querySting.keyword = querySting.keyword.trim();
-  querySting.status = await (querySting.status == null
+  querySting.value.keyword = querySting.value.keyword.trim();
+  querySting.value.status = await (querySting.value.status == null
     ? "ALL"
-    : querySting.status);
-  querySting.type = await (querySting.type == null
+    : querySting.value.status);
+  querySting.value.type = await (querySting.value.type == null
     ? "00000000-0000-0000-0000-000000000000"
-    : querySting.type);
+    : querySting.value.type);
 
-  if (querySting.status != null && querySting.type != null) {
+  if (querySting.value.status != null && querySting.value.type != null) {
     showLoader();
     await http
-      .post(config.API.leaveListDelete(), querySting)
+      .post(config.API.leaveListDelete(), querySting.value)
       .then((res) => {
         const data = res.data.result;
         totalList.value = Math.ceil(
-          res.data.result.total / querySting.pageSize
+          res.data.result.total / querySting.value.pageSize
         );
         total.value = res.data.result.total;
         fetchListLeaveReject(data.data); /** ส่งข้อมูลไป stores*/
@@ -83,12 +83,12 @@ async function fetchOption() {
 }
 
 function getSearch() {
-  querySting.page = 1;
+  querySting.value.page = 1;
   fecthLeaveList();
 }
 
 watch(
-  () => querySting.pageSize,
+  () => querySting.value.pageSize,
   async () => {
     getSearch();
   }
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 26a833b2d..ad3882317 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -173,6 +173,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     dataToobar.value = val.map((e: any) => ({
       id: e.id,
       name: e.name,
+      code:e.code
     }));
   }