From 82a8fc155ab01d05c03b36ae08611620d497ae2e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 Nov 2024 18:07:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B9=89=E0=B8=99=E0=B9=81=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9A=20=E0=B8=AA=E0=B8=B3=E0=B8=AB=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=A5=E0=B8=87=E0=B9=83=E0=B8=99=E0=B8=95=E0=B8=B3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87/=E0=B9=80?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/05_command/api.command.ts            |  2 +-
 src/modules/05_command/views/salaryLists.vue |  2 ++
 src/views/MainLayout.vue                     | 12 ++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/api/05_command/api.command.ts b/src/api/05_command/api.command.ts
index d9c4e897..9857f070 100644
--- a/src/api/05_command/api.command.ts
+++ b/src/api/05_command/api.command.ts
@@ -13,6 +13,6 @@ export default {
     commandSysId: string,
     search: string
   ) =>
-    `${commandSalary}/admin?page=${page}&pageSize=${pageSize}&isActive=${isActive}&commandSysId=${commandSysId}&search=${search}`,
+    `${commandSalary}/admin?page=${page}&pageSize=${pageSize}&isActive=${isActive}&commandSysId=${commandSysId}&searchKeyword=${search}`,
   commandSalaryById: (id: string) => `${commandSalary}/${id}`,
 };
diff --git a/src/modules/05_command/views/salaryLists.vue b/src/modules/05_command/views/salaryLists.vue
index 6d11fd44..26b1748e 100644
--- a/src/modules/05_command/views/salaryLists.vue
+++ b/src/modules/05_command/views/salaryLists.vue
@@ -174,6 +174,8 @@ function onSubmit() {
 function selectInbox(data: CommandSysType) {
   activeOrderId.value = data.id;
   pagination.value.page = 1;
+  filter.value = "";
+
   fetchSalaryList();
 }
 
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 8f887f18..23f8570d 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -97,7 +97,7 @@ async function getDataNotification(index: number, type: string) {
     minute: "2-digit",
   };
   await http
-    .get(config.API.msgNotificate + `?page=${index}&pageSize=${10}`)
+    .get(config.API.msgNotificate + `?page=${index}&pageSize=${15}`)
     .then((res) => {
       const response = res.data.result.data;
       totalInbox.value = res.data.result.total;
@@ -286,9 +286,9 @@ function onLoad(index: any, done: Function) {
     (notiList.value.length === 0 && totalInbox.value === 0)
   ) {
     page.value++;
-    setTimeout(() => {
+    setTimeout(async () => {
+      await getDataNotification(page.value, "NOMAL");
       done();
-      getDataNotification(page.value, "NOMAL");
     }, 1500);
   }
 }
@@ -443,7 +443,11 @@ onUnmounted(() => {
             v-if="totalNoti !== 0"
             >{{ totalNoti }}</q-badge
           >
-          <q-menu v-model="notiTrigger" :offset="[0, 8]" style="width: 480px">
+          <q-menu
+            v-model="notiTrigger"
+            :offset="[0, 8]"
+            style="width: 480px; height: 60vh"
+          >
             <div class="q-px-md q-py-sm row col-12 items-center">
               <div class="text-subtitle1 text-weight-medium">การแจ้งเตือน</div>
               <q-space />