diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index e7a095339..4426d2d76 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -212,19 +212,24 @@ const percent_sum: any = computed(() => {
});
const score4 = computed(() => {
return (
- Number(orientation.value) +
- Number(self_learning.value) +
- Number(training_seminar.value) +
- Number(other_training.value)
+ (Number(orientation.value) +
+ Number(self_learning.value) +
+ Number(training_seminar.value) +
+ Number(other_training.value)) /
+ 4
);
});
const score5 = computed(() => {
- return (
- Number(orientation_percent.value) +
- Number(self_learning_percent.value) +
- Number(training_seminar_percent.value) +
- Number(other_training_percent.value)
- );
+ const total =
+ (Number(orientation_percent.value) +
+ Number(self_learning_percent.value) +
+ Number(training_seminar_percent.value) +
+ Number(other_training_percent.value)) /
+ 4;
+
+ develop_result.value = total > 60 ? 1 : 0;
+
+ return total;
});
/**set true */
@@ -1057,6 +1062,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="orientation"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1066,6 +1073,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="orientation_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
@@ -1079,6 +1088,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="self_learning"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1088,6 +1099,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="self_learning_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
@@ -1101,6 +1114,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="training_seminar"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1110,6 +1125,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="training_seminar_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
@@ -1125,6 +1142,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="other_training"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1134,6 +1153,8 @@ onMounted(async () => {
type="number"
:readonly="!status"
v-model="other_training_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index fd3b0297a..f23acb0e1 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -216,18 +216,21 @@ const percent_sum: any = computed(() => {
});
const score4 = computed(() => {
return (
- Number(orientation.value) +
- Number(self_learning.value) +
- Number(training_seminar.value) +
- Number(other_training.value)
+ (Number(orientation.value) +
+ Number(self_learning.value) +
+ Number(training_seminar.value) +
+ Number(other_training.value)) /
+ 4
);
});
const score5 = computed(() => {
const total =
- Number(orientation_percent.value) +
- Number(self_learning_percent.value) +
- Number(training_seminar_percent.value) +
- Number(other_training_percent.value);
+ (Number(orientation_percent.value) +
+ Number(self_learning_percent.value) +
+ Number(training_seminar_percent.value) +
+ Number(other_training_percent.value)) /
+ 4;
+
develop_result.value = total > 60 ? 1 : 0;
return total;
@@ -1122,6 +1125,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="orientation"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1130,6 +1135,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="orientation_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
@@ -1142,6 +1149,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="self_learning"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1150,6 +1159,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="self_learning_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
@@ -1162,6 +1173,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="training_seminar"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1170,6 +1183,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="training_seminar_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>
@@ -1184,6 +1199,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="other_training"
+ :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+ hide-bottom-space
/>
@@ -1192,6 +1209,8 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="other_training_percent"
+ :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+ hide-bottom-space
/>