From a43177b74bab6c44fd2e30ce83887c1447d31e1a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 20 Feb 2024 17:34:43 +0700
Subject: [PATCH] =?UTF-8?q?=20=20=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8=20=3D>?=
 =?UTF-8?q?=20=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20Load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonalList/CardPosition.vue     |  6 ++++--
 .../components/PersonalList/DialogSelectOrg.vue  | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 29e399185..f5c9653ec 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -189,10 +189,12 @@ const visibleColumns = ref<string[]>([
 
 onMounted(async () => {
   if (positionId.value) {
-    showLoader();
+    // showLoader();
     setTimeout(async () => {
       await onClickSelectPos(positionId.value);
-      await hideLoader();
+      // setTimeout(() => {
+      //   hideLoader();
+      // }, 2000);
     }, 1000);
   }
 });
diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index 4b90d70cb..697b92e54 100644
--- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
@@ -80,9 +80,6 @@ async function fetchOrganizationActive() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -105,7 +102,9 @@ async function fetchDataTree(id: string) {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
+      setTimeout(() => {
+        hideLoader();
+      }, 1000);
     });
 }
 
@@ -114,7 +113,7 @@ async function fetchDataTree(id: string) {
  * @param data ข่อมูล Tree
  */
 function updateSelected(data: TreeMain) {
-  console.log(props?.dataRow?.nodeId === data.orgTreeId);
+  // console.log(props?.dataRow?.nodeId === data.orgTreeId);
   if (props?.dataRow?.nodeId === data.orgTreeId) {
     positionId.value = props?.dataRow?.posmasterId;
     seletcId.value = props?.dataRow?.positionId;
@@ -136,6 +135,7 @@ function updateSelected(data: TreeMain) {
  * @param level  levelTree
  */
 async function fetchDataTable(id: string, level: number = 0) {
+  showLoader();
   const body = {
     node: level,
     nodeId: id,
@@ -159,7 +159,11 @@ async function fetchDataTable(id: string, level: number = 0) {
     .catch((err) => {
       messageError($q, err);
     })
-    .finally(() => {});
+    .finally(() => {
+      setTimeout(() => {
+        hideLoader();
+      }, 1000);
+    });
 }
 
 async function fetchPosFind(level: number, id: string) {