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

fix การทดลองปฏิบัติหน้าที่ราชการ แบบประเมินผล (คณะกรรมการ)

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-01-28 10:38:15 +07:00
parent b0871139d4
commit 6faef6b050
2 changed files with 58 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,19 +212,24 @@ const percent_sum: any = computed(() => {
}); });
const score4 = computed(() => { const score4 = computed(() => {
return ( return (
Number(orientation.value) + (Number(orientation.value) +
Number(self_learning.value) + Number(self_learning.value) +
Number(training_seminar.value) + Number(training_seminar.value) +
Number(other_training.value) Number(other_training.value)) /
4
); );
}); });
const score5 = computed(() => { const score5 = computed(() => {
return ( const total =
Number(orientation_percent.value) + (Number(orientation_percent.value) +
Number(self_learning_percent.value) + Number(self_learning_percent.value) +
Number(training_seminar_percent.value) + Number(training_seminar_percent.value) +
Number(other_training_percent.value) Number(other_training_percent.value)) /
); 4;
develop_result.value = total > 60 ? 1 : 0;
return total;
}); });
/**set true */ /**set true */
@ -1057,6 +1062,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="orientation" v-model="orientation"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1066,6 +1073,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="orientation_percent" v-model="orientation_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>
@ -1079,6 +1088,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="self_learning" v-model="self_learning"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1088,6 +1099,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="self_learning_percent" v-model="self_learning_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>
@ -1101,6 +1114,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="training_seminar" v-model="training_seminar"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1110,6 +1125,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="training_seminar_percent" v-model="training_seminar_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>
@ -1125,6 +1142,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="other_training" v-model="other_training"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1134,6 +1153,8 @@ onMounted(async () => {
type="number" type="number"
:readonly="!status" :readonly="!status"
v-model="other_training_percent" v-model="other_training_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>

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

@ -216,18 +216,21 @@ const percent_sum: any = computed(() => {
}); });
const score4 = computed(() => { const score4 = computed(() => {
return ( return (
Number(orientation.value) + (Number(orientation.value) +
Number(self_learning.value) + Number(self_learning.value) +
Number(training_seminar.value) + Number(training_seminar.value) +
Number(other_training.value) Number(other_training.value)) /
4
); );
}); });
const score5 = computed(() => { const score5 = computed(() => {
const total = const total =
Number(orientation_percent.value) + (Number(orientation_percent.value) +
Number(self_learning_percent.value) + Number(self_learning_percent.value) +
Number(training_seminar_percent.value) + Number(training_seminar_percent.value) +
Number(other_training_percent.value); Number(other_training_percent.value)) /
4;
develop_result.value = total > 60 ? 1 : 0; develop_result.value = total > 60 ? 1 : 0;
return total; return total;
@ -1122,6 +1125,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="orientation" v-model="orientation"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1130,6 +1135,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="orientation_percent" v-model="orientation_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>
@ -1142,6 +1149,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="self_learning" v-model="self_learning"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1150,6 +1159,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="self_learning_percent" v-model="self_learning_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>
@ -1162,6 +1173,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="training_seminar" v-model="training_seminar"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1170,6 +1183,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="training_seminar_percent" v-model="training_seminar_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>
@ -1184,6 +1199,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="other_training" v-model="other_training"
:rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
hide-bottom-space
/> />
</div> </div>
<div class="col"> <div class="col">
@ -1192,6 +1209,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense dense
type="number" type="number"
v-model="other_training_percent" v-model="other_training_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/> />
</div> </div>
</div> </div>