diff --git a/src/modules/01_exam/components/Form/Education.vue b/src/modules/01_exam/components/Form/Education.vue index b47f853..a53de8f 100644 --- a/src/modules/01_exam/components/Form/Education.vue +++ b/src/modules/01_exam/components/Form/Education.vue @@ -148,7 +148,6 @@ :borderless="!isStatusRegister" dense lazy-rules - type="number" v-model="defaultEducation.educationScores" :rules="[(val) => !!val || `${'กรุณากรอก คะแนนเฉลี่ยสะสม'}`]" :label="`${'คะแนนเฉลี่ยสะสม'}`" diff --git a/src/modules/01_exam/components/Form/Profile.vue b/src/modules/01_exam/components/Form/Profile.vue index 16aa14a..5153988 100644 --- a/src/modules/01_exam/components/Form/Profile.vue +++ b/src/modules/01_exam/components/Form/Profile.vue @@ -207,9 +207,11 @@ const fetchPerson = async () => { optionEducationLevel.push({ id: r.id.toString(), name: r.name.toString() }) }) - data.educationLevels.map((r: any) => { - optionEducationLevelHigher.push({ id: r.id.toString(), name: r.name.toString() }) - }) + data.educationLevels + .filter((level: any) => level.rank >= 4 && level.rank !== 6 && level.rank !== 8) + .map((r: any) => { + optionEducationLevelHigher.push({ id: r.id.toString(), name: r.name.toString() }) + }) educationLevelOptions.value = optionEducationLevel educationLevelHigherOptions.value = optionEducationLevelHigher })