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 () => { สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม {{ - groupNo == 2 - ? store.excusiveIndicatorScore - : store.dataEvaluation.isProbation + store.dataEvaluation.isProbation ? store.indicatorProbationScore + : groupNo == 2 + ? store.excusiveIndicatorScore : store.indicatorScore }} คะแนน)