From c5f0a6683573c61e4c994ebb0846cc8bd958f80f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 3 Feb 2025 13:16:40 +0700
Subject: [PATCH 1/3] fix

---
 src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
index cd04222..74742e4 100644
--- a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
@@ -161,7 +161,7 @@ const modalProblem = ref<boolean>(false);
 const type = ref<string>("");
 const idList = ref<string>("");
 function openPopupProgress(data: any) {
-  store.mainRowData = data
+  store.mainRowData = data;
   modalProgress.value = true;
   type.value =
     numpage.value === 1 ? "plan" : numpage.value === 2 ? "role" : "special";
@@ -334,6 +334,7 @@ const isEditStep3 = computed(() => {
                 >
                   <q-tooltip>รายงานความก้าวหน้า</q-tooltip>
                 </q-btn>
+
                 <q-btn
                   flat
                   round
@@ -341,7 +342,7 @@ const isEditStep3 = computed(() => {
                   color="red-5"
                   dense
                   main="problem"
-                  @click="openPopupProblem(props.row)"
+                  @click="openPopupProblem(props.row.id)"
                 >
                   <q-tooltip>รายงานปัญหา</q-tooltip>
                 </q-btn>

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

---
 .../08_KPI/components/Tab/Dialog/01_FormIndicator.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
index c5a8080..1531832 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -86,7 +86,7 @@ const roundOp = ref<DataOptions[]>([
 ]);
 
 function fetchListPlan() {
-  formFilter.nodeId = store.dataProfile.nodeId;
+  formFilter.nodeId = store.dataProfile.nodeDnaId;
   formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
 
@@ -146,7 +146,7 @@ function fetchListPlanByid(id: string) {
 }
 
 function fetchListRole() {
-  formFilter.nodeId = store.dataProfile.nodeId;
+  formFilter.nodeId = store.dataProfile.nodeDnaId;
   formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
   formFilter.position = store.dataProfile.position;
@@ -197,8 +197,8 @@ function fetchRoleByid(id: string) {
 }
 
 function fetchListSpecial() {
-  formFilter.nodeId = store.dataProfile.nodeId;
-  formFilter.node = store.dataProfile.node;
+  // formFilter.nodeId = store.dataProfile.nodeDnaId;
+  // formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
 
   const body = {

From 0ae6cadeeab5cef6b85e63c3b878fb7cc417edf3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 3 Feb 2025 16:50:02 +0700
Subject: [PATCH 3/3] fix payload

---
 src/views/MainLayout.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index fc60efa..8462eab 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -238,6 +238,10 @@ const landingPageUrl = ref<string>(getLandingUrl());
 function getLandingUrl() {
   return configParam.landingPageUrl;
 }
+
+function onViewDetailNoti(url: string) {
+  window.open(url, "_blank");
+}
 </script>
 
 <!-- โครงเว็บ -->
@@ -354,7 +358,7 @@ function getLandingUrl() {
                     : 'caption q-pa-xs'
                 "
                 @click.stop.prevent="
-                  item.payload ? $router.push(`/${item.payload}`) : ''
+                  item.payload ? onViewDetailNoti(item.payload) : ''
                 "
               >
                 <q-item