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

Merge branch 'warunee-dev' into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2023-09-05 13:15:06 +07:00
commit ed8e8ef93c
4 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -420,7 +420,7 @@ const putformData = () => {
behavior_score_total: Number(behavior_score_total.value),
behavior_result: Number(behavior_result.value),
sum_score: Number(score1.value) + Number(score2.value),
sum_percent: Number(percent_score1.value) + Number(percent_score2.value),
sum_percent: percent_sum.value,
chairman_dated: dateToISO(dateAutherise.value),
develop_result: Number(develop_result.value),
evaluate_result: Number(evaluate_result.value),

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

@ -333,7 +333,7 @@ const putformData = () => {
behavior_score_total: Number(behavior_score_total.value),
behavior_result: Number(behavior_result.value),
sum_score: Number(score1.value) + Number(score2.value),
sum_percent: Number(percent_score1.value) + Number(percent_score2.value),
sum_percent: percent_sum.value,
chairman_dated: dateToISO(dateAutherise.value),
develop_result: Number(develop_result.value),
evaluate_result: Number(evaluate_result.value),

1
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
View file

@ -554,7 +554,6 @@ const editData = async (data: any) => {
v-model="evaluate_ouptut[i].text"
lazy-rules
autogrow
:label="list.label"
hide-bottom-space
:row="1"
:rules="evaluate_ouptutRules"