From eee6504a5d96feb2f9df594aad1b165f7f14692b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Jun 2024 18:07:08 +0700
Subject: [PATCH] fix bug

---
 .../indicatorByPlan/IndicatorByPlan.vue       |  8 +++++++
 .../01_metadataNew/views/indicatorByPlan.vue  |  2 +-
 src/modules/17_acting/views/main.vue          | 24 ++++++++++++-------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index fde9bee1d..ce07b7fce 100644
--- a/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -90,6 +90,7 @@ function fetchOrganizationActive() {
 
 /** function fetchTree ยุทธศาสตร์ / แผน*/
 function fetchTreeStrategy() {
+  showLoader();
   http
     .get(config.API.devStrategy)
     .then((res) => {
@@ -98,11 +99,15 @@ function fetchTreeStrategy() {
     })
     .catch((err) => {
       messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
     });
 }
 
 /** functioon fetchcTree หน่วยงาน/ส่วนราชการ*/
 function fetchTreeAgency(id: string) {
+  showLoader();
   http
     .get(config.API.orgByid(id.toString()))
     .then(async (res) => {
@@ -112,6 +117,9 @@ function fetchTreeAgency(id: string) {
     })
     .catch((err) => {
       messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
     });
 }
 
diff --git a/src/modules/01_metadataNew/views/indicatorByPlan.vue b/src/modules/01_metadataNew/views/indicatorByPlan.vue
index 543abc35d..3a6b4f220 100644
--- a/src/modules/01_metadataNew/views/indicatorByPlan.vue
+++ b/src/modules/01_metadataNew/views/indicatorByPlan.vue
@@ -189,7 +189,7 @@ function onClickHistory(id: string) {
 
 onMounted(async () => {
   await fetchActive();
-  await fetchList();
+  // await fetchList();
 });
 </script>
 
diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 2347013f1..43ae87445 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, reactive } from "vue";
+import { ref, onMounted, reactive, watch } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -25,6 +25,7 @@ const expanded = ref<Array<string>>([]);
 const filter = ref<string>("");
 const nodeTree = ref<DataTree[]>([]);
 const posmasterId = ref<string>("");
+const isAll = ref<boolean>(false);
 
 /** function เรียกข้อมูลโครงสร้าง แบบปัจุบัน*/
 function fetchOrganizationActive() {
@@ -143,7 +144,10 @@ const keyword = ref<string>("");
 function fetchPosMaster() {
   showLoader();
   http
-    .post(config.API.orgPosAct + `/search`, { posmasterId: posmasterId.value })
+    .post(config.API.orgPosAct + `/search`, {
+      posmasterId: posmasterId.value,
+      // isAll: isAll.value,
+    })
     .then((res) => {
       const data = res.data.result;
       rowPosition.value = data;
@@ -156,6 +160,11 @@ function fetchPosMaster() {
     });
 }
 
+function updateIsAll(val: boolean) {
+  isAll.value = val;
+  fetchPosMaster();
+}
+
 /**
  * function เลือกราชชื่อรักษาการ
  * @param data ข้อมูลรายชื่อ
@@ -334,16 +343,15 @@ onMounted(() => {
                     <q-space />
                     <div class="row q-gutter-md">
                       <div>
-                        <!-- <q-checkbox
+                        <q-checkbox
+                          @update:model-value="updateIsAll"
                           keep-color
-                          v-model="reqMaster.isAll"
+                          v-model="isAll"
                           label="แสดงตำแหน่งทั้งหมด"
                           color="primary"
                         >
-                          <q-tooltip
-                            >แสดงตำแหน่งทั้งหมดภายใต้หน่วยงาน/ส่วนราชการที่เลือก</q-tooltip
-                          >
-                        </q-checkbox> -->
+                          <q-tooltip>แสดงตำแหน่งทั้งหมด</q-tooltip>
+                        </q-checkbox>
                       </div>
                       <div>
                         <q-input outlined dense v-model="keyword" label="ค้นหา">