From d0caba8de4967673cc1f3ebbdb0c39f8cdea8fd7 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 15 Jul 2025 13:20:34 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B8=8A=E0=B9=87=E0=B8=84=20=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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../14_KPI/components/Tab/01_Assessment.vue     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index 1bcedeaf1..394a2298b 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -187,6 +187,8 @@ watch(
         store.indicatorPercentVal *
         ((store.dataEvaluation.isProbation
           ? store.indicatorProbationScore
+          : groupNo.value == 2
+          ? store.excusiveIndicatorScore
           : store.indicatorScore) /
           100);
 
@@ -466,23 +468,16 @@ onMounted(async () => {
               <span
                 >สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม
                 {{
-                  groupNo == 2
-                    ? store.excusiveIndicatorScore
-                    : store.dataEvaluation.isProbation
+                  store.dataEvaluation.isProbation
                     ? store.indicatorProbationScore
+                    : groupNo == 2
+                    ? store.excusiveIndicatorScore
                     : store.indicatorScore
                 }}
                 คะแนน)</span
               >
               <div class="text-primary q-pl-md">
-                                {{
-                  groupNo == 2
-                    ? (
-                        store.excusiveIndicator1ScoreVal +
-                        store.excusiveIndicator2ScoreVal
-                      ).toFixed(2)
-                    : store.indicatorScoreVal.toFixed(2)
-                }}
+                {{ store.indicatorScoreVal.toFixed(2) }}
               </div>
             </div>
           </div>