From 4557a23c1763dfb3c678595b76e4c8306eea4ede Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 28 Nov 2025 14:46:00 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/01_exam/components/Form/Profile.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/01_exam/components/Form/Profile.vue b/src/modules/01_exam/components/Form/Profile.vue index c8e4b8b..ef033e4 100644 --- a/src/modules/01_exam/components/Form/Profile.vue +++ b/src/modules/01_exam/components/Form/Profile.vue @@ -81,12 +81,12 @@ import { useQuasar } from 'quasar' import type { DataOption } from '@/modules/01_exam/interface/index/Main' import Information from '@/modules/01_exam/components/Form/Information.vue' import Address from '@/modules/01_exam/components/Form/Address.vue' -import Family from '@/modules/01_exam/components/Form/Family.vue' +// import Family from '@/modules/01_exam/components/Form/Family.vue' import Occupation from '@/modules/01_exam/components/Form/Occupation.vue' import Education from '@/modules/01_exam/components/Form/Education.vue' import Career from '@/modules/01_exam/components/Form/Career.vue' import Contact from '@/modules/01_exam/components/Form/Contact.vue' -import Document from '@/modules/01_exam/components/Form/Document.vue' +// import Document from '@/modules/01_exam/components/Form/Document.vue' const props = defineProps({ status: { @@ -201,10 +201,12 @@ const fetchPerson = async () => { let filterEducationLevels = data.educationLevels if (examStore.educationLevel === 'BACHELOR') { - filterEducationLevels = data.educationLevels.filter((level: any) => level.rank === 8) + filterEducationLevels = data.educationLevels.filter( + (level: any) => level.educationLevel === 'BACHELOR' + ) } else if (examStore.educationLevel === 'LOW_BACHELOR') { filterEducationLevels = data.educationLevels.filter( - (level: any) => level.rank >= 4 && level.rank <= 7 + (level: any) => level.educationLevel === 'LOW_BACHELOR' ) } @@ -213,7 +215,7 @@ const fetchPerson = async () => { }) data.educationLevels - .filter((level: any) => level.rank >= 4) + .filter((level: any) => level.isHigh === true) .map((r: any) => { optionEducationLevelHigher.push({ id: r.id.toString(), name: r.name.toString() }) }) From 3f46ad30af58ef3d08c761857cddb7313da077d2 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 28 Nov 2025 15:10:43 +0700 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=87=E0=B8=B2=E0=B8=99=20?= =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=A7=E0=B8=B8=E0=B8=92?= =?UTF-8?q?=E0=B8=B4=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=AA=E0=B8=B2=E0=B8=82?= =?UTF-8?q?=E0=B8=B2=E0=B8=A7=E0=B8=B4=E0=B8=8A=E0=B8=B2/=E0=B8=A7?= =?UTF-8?q?=E0=B8=B4=E0=B8=8A=E0=B8=B2=E0=B9=80=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/01_exam/components/Form/Education.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/01_exam/components/Form/Education.vue b/src/modules/01_exam/components/Form/Education.vue index 3534eb7..76b3125 100644 --- a/src/modules/01_exam/components/Form/Education.vue +++ b/src/modules/01_exam/components/Form/Education.vue @@ -12,7 +12,7 @@
-
+
-
+