From ccb6d1b4eb1df473a448d05225a3331e311d628a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 7 Apr 2025 18:40:07 +0700
Subject: [PATCH 1/3] hide loop noti total

---
 src/views/MainLayout.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 3231a8487..c8270e24e 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -233,7 +233,7 @@ const activeBtn = () => {
 };
 
 const isSsoToken = ref<boolean>(false);
-const interval = ref<any>(null);
+// const interval = ref<any>(null);
 /**
  * เมื่อเริ่มต้นโปรแกรมให้ฟัง event resize และ function myEventHandler
  * set function myEventHandler เพราะ state ยังไม่เซ็ท , state เซ็ทเมื่อ หน้าจอเริ่ม ขยับหน้าจอ
@@ -259,9 +259,9 @@ onMounted(async () => {
 
   fetchmsgNoread();
   // fetch noread noti every 15 seconds
-  interval.value = setInterval(() => {
-    fetchmsgNoread();
-  }, 15000);
+  // interval.value = setInterval(() => {
+  //   fetchmsgNoread();
+  // }, 15000);
 
   myEventHandler(null, false);
   window.addEventListener("resize", (e: any) => {
@@ -276,9 +276,9 @@ onUnmounted(() => {
   window.removeEventListener("resize", (e: any) => {
     myEventHandler(e, true);
   });
-  if (interval.value) {
-    clearInterval(interval.value);
-  }
+  // if (interval.value) {
+  //   clearInterval(interval.value);
+  // }
 });
 
 /**

From a7ac7ef625e6bf0d17c7da536d7e406c02e9725f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 8 Apr 2025 09:02:08 +0700
Subject: [PATCH 2/3] =?UTF-8?q?Salary=20=E0=B9=80=E0=B8=A5=E0=B8=82?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87=20'=20'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/04_salaryLists/TableTypeOther.vue      | 2 +-
 .../components/05_salaryListsEmployee/TableTypeOther.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
index 78adb7183..06779bb5b 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
@@ -453,7 +453,7 @@ watch(
             }}
           </div>
           <div v-else-if="col.name === 'posNo'">
-            {{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
+            {{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
           </div>
           <div v-else-if="col.name === 'fullName'">
             {{
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index b69df9e81..e055cd0a3 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -464,7 +464,7 @@ watch(
             }}
           </div>
           <div v-else-if="col.name === 'posNo'">
-            {{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
+            {{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
           </div>
           <div v-else-if="col.name === 'fullName'">
             {{

From 31619f3746b590b9f2dd58aec9b53c48028c8b25 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 8 Apr 2025 11:41:25 +0700
Subject: [PATCH 3/3] fix load eva

---
 .../components/Detail/step/step8.vue                 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
index 1c9328919..423d1caaf 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
@@ -193,7 +193,7 @@ async function confirmApprove() {
               data
             )
             .then(async () => {
-              updateEvaluationResult();
+              await updateEvaluationResult();
               await nextStep();
               modalConfirm.value = false;
             })
@@ -328,18 +328,18 @@ async function fetchDataSigner() {
     });
 }
 
-function updateEvaluationResult() {
+async function updateEvaluationResult() {
   http
     .put(config.API.updateEvaluationResult(id.value), {
       result: checkBox.value,
     })
-    .then((res) => {
-      hideLoader();
-    })
+    .then(() => {})
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 onMounted(async () => {