From e467555e887b1da3319ad194c728c7c5da1059e1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 3 Feb 2025 15:23:24 +0700
Subject: [PATCH] fix nodeDnaId

---
 .../indicatorByPlan/IndicatorByPlan.vue       |  6 ++++--
 .../Indicators/indicatorByRole/DetailView.vue |  7 ++++---
 .../01_masterdata/views/indicatorByPlan.vue   |  5 +++--
 .../01_masterdata/views/indicatorByRole.vue   | 19 +++++++++----------
 .../15_development/components/BasicInfo.vue   |  5 ++++-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index 17a3af36d..35c2f9394 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -70,6 +70,7 @@ const roundOp = ref<DataOption[]>([
   { id: "OCT", name: "รอบตุลาคม" },
 ]);
 
+const nodeDnaId = ref<string>("");
 const nodeplan = ref<NodePlan[]>([]);
 const nodeAgency = ref<OrgTreeNode[]>([]);
 const filter = ref<string>("");
@@ -117,6 +118,7 @@ async function fetchDataById(id: string) {
       planData.strategy = data.strategy;
       planData.strategyId = data.strategyId;
       planData.documentInfoEvidence = data.documentInfoEvidence;
+      nodeDnaId.value = data.nodeDnaId;
 
       // หน่วยงาน/ส่วนราชการ
       const arrayexpandedAgency = [
@@ -168,6 +170,7 @@ function updateSelectedAgency(data: any, isUpdate: boolean = false) {
   } else {
     planData.node = data.orgLevel;
     planData.nodeId = data.orgTreeId;
+    nodeDnaId.value = data.orgTreeDnaId;
   }
   planData.orgRevisionId = data.orgRevisionId;
 }
@@ -304,7 +307,6 @@ onMounted(async () => {
                   <template v-slot:append>
                     <q-icon
                       v-if="year && !checkRoute"
-                      
                       name="cancel"
                       class="cursor-pointer"
                       @click.stop.prevent="year = 0"
@@ -551,7 +553,7 @@ onMounted(async () => {
                     <q-item
                       :clickable="!checkRoute"
                       @click.stop="updateSelectedAgency(prop.node)"
-                      :active="planData.nodeId == prop.node.orgTreeId"
+                      :active="nodeDnaId == prop.node.orgTreeDnaId"
                       active-class="my-list-link text-primary text-weight-medium"
                       class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                     >
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index 599b0d996..185d947c9 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -79,6 +79,7 @@ const formScore = reactive<any>({
 
 const positionOp = ref<DataOption[]>([]);
 const positionMainOp = ref<DataOption[]>([]);
+const nodeDnaId = ref<string>("");
 
 /** Option  รอบการประเมิน*/
 const roundOp = ref<DataOption[]>([
@@ -184,8 +185,6 @@ function onSubmit() {
   }
 }
 
-//
-//
 async function getDetail() {
   showLoader();
   await http
@@ -203,6 +202,7 @@ async function getDetail() {
       form.meaning = data.meaning;
       form.formula = data.formula;
       form.documentInfoEvidence = data.documentInfoEvidence;
+      nodeDnaId.value = data.nodeDnaId;
 
       formScore.score1 = data.achievement1;
       formScore.score2 = data.achievement2;
@@ -240,6 +240,7 @@ function updateSelected(data: any) {
   form.node = data.orgLevel;
   form.nodeId = data.orgTreeId;
   form.orgRevisionId = data.orgRevisionId;
+  nodeDnaId.value = data.orgTreeDnaId;
 }
 
 function onResize(size: any) {
@@ -470,7 +471,7 @@ onMounted(() => {
                       <q-item
                         :clickable="!checkRoute"
                         @click.stop="updateSelected(prop.node)"
-                        :active="form.nodeId === prop.node.orgTreeId"
+                        :active="nodeDnaId == prop.node.orgTreeDnaId"
                         active-class="my-list-link text-primary text-weight-medium"
                         class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                       >
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index c44098e97..e8cb74971 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -139,7 +139,7 @@ function updateSelectedTreeMain(data: any) {
     nodeData.nodeId = null;
   } else {
     nodeData.node = data.orgLevel;
-    nodeData.nodeId = data.orgTreeId;
+    nodeData.nodeId = data.orgTreeDnaId;
   }
   getSearch();
 }
@@ -246,7 +246,7 @@ onMounted(() => {
                 <q-item
                   clickable
                   @click.stop="updateSelectedTreeMain(prop.node)"
-                  :active="nodeData.nodeId === prop.node.orgTreeId"
+                  :active="nodeData.nodeId === prop.node.orgTreeDnaId"
                   active-class="my-list-link text-primary text-weight-medium"
                   class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                 >
@@ -352,6 +352,7 @@ onMounted(() => {
           <q-space />
 
           <q-checkbox
+            :disable="nodeData.nodeId === null"
             keep-color
             v-model="isAll"
             label="แสดงทั้งหมด"
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index 50e2f24fb..caa472d1a 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -191,7 +191,7 @@ function filterOption(val: any, update: Function) {
 
 /** ดึงข้อมูลตำแหน่ง */
 async function getOptions() {
-  showLoader();
+  // showLoader();
   await http
     .get(config.API.orgSalaryPosition)
     .then(async (res) => {
@@ -218,14 +218,10 @@ async function getOptions() {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
+      // hideLoader();
     });
 }
 
-function setModel(val: string) {
-  formFilter.position = val;
-}
-
 /**
  * เปิด dialog history
  * @param id
@@ -248,7 +244,7 @@ function onClickHistory(id: string) {
 }
 
 async function getTotal() {
-  showLoader();
+  // showLoader();
   await http
     .post(config.API.indicatorSummary)
     .then(async (res) => {
@@ -264,12 +260,15 @@ async function getTotal() {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      // hideLoader();
     });
 }
 
 onMounted(async () => {
-  await Promise.all([getTotal(), getOptions(), fetchList()]);
+  showLoader();
+  await Promise.all([getTotal(), getOptions(), fetchList()]).finally(() => {
+    hideLoader();
+  });
 });
 </script>
 
@@ -572,7 +571,7 @@ onMounted(async () => {
                 }}
               </div>
 
-              <div v-else >
+              <div v-else>
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
diff --git a/src/modules/15_development/components/BasicInfo.vue b/src/modules/15_development/components/BasicInfo.vue
index f9effcd94..627877a1e 100644
--- a/src/modules/15_development/components/BasicInfo.vue
+++ b/src/modules/15_development/components/BasicInfo.vue
@@ -47,6 +47,7 @@ const orgName = ref<string>(""); //ชื่อ หน่วยงาน/ส่
 const node = ref<any[]>([]); //โครงสร้าง หน่วยงาน/ส่วนราชการ
 const filter = ref<string>(""); //input ค้นหา
 const expanded = ref<string[]>([]);
+const nodeDnaId = ref<string>('');
 
 /**
  * function fetch ข้อมูลเบื้องต้น
@@ -66,6 +67,7 @@ async function fetchData(id: string) {
       formData.nodeId = data.nodeId;
       formData.node = data.node;
       formData.orgRevisionId = data.revisionId;
+      nodeDnaId.value = data.nodeDnaId
 
       const arrayExpanded = [
         data.root,
@@ -124,6 +126,7 @@ function updateSelected(data: DataTree) {
   formData.node = data.orgLevel;
   formData.nodeId = data.orgTreeId;
   formData.orgRevisionId = data.orgRevisionId;
+  nodeDnaId.value = data.orgTreeDnaId
   props.onCheckChangeData();
 }
 
@@ -186,7 +189,7 @@ onMounted(async () => {
                   clickable
                   :disable="checkRoutePermission"
                   @click.stop="updateSelected(prop.node)"
-                  :active="formData.nodeId === prop.node.orgTreeId"
+                  :active="nodeDnaId === prop.node.orgTreeDnaId"
                   active-class="my-list-link text-primary text-weight-medium"
                   class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                 >