From c46aa520d414a75aa179eaa4e114a9f33da0b606 Mon Sep 17 00:00:00 2001
From: kittapath <>
Date: Sun, 11 Jan 2026 15:14:48 +0700
Subject: [PATCH] search tree report by dna

---
 src/modules/05_placement/views/09_reportMain.vue | 14 +++++++-------
 src/modules/09_leave/views/06_ReportMain.vue     | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/05_placement/views/09_reportMain.vue b/src/modules/05_placement/views/09_reportMain.vue
index 6c9966d53..30053af10 100644
--- a/src/modules/05_placement/views/09_reportMain.vue
+++ b/src/modules/05_placement/views/09_reportMain.vue
@@ -71,7 +71,7 @@ const splitterModel = ref<number>(14);
 /** tree*/
 const filterTree = ref<string>("");
 const nodeId = ref<string>("");
-const orgTreeId = ref<string>("");
+const orgTreeDnaId = ref<string>("");
 const nodeLevel = ref<number>(0);
 const node = ref<DataStructureTree[]>([]);
 const expanded = ref<string[]>([]);
@@ -94,9 +94,9 @@ function onUpdateYear(val: number) {
 
 function onSelectedNode(data: any) {
   org.value = data.orgName;
-  nodeId.value = data.orgTreeId;
+  nodeId.value = data.orgTreeDnaId;
   nodeLevel.value = data.orgLevel;
-  orgTreeId.value = data.orgTreeId;
+  orgTreeDnaId.value = data.orgTreeDnaId;
   expandedModal.value = false;
 }
 
@@ -110,7 +110,7 @@ function fetchDataReport() {
   const queryParams = {
     nodeId:
       reportType.value.type === "probation" && reportType.value.id === "2"
-        ? orgTreeId.value
+        ? orgTreeDnaId.value
         : nodeId.value,
     node: nodeLevel.value,
     startDate: dateToISO(dateStart.value),
@@ -184,7 +184,7 @@ function clearFilter() {
   org.value = "";
   nodeId.value = "";
   nodeLevel.value = 0;
-  orgTreeId.value = "";
+  orgTreeDnaId.value = "";
   reportType.value = undefined;
   detailReport.value = undefined;
   pdfSrc.value = undefined;
@@ -297,7 +297,7 @@ onMounted(() => {
                         <q-tree
                           dense
                           :nodes="node"
-                          node-key="orgTreeId"
+                          node-key="orgTreeDnaId"
                           label-key="labelName"
                           v-model:expanded="expanded"
                           :filter="filterTree.trim()"
@@ -308,7 +308,7 @@ onMounted(() => {
                           <template v-slot:default-header="prop">
                             <q-item
                               @click.stop="onSelectedNode(prop.node)"
-                              :active="nodeId === prop.node.orgTreeId"
+                              :active="nodeId === prop.node.orgTreeDnaId"
                               clickable
                               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/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index a4817882c..b367b6490 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -112,7 +112,7 @@ const nodeId = ref<string>("");
 const nodeLevel = ref<number>(0);
 const node = ref<DataStructureTree[]>([]);
 const expanded = ref<string[]>([]);
-const orgTreeId = ref<string>("");
+const orgTreeDnaId = ref<string>("");
 
 /** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/
 async function fetchDataTree() {
@@ -133,10 +133,10 @@ async function fetchDataTree() {
  */
 function onSelectedNode(data: any) {
   org.value = data.orgName;
-  nodeId.value = data.orgTreeId;
+  nodeId.value = data.orgTreeDnaId;
   nodeLevel.value = data.orgLevel;
   expandedModal.value = false;
-  orgTreeId.value = data.orgTreeId;
+  orgTreeDnaId.value = data.orgTreeDnaId;
   updateLeaveday();
 }
 
@@ -221,7 +221,7 @@ async function fetchLeaveday(
   startDate: Date,
   endDate: Date
 ) {
-  const nodeIdVal = typeReport.value === 3 ? orgTreeId.value : nodeId.value;
+  const nodeIdVal = typeReport.value === 3 ? orgTreeDnaId.value : nodeId.value;
   const body = {
     type:
       year === "FULL"
@@ -337,7 +337,7 @@ function filterOption(val: string, update: any, typeOp: string) {
 function clearData() {
   nodeId.value = "";
   nodeLevel.value = 0;
-  orgTreeId.value = "";
+  orgTreeDnaId.value = "";
   org.value = "";
   typeReport.value = null;
   yearType.value = "FULL";
@@ -414,7 +414,7 @@ function getReport() {
         : "WEEKLY",
     startDate: dateToISO(dateStart.value),
     endDate: dateToISO(dateEnd.value),
-    nodeId: orgTreeId.value,
+    nodeId: orgTreeDnaId.value,
     node: nodeLevel.value,
   };
   http
@@ -626,7 +626,7 @@ onMounted(() => {
                         <q-tree
                           dense
                           :nodes="node"
-                          node-key="orgTreeId"
+                          node-key="orgTreeDnaId"
                           label-key="labelName"
                           v-model:expanded="expanded"
                           :filter="filterTree.trim()"
@@ -637,7 +637,7 @@ onMounted(() => {
                           <template v-slot:default-header="prop">
                             <q-item
                               @click.stop="onSelectedNode(prop.node)"
-                              :active="nodeId === prop.node.orgTreeId"
+                              :active="nodeId === prop.node.orgTreeDnaId"
                               clickable
                               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"