Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
* develop: fix:banner fix condition education rank
This commit is contained in:
commit
4763f4280e
2 changed files with 6 additions and 3 deletions
|
|
@ -1,6 +1,9 @@
|
|||
<!-- step กรอกข้อมูล -->
|
||||
<template>
|
||||
<div>
|
||||
<q-banner class="text-red bg-red-1 q-pa-md q-mb-md" dense>
|
||||
<div>คำแนะนำ: ใส่เครื่องหมายแดช (-) ในช่องที่ไม่มีข้อมูล</div>
|
||||
</q-banner>
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmitForm">
|
||||
<Profile
|
||||
:status="status"
|
||||
|
|
|
|||
|
|
@ -201,10 +201,10 @@ const fetchPerson = async () => {
|
|||
let filterEducationLevels = data.educationLevels
|
||||
|
||||
if (examStore.educationLevel === 'BACHELOR') {
|
||||
filterEducationLevels = data.educationLevels.filter((level: any) => level.rank === 7)
|
||||
filterEducationLevels = data.educationLevels.filter((level: any) => level.rank === 8)
|
||||
} else if (examStore.educationLevel === 'LOW_BACHELOR') {
|
||||
filterEducationLevels = data.educationLevels.filter(
|
||||
(level: any) => level.rank >= 4 && level.rank <= 6
|
||||
(level: any) => level.rank >= 4 && level.rank <= 7
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -213,7 +213,7 @@ const fetchPerson = async () => {
|
|||
})
|
||||
|
||||
data.educationLevels
|
||||
.filter((level: any) => level.rank >= 4 && level.rank !== 6 && level.rank !== 8)
|
||||
.filter((level: any) => level.rank >= 4)
|
||||
.map((r: any) => {
|
||||
optionEducationLevelHigher.push({ id: r.id.toString(), name: r.name.toString() })
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue