From 75fa420862250ceb64bea520699913f70502356f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Mar 2025 14:39:04 +0700
Subject: [PATCH] =?UTF-8?q?fix=20load=20=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registryPerson/views/listView.vue | 15 ++++++++++-----
 src/stores/structureTree.ts                      |  3 ---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index 20e26a18e..6779b012d 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -27,6 +27,7 @@ const TableView = defineAsyncComponent(
   () => import("@/modules/04_registryPerson/components/TableView.vue")
 );
 import DialogHeader from "@/components/DialogHeader.vue";
+import LoadView from "@/components/LoadView.vue";
 
 const $q = useQuasar();
 const store = useRegistryNewDataStore();
@@ -47,7 +48,7 @@ const expanded = ref<string[]>([]); //แสดงข้อมูลในโค
 
 const selectNode = ref<boolean>(false); //แสดงโครงสร้าง
 
-const isLoad = ref<boolean>(false); //โหลดข้อมูลโครงสร้าง
+const isLoad = ref<boolean>(true); //โหลดข้อมูลโครงสร้าง
 const nodeData = reactive<DataNodeData>({
   name: "เลือกหน่วยงาน/ส่วนราชการ",
   nodeId: null,
@@ -342,7 +343,7 @@ async function fetchTree() {
     store.routerName = route.name ? route.name : "";
   }
   if (data) {
-    isLoad.value = true;
+    isLoad.value = false;
     node.value = data;
     // hideLoader();
   }
@@ -379,7 +380,9 @@ function updateSelectedTreeMain(data: DataStructureTree) {
 
 /** callback function เมื่อมีการเปิด popup*/
 watch(selectNode, () => {
-  isLoad.value && hideLoader();
+  if (selectNode.value) {
+    isLoad.value = node.value.length !== 0 ? false : true;
+  }
 });
 
 function getSearch() {
@@ -468,7 +471,7 @@ onMounted(async () => {
                   label-color="white"
                   dropdown-icon="mdi-chevron-down"
                   class="q-pl-sm"
-                  @click="() => ((selectNode = true), showLoader())"
+                  @click="() => (selectNode = true)"
                 >
                   <template v-slot:label>
                     {{
@@ -853,7 +856,8 @@ onMounted(async () => {
       <q-separator />
 
       <q-card-section class="q-pa-sm">
-        <div class="row q-col-gutter-sm">
+        <LoadView v-if="isLoad" />
+        <div class="row q-col-gutter-sm" v-else>
           <div class="col-12">
             <q-input dense outlined v-model="filterMain" label="ค้นหา">
               <template v-slot:append>
@@ -869,6 +873,7 @@ onMounted(async () => {
           </div>
           <div class="col-12">
             <q-tree
+              loading
               class="tree-container"
               dense
               :nodes="node"
diff --git a/src/stores/structureTree.ts b/src/stores/structureTree.ts
index bd81098a4..1de8bf225 100644
--- a/src/stores/structureTree.ts
+++ b/src/stores/structureTree.ts
@@ -28,9 +28,6 @@ export const useStructureTree = defineStore("structureTree", () => {
    * @returns ข้อมูลโครงสร้าง
    */
   async function fetchStructureTree(sysKey: string, isLoad: boolean = false) {
-    console.log(sysKey);
-    console.log(dataStore.value);
-
     if (dataStore.value[sysKey]) {
       return dataStore.value[sysKey] || [];
     } else {