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

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-11-24 17:49:09 +07:00
commit c7aff2a1f5
3 changed files with 20 additions and 2 deletions

View file

@ -31,6 +31,10 @@ const props = defineProps({
type: Array as PropType<DataOption[]>,
required: true,
},
positionLevelName: {
type: String,
required: false,
},
});
const $q = useQuasar();
@ -125,7 +129,10 @@ const getClass = (val: boolean) => {
<q-form ref="myform">
<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">
<div
class="col-xs-12 col-sm-3"
v-if="positionLevelName !== 'ปฏิบัติงาน'"
>
<q-select
:class="getClass(status == 'checkRegister' || status == 'payment')"
:readonly="!(status == 'checkRegister' || status == 'payment')"
@ -158,7 +165,10 @@ const getClass = (val: boolean) => {
:label="`${'ชื่อปริญญา'}`"
/>
</div>
<div class="col-xs-12 col-sm-3">
<div
class="col-xs-12 col-sm-3"
v-if="positionLevelName !== 'ปฏิบัติงาน'"
>
<q-input
:class="getClass(status == 'checkRegister' || status == 'payment')"
:outlined="status == 'checkRegister' || status == 'payment'"

View file

@ -40,6 +40,10 @@ const props = defineProps({
type: Object,
required: true,
},
positionLevelName: {
type: String,
required: false,
},
});
const $q = useQuasar();
@ -205,6 +209,7 @@ async function fetchEducationLevel() {
<q-separator class="q-my-lg bg-gray" size="5px" />
<div class="q-px-sm">
<Education
:positionLevelName="positionLevelName"
:status="status"
v-model:form="formEducation"
:educationLevelOptions="educationLevelOptions"

View file

@ -43,6 +43,7 @@ const formOccupation = ref<any>({});
const formContact = ref<any>({});
const status = ref<string>("");
const rejectDetail = ref<string>("");
const positionLevelName = ref<string>("");
/** ดึงข้อมูลสถานะ */
async function fetchStatus() {
@ -53,6 +54,7 @@ async function fetchStatus() {
const data = res.data.result;
status.value = data.status;
rejectDetail.value = data.rejectDetail;
positionLevelName.value = data?.positionExam?.positionLevelName;
})
.catch((e) => {
messageError($q, e);
@ -346,6 +348,7 @@ onMounted(async () => {
<div>
<Profile
:status="status"
:positionLevelName="positionLevelName"
v-model:formInformation="formInformation"
v-model:formAddress="formAddress"
v-model:formOccupation="formOccupation"