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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 51s
Details

Browse source 
* develop:
  fix: ปฏิบัติงาน แสดงวุฒิและสาขาวิชา/วิชาเอก
  แก้ไขระดับการศึกษา
This commit is contained in:
Warunee Tamkoo 2025-11-28 15:19:14 +07:00
commit cd6947bd7c
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/01_exam/components/Form/Education.vue
View file

@ -12,7 +12,7 @@
<div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
<div class="col-12 row q-col-gutter-sm">
<div class="col-xs-12 col-sm-3" v-if="positionLevel !== 'ปฏิบัติงาน'">
<div class="col-xs-12 col-sm-3">
<q-select
:class="getClass(isStatusRegister)"
:readonly="!isStatusRegister"
@ -45,7 +45,7 @@
:label="`${'ชื่อปริญญา'}`"
/>
</div>
<div class="col-xs-12 col-sm-3" v-if="positionLevel !== 'ปฏิบัติงาน'">
<div class="col-xs-12 col-sm-3">
<q-input
:class="getClass(isStatusRegister)"
:outlined="isStatusRegister"

12
src/modules/01_exam/components/Form/Profile.vue
View file

@ -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() })
})