From d7af620b4ab2fafe190bc8b970cb211c53af026b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 16 Sep 2024 09:53:09 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=A5=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=88=E0=B8=B3=20=E0=B8=AF=20=3D=3D>=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=20=E0=B9=82=E0=B8=84=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TreeView.vue                   | 37 +++++++++----------
 .../16_positionEmployee/views/main.vue        | 36 ------------------
 src/stores/structureTree.ts                   |  1 +
 3 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/src/modules/16_positionEmployee/components/TreeView.vue b/src/modules/16_positionEmployee/components/TreeView.vue
index fe4bcae4d..2d4006df8 100644
--- a/src/modules/16_positionEmployee/components/TreeView.vue
+++ b/src/modules/16_positionEmployee/components/TreeView.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from "vue";
 import { useQuasar } from "quasar";
+
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { useStructureTree } from "@/stores/structureTree";
 
 /** importType*/
 import type {
@@ -27,6 +29,8 @@ const store = usePositionEmp();
 const $q = useQuasar();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
 const route = useRoute();
+const { fetchStructureTree } = useStructureTree();
+const storeStructureTree = useStructureTree();
 
 const nodeTree = ref<OrgTree[]>([]); // ข้อมูล Tree
 const nodeId = ref<string>(""); // id ของ Tree
@@ -54,24 +58,16 @@ const shortName = ref<string>("");
  * function fetch ข้อมูลของ Tree
  * @param id id โครงสร้าง
  */
-function fetchDataTree(id: string) {
+async function fetchDataTree() {
   isLoadTree.value = false;
-  showLoader();
-  http
-    .get(config.API.orgByIdSystem(id, route.meta.Key as string))
-    .then((res) => {
-      const data = res.data.result;
-      nodeTree.value = data;
-      selected.value = "";
-      nodeId.value = "";
-      store.treeId = "";
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
+  const dataTree = await fetchStructureTree(route.meta.Key as string, true);
+  store.activeId = storeStructureTree.activeId;
+  if (dataTree) {
+    nodeTree.value = dataTree;
+    selected.value = "";
+    nodeId.value = "";
+    store.treeId = "";
+  }
 }
 
 /**
@@ -186,9 +182,10 @@ function searchAndReplaceOrgName(data: any, targetId: string) {
  * lifecycle Hook
  */
 onMounted(() => {
-  setTimeout(async () => {
-    store.activeId && (await fetchDataTree(store.activeId));
-  }, 200);
+  fetchDataTree();
+  // setTimeout(async () => {
+  //   store.activeId && (await );
+  // }, 200);
 });
 
 /**
diff --git a/src/modules/16_positionEmployee/views/main.vue b/src/modules/16_positionEmployee/views/main.vue
index 68916948e..9a9a0c6da 100644
--- a/src/modules/16_positionEmployee/views/main.vue
+++ b/src/modules/16_positionEmployee/views/main.vue
@@ -1,42 +1,6 @@
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
 /** importComponents*/
 import TreeView from "@/modules/16_positionEmployee/components/TreeView.vue";
-
-/** importStore*/
-import { usePositionEmp } from "@/modules/16_positionEmployee/store/organizational";
-import { useCounterMixin } from "@/stores/mixin";
-
-/** use*/
-const $q = useQuasar();
-const { showLoader, hideLoader, messageError } = useCounterMixin();
-const store = usePositionEmp();
-
-/** function เรียกข้อมูลโครงสร้าง แบบปัจุบันและ แบบร่าง*/
-async function fetchOrganizationActive() {
-  showLoader();
-  await http
-    .get(config.API.activeOrganization)
-    .then((res) => {
-      const data = res.data.result;
-      if (data) {
-        store.fetchDataActive(data);
-      }
-    })
-    .catch((err) => {
-      messageError($q, err);
-      hideLoader();
-    });
-}
-
-/** lifecycleHook */
-onMounted(async () => {
-  await fetchOrganizationActive();
-});
 </script>
 
 <template>
diff --git a/src/stores/structureTree.ts b/src/stores/structureTree.ts
index d4d93ccd7..87e02eed6 100644
--- a/src/stores/structureTree.ts
+++ b/src/stores/structureTree.ts
@@ -92,6 +92,7 @@ export const useStructureTree = defineStore("structureTree", () => {
   }
 
   return {
+    activeId,
     fetchStructureTree,
     fetchTreeStrategy,
   };