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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-01-29 09:56:27 +07:00
commit 711d104516
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
View file

@ -391,7 +391,7 @@ function putformData() {
develop_self_learning_percent: Number(self_learning_percent.value),
develop_training_seminar_percent: Number(training_seminar_percent.value),
develop_other_training_percent: Number(other_training_percent.value),
achievement_score: Number(score1.value),
achievement_score: Number(score1Per60.value),
achievement_percent: Number(percent_score1.value),
achievement_score_total: Number(achievement_score_total.value),
achievement_result: Number(achievement_result.value),
@ -399,7 +399,7 @@ function putformData() {
behavior_percent: Number(percent_score2.value),
behavior_score_total: Number(behavior_score_total.value),
behavior_result: Number(behavior_result.value),
sum_score: Number(score1.value) + Number(score2.value),
sum_score: (Number(score1Per60.value) + Number(score2.value)) / 2,
sum_percent: percent_sum.value,
chairman_dated: dateToISO(dateAutherise.value),
develop_result: Number(develop_result.value),

4
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
View file

@ -363,7 +363,7 @@ const putformData = () => {
develop_self_learning_percent: Number(self_learning_percent.value),
develop_training_seminar_percent: Number(training_seminar_percent.value),
develop_other_training_percent: Number(other_training_percent.value),
achievement_score: Number(score1.value),
achievement_score: Number(score1Per60.value),
achievement_percent: Number(percent_score1.value),
achievement_score_total: Number(achievement_score_total.value),
achievement_result: Number(achievement_result.value),
@ -371,7 +371,7 @@ const putformData = () => {
behavior_percent: Number(percent_score2.value),
behavior_score_total: Number(behavior_score_total.value),
behavior_result: Number(behavior_result.value),
sum_score: Number(score1.value) + Number(score2.value),
sum_score: (Number(score1Per60.value) + Number(score2.value)) / 2,
sum_percent: percent_sum.value,
develop_result: Number(develop_result.value),
chairman_dated: dateToISO(dateAutherise.value),