diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index b4f626c..eedb529 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -506,14 +506,23 @@ onMounted(() => { สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม {{ - store.dataEvaluation.isProbation + groupNo == 2 + ? store.excusiveIndicatorScore + : store.dataEvaluation.isProbation ? store.indicatorProbationScore : store.indicatorScore }} คะแนน)
- {{ store.indicatorScoreVal.toFixed(2) }} + {{ + groupNo == 2 + ? ( + store.excusiveIndicator1ScoreVal + + store.excusiveIndicator2ScoreVal + ).toFixed(2) + : store.indicatorScoreVal.toFixed(2) + }}