hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/hrms-user into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2025-07-14 14:12:17 +07:00
commit 261877b224
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/08_KPI/components/Tab/01_Assessment.vue
View file

@ -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
}}

2
src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
View file

@ -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;