From c2bf98e053be63af72d0c5160a7c601a365808f9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 23 Apr 2024 10:20:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=3D>=20=20?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9C?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=94=E0=B8=8A=E0=B8=AD=E0=B8=9A=E0=B8=AB=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/KPI/api.kpis.ts                       |  2 ++
 .../components/Tab/Dialog/01_Dialog.vue       | 36 ++++++++++++++++---
 .../components/Tab/Topic/01_Indicator.vue     |  2 ++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/api/KPI/api.kpis.ts b/src/api/KPI/api.kpis.ts
index 21f6403..ad56272 100644
--- a/src/api/KPI/api.kpis.ts
+++ b/src/api/KPI/api.kpis.ts
@@ -4,12 +4,14 @@ const url = `${env.API_URI}/salary`;
 const kpiPeriod = `${env.API_URI}/kpi/period`;
 const kpiEvaluation = `${env.API_URI}/kpi/user/evaluation`;
 const kpiPlan = `${env.API_URI}/kpi/plan`;
+const kpiRole = `${env.API_URI}/kpi/role`;
 const KpiCapacity = `${env.API_URI}/kpi/capacity`;
 const KpiFile = `${env.API_URI}/salary/file`;
 export default {
   kpiPeriod,
   kpiEvaluation,
   kpiPlan,
+  kpiRole,
   KpiCapacity,
   file: KpiFile,
 
diff --git a/src/modules/08_KPI/components/Tab/Dialog/01_Dialog.vue b/src/modules/08_KPI/components/Tab/Dialog/01_Dialog.vue
index 7821c89..41874b1 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/01_Dialog.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/01_Dialog.vue
@@ -42,8 +42,10 @@ const formDetail = reactive<any>({
   formula: "",
   node: null,
   nodeId: "",
+  nodeName: "",
   strategy: null,
   strategyId: "",
+  strategyName: "",
 });
 
 function fetchIndicators() {
@@ -68,10 +70,27 @@ function fetchIndicators() {
     });
 }
 
+function fetchListRole() {
+  const kpiPeriodId = store.dataEvaluation.kpiPeriodId;
+  const position = store.dataProfile.position;
+  http
+    .get(
+      config.API.kpiRole +
+        `?page=${1}&pageSize=${50}&kpiPeriodId=${kpiPeriodId}&position=${position}`
+    )
+    .then((res) => {
+      listTarget.value = res.data.result.data;
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
 function clickList(index: number, id: string) {
   showLoader();
+  const url = numpage.value === 1 ? config.API.kpiPlan : config.API.kpiRole;
   http
-    .get(config.API.kpiPlan + `/${id}`)
+    .get(`${url}/${id}`)
     .then((res) => {
       listCheck.value = index;
       const data = res.data.result;
@@ -94,8 +113,11 @@ function clickList(index: number, id: string) {
       formDetail.formula = data.formula;
       formDetail.node = data.node;
       formDetail.nodeId = data.nodeId;
+      formDetail.nodeName = data.nodeName;
       formDetail.strategy = data.strategy;
       formDetail.strategyId = data.strategyId;
+      formDetail.strategyName = data.strategyName;
+
     })
     .catch((err) => {
       messageError($q, err);
@@ -146,7 +168,11 @@ watch(
   () => modal.value,
   () => {
     if (modal.value) {
-      fetchIndicators();
+      if (numpage.value === 1) {
+        fetchIndicators();
+      } else if (numpage.value === 2) {
+        fetchListRole();
+      }
     }
   }
 );
@@ -241,11 +267,11 @@ watch(
                     <div class="q-pa-sm q-col-gutter-lg">
                       <div class="col-12 row">
                         <div class="col-4 text-grey-6">หน่วยงาน/ส่วนราชการ</div>
-                        <div class="col-8">{{ formDetail.nodeId }}</div>
+                        <div class="col-8">{{ formDetail.nodeName }}</div>
                       </div>
-                      <div class="col-12 row">
+                      <div class="col-12 row" v-if="numpage === 1">
                         <div class="col-4 text-grey-6">ยุทธศาสตร์ / แผน</div>
-                        <div class="col-8">{{ formDetail.strategyId }}</div>
+                        <div class="col-8">{{ formDetail.strategyName }}</div>
                       </div>
 
                       <div class="col-12 row">
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 3c4be04..98c4382 100644
--- a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
@@ -105,6 +105,8 @@ function onAdd() {
   <q-card bordered style="border-radius: 5px" class="no-shadow">
     <q-card-section class="bg-grey-2 q-py-sm">
       <span class="text-weight-medium">{{ title }}</span>
+
+     
       <q-btn
         class="q-ml-xs"
         flat