From 708170a2e58fb19263fd6f2f37672bf5eaea4e7c Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Thu, 20 Mar 2025 15:00:35 +0700 Subject: [PATCH] =?UTF-8?q?kpi=20=E0=B8=AA=E0=B9=88=E0=B8=87=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Tab/Dialog/01_FormIndicator.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue index 71d40cb16..5d0081e9b 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue @@ -105,8 +105,10 @@ const title = computed(() => { /** ดึงข้อมูล งานตามแผนปฏิบัติราชการประจำปี */ function fetchListPlan() { - formFilter.nodeId = store.dataProfile.nodeDnaId; - formFilter.node = store.dataProfile.node; + formFilter.nodeId = formFilter.isAll + ? store.dataProfile.rootDnaId + : store.dataProfile.nodeDnaId; + formFilter.node = formFilter.isAll ? 0 : store.dataProfile.node; formFilter.year = formFilter?.year ? formFilter.year.toString() : ""; formFilter.keyword = formFilter.keyword.trim(); // const kpiPeriodId = store.dataEvaluation.kpiPeriodId; @@ -166,8 +168,10 @@ function fetchListPlanByid(id: string) { /** ดึงข้อมูล งานตามหน้าที่ความรับผิดชอบหลัก */ function fetchListRole() { - formFilter.nodeId = store.dataProfile.nodeDnaId; - formFilter.node = store.dataProfile.node; + formFilter.nodeId = formFilter.isAll + ? store.dataProfile.rootDnaId + : store.dataProfile.nodeDnaId; + formFilter.node = formFilter.isAll ? 0 : store.dataProfile.node; formFilter.year = formFilter?.year ? formFilter.year.toString() : ""; formFilter.position = store.dataProfile.position; formFilter.keyword = formFilter.keyword.trim(); @@ -224,8 +228,6 @@ function fetchRoleByid(id: string) { /** ดึงข้อมูล งานอื่นๆ ที่ได้รับมอบหมาย */ function fetchListSpecial() { - formFilter.nodeId = store.dataProfile.nodeDnaId; - formFilter.node = store.dataProfile.node; formFilter.year = formFilter?.year ? formFilter.year.toString() : ""; showLoader();