From eb12094af73b8b1d72709f54c447980de7276cea Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 8 Jul 2025 16:31:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=82=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=94=20kpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/components/Tab/01_Assessment.vue | 12 +++++-------
 src/modules/14_KPI/views/detailView.vue             |  2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index eadefe048..e781b33ed 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -207,15 +207,13 @@ watch(
 
 onMounted(async () => {
   showLoader();
-  await Promise.all([
+  Promise.all([
     getCriteria(),
-    fetchListPlanned(),
-    fetchListRole(),
-    fetchAssigned(),
+    await fetchListPlanned(),
+    await fetchListRole(),
+    await fetchAssigned(),
   ]).finally(() => {
-    setTimeout(() => {
-      hideLoader();
-    }, 1000);
+    hideLoader();
   });
 });
 </script>
diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue
index 8e1e10b00..58430ec81 100644
--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@@ -178,6 +178,7 @@ function onSubmit() {
 }
 
 async function getOrgOp() {
+  showLoader()
   await http
     .get(config.API.Kpiorg + `/${store.dataProfile.profileId}`)
     .then((res) => {
@@ -213,6 +214,7 @@ async function getOrgOp() {
           name: `${i.prefix}${i.firstName} ${i.lastName}`,
         }))
         .find((i: any) => i.id == store.dataEvaluation.commanderHighId);
+        hideLoader()
     })
     .catch((e) => {
       messageError($q, e);