From 921b0ca27f47302762f9b6fa37fa3f62097cec58 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 31 Mar 2025 14:12:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=9F=E0=B8=B4=E0=B8=A5=20=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=9A=E0=B9=89=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B9=80=E0=B8=88=E0=B9=89=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/views/report.vue           | 26 ++++++++++++-------
 .../21_report/views/05_reportSalary.vue       | 12 ++++-----
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 848c65f86..f18a9300a 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -244,17 +244,9 @@ function changOption(val: string) {
   ) {
     persanalId.value = val === "KPI8" ? persanalId.value : "";
     organization.value = val === "KPI8" ? "" : organization.value;
-    if (round.value && organization.value) {
-      fetchReport();
-    } else if (round.value && persanalId.value) {
-      fetchReport();
-    }
   } else {
     round.value = "";
     organization.value = "";
-    if (persanalId.value) {
-      fetchReport();
-    }
   }
 }
 
@@ -474,7 +466,6 @@ function onSelectPerson(data: any) {
   }`;
 
   onCloseModal();
-  fetchReport();
 }
 
 /**
@@ -500,7 +491,10 @@ function clearFilter() {
   pdfSrc.value = undefined;
   dataDownload.value = undefined;
   fullNameShow.value = "";
+  round.value = "";
+  fetchRoundOption();
 }
+
 onMounted(() => {
   fetchRoundOption();
   fetchActiveId();
@@ -748,6 +742,20 @@ onMounted(() => {
                     </div>
                   </div>
                 </q-card-section>
+                <div class="col-12"><q-separator /></div>
+
+                <div class="col-12 row q-pa-sm">
+                  <q-space />
+                  <q-btn
+                    dense
+                    class="q-px-md"
+                    label="ค้นหา"
+                    unelevated
+                    color="public"
+                    type="submit"
+                  >
+                  </q-btn>
+                </div>
               </q-card>
             </div>
             <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
diff --git a/src/modules/21_report/views/05_reportSalary.vue b/src/modules/21_report/views/05_reportSalary.vue
index 2acaf6ff6..0a38f00da 100644
--- a/src/modules/21_report/views/05_reportSalary.vue
+++ b/src/modules/21_report/views/05_reportSalary.vue
@@ -138,7 +138,7 @@ function onSelectedNode(data: any) {
   if (data.id !== nodeId.value) {
     nodeId.value = data.id;
     nodeName.value = data.orgRootName;
-    org.value = data.orgName;
+    org.value = data.orgRootName;
     expandedModal.value = false;
   }
 }
@@ -553,18 +553,18 @@ onMounted(() => {
                             >
                               <div>
                                 <div class="text-weight-medium">
-                                  {{ prop.node.orgTreeName }}
+                                  {{ prop.node.orgRootName }}
                                 </div>
                                 <div class="text-weight-light text-grey-8">
                                   {{
-                                    prop.node.orgCode == null
+                                    prop.node.orgRootCode == null
                                       ? null
-                                      : prop.node.orgCode
+                                      : prop.node.orgRootCode
                                   }}
                                   {{
-                                    prop.node.orgTreeShortName == null
+                                    prop.node.orgRootShortName == null
                                       ? null
-                                      : prop.node.orgTreeShortName
+                                      : prop.node.orgRootShortName
                                   }}
                                 </div>
                               </div>