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

---
 .../15_development/components/BasicInfo.vue   | 48 +++++--------------
 .../15_development/components/MainTab.vue     |  3 +-
 src/modules/15_development/views/MainPage.vue | 46 +++++-------------
 3 files changed, 27 insertions(+), 70 deletions(-)

diff --git a/src/modules/15_development/components/BasicInfo.vue b/src/modules/15_development/components/BasicInfo.vue
index df245b31d..e7f1b1a72 100644
--- a/src/modules/15_development/components/BasicInfo.vue
+++ b/src/modules/15_development/components/BasicInfo.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted } from "vue";
 import { useQuasar } from "quasar";
+
 import { useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { useStructureTree } from "@/stores/structureTree";
 
 /** importType*/
 import type { FormBasicinfo } from "@/modules/15_development/interface/request/Main";
@@ -16,6 +18,7 @@ import { useCounterMixin } from "@/stores/mixin";
 const $q = useQuasar();
 const route = useRoute();
 const mixin = useCounterMixin();
+const { fetchStructureTree } = useStructureTree();
 const { showLoader, hideLoader, messageError, success } = mixin;
 
 /**
@@ -42,7 +45,7 @@ const formData = reactive<FormBasicinfo>({
 });
 
 const orgName = ref<string>("");
-const node = ref<any>([]);
+const node = ref<any[]>([]);
 const filter = ref<string>("");
 const expanded = ref<string[]>([]);
 
@@ -50,9 +53,9 @@ const expanded = ref<string[]>([]);
  * function fetch ข้อมูลเบื้องต้น
  * @param id ProjectId
  */
-function fetchData(id: string) {
+async function fetchData(id: string) {
   showLoader();
-  http
+  await http
     .get(config.API.developmentMainTab("tab1", id))
     .then(async (res) => {
       const data = res.data.result;
@@ -104,39 +107,14 @@ function onSubmit() {
 }
 
 /**
- * function fetch หา Id หน่วยงานที่ Active
+ *
  */
-function fetchActive() {
-  showLoader();
-  http
-    .get(config.API.activeOrganization)
-    .then((res) => {
-      const data = res.data.result;
-      fetchTree(data.activeId);
-    })
-    .catch((err) => {
-      messageError($q, err);
-      hideLoader();
-    });
-}
-
-/**
- * function fetch โครงสร้างปจุบัน
- * @param id โครงสร้างปจุบัน
- */
-function fetchTree(id: string) {
-  showLoader();
-  http
-    .get(config.API.orgByIdSystem(id, route.meta.Key as string))
-    .then((res) => {
-      const data = res.data.result;
-      node.value = data;
-      fetchData(projectId.value);
-    })
-    .catch((err) => {
-      messageError($q, err);
-      hideLoader();
-    });
+async function fetchActive() {
+  const dataTree = await fetchStructureTree(route.meta.Key as string, true);
+  if (dataTree) {
+    node.value = dataTree;
+    await fetchData(projectId.value);
+  }
 }
 
 /** function เลือกหน่วยงาน
diff --git a/src/modules/15_development/components/MainTab.vue b/src/modules/15_development/components/MainTab.vue
index 1e080593b..68a4508d6 100644
--- a/src/modules/15_development/components/MainTab.vue
+++ b/src/modules/15_development/components/MainTab.vue
@@ -71,10 +71,9 @@ function getStatus(id: string) {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
       hideLoader();
     });
+  // .finally(() => {});
 }
 
 /** function ยืนยันการเสร็จสิ้นโครงการ*/
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index edcbb579a..f4af382e5 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import { ref, onMounted, reactive, watch } from "vue";
 import { useQuasar, type QTableProps } from "quasar";
-import { useRoute, useRouter } from "vue-router";
 import genReportXLSX from "@/plugins/genreportxlsx";
+
+import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
+import { useStructureTree } from "@/stores/structureTree";
+
 /**importType*/
 import type {
   DataOption,
@@ -34,6 +37,7 @@ const $q = useQuasar();
 const route = useRoute();
 const router = useRouter();
 const store = useDevelopmentDataStore();
+const { fetchStructureTree } = useStructureTree();
 const {
   showLoader,
   hideLoader,
@@ -115,9 +119,9 @@ const formQuery = reactive<FormQueryListProject>({
 });
 
 /** funciton  fetch รายการโครงการ*/
-function fetchListProject() {
+async function fetchListProject() {
   showLoader();
-  http
+  await http
     .get(
       config.API.developmentMain +
         `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}&status=${formQuery.status}&node=${formQuery.node}&nodeId=${formQuery.nodeId}`
@@ -217,36 +221,12 @@ function onSubmit() {
 }
 
 /** function fetch หา Id หน่วยงานที่ Active*/
-function fetchActive() {
-  showLoader();
-  http
-    .get(config.API.activeOrganization)
-    .then((res) => {
-      const data = res.data.result;
-      fetchTree(data.activeId);
-    })
-    .catch((err) => {
-      messageError($q, err);
-      hideLoader();
-    });
-}
-
-/**
- * function fetch โครงสร้างปจุบัน
- * @param id โครงสร้างปจุบัน
- */
-function fetchTree(id: string) {
-  http
-    .get(config.API.orgByIdSystem(id, route.meta.Key as string))
-    .then((res) => {
-      const data = res.data.result;
-      node.value = data;
-      fetchListProject();
-    })
-    .catch((err) => {
-      messageError($q, err);
-      hideLoader();
-    });
+async function fetchActive() {
+  const dataTree = await fetchStructureTree(route.meta.Key as string, true);
+  if (dataTree) {
+    await fetchListProject();
+    node.value = dataTree;
+  }
 }
 
 /**