diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index eedb529..fea2f61 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -197,6 +197,8 @@ watch( store.indicatorPercentVal * ((store.dataEvaluation.isProbation ? store.indicatorProbationScore + : groupNo.value == 2 + ? store.excusiveIndicatorScore : store.indicatorScore) / 100); } @@ -506,23 +508,16 @@ onMounted(() => { สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม {{ - groupNo == 2 - ? store.excusiveIndicatorScore - : store.dataEvaluation.isProbation + store.dataEvaluation.isProbation ? store.indicatorProbationScore + : groupNo == 2 + ? store.excusiveIndicatorScore : store.indicatorScore }} คะแนน)