From d7db31234f2e5f0921205d19a7a2ca4673b30b0c Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 14 Jul 2025 11:49:57 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B0=E0=B9=81=E0=B8=99=E0=B8=99=20KPI=20=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=93=E0=B8=B5=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9C?=
 =?UTF-8?q?=E0=B8=B9=E0=B9=89=E0=B8=82=E0=B8=AD=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=A1=E0=B8=B5=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=97=E0=B8=94=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=AD=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B9=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/08_KPI/components/Tab/01_Assessment.vue  | 12 ++++++------
 .../08_KPI/components/Tab/Topic/02_Competency.vue    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue
index e3d7ee0..9544e38 100644
--- a/src/modules/08_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue
@@ -195,7 +195,7 @@ watch(
 
       store.indicatorScoreVal =
         store.indicatorPercentVal *
-        ((store.dataProfile.isProbation
+        ((store.dataEvaluation.isProbation
           ? store.indicatorProbationScore
           : store.indicatorScore) /
           100);
@@ -476,11 +476,11 @@ onMounted(() => {
           />
 
           <div class="row text-body2 text-weight-bold">
-            <div class="col-12 text-center row justify-center">
+            <div class="col-12 text-center row justify-center">{{ store.dataProfile.isProbation }}
               <span
                 >สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม
                 {{
-                  store.dataProfile.isProbation
+                  store.dataEvaluation.isProbation
                     ? store.indicatorProbationScore
                     : store.indicatorScore
                 }}
@@ -514,7 +514,7 @@ onMounted(() => {
             name: `สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม ${
               store.dataEvaluation.posTypeName != 'อำนวยการ' &&
               store.dataEvaluation.posTypeName != 'บริหาร'
-                ? store.dataProfile.isProbation
+                ? store.dataEvaluation.isProbation
                   ? store.competencyProbationScore
                   : store.competencyScore
                 : store.excusiveCompetencyScore
@@ -558,7 +558,7 @@ onMounted(() => {
             :rows="[
               {
                 name: `ผลการประเมินการพัฒนาตนเอง (คะแนนเต็ม ${
-                  store.dataProfile.isProbation
+                  store.dataEvaluation.isProbation
                     ? store.devProbationScore
                     : store.devScore
                 } คะแนน)`,
@@ -600,7 +600,7 @@ onMounted(() => {
               สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง)
               (คะแนนเต็ม
               {{
-                store.dataProfile.isProbation
+                store.dataEvaluation.isProbation
                   ? store.competencyDevProbationScore
                   : store.competencyDevScore
               }}
diff --git a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
index 717d57e..a8f5d0f 100644
--- a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
@@ -209,7 +209,7 @@ function getData(type: string) {
           store.competencyScoreVal =
             weightAvg != 0
               ? (resultAvg / weightAvg) *
-                (store.dataProfile.isProbation
+                (store.dataEvaluation.isProbation
                   ? store.competencyProbationScore
                   : store.competencyScore)
               : 0;