แก้ประเมิน step 1

This commit is contained in:
Warunee Tamkoo 2023-12-23 16:21:58 +07:00
parent cbcb32a3dc
commit daafbd3991
3 changed files with 125 additions and 109 deletions

View file

@ -36,8 +36,8 @@ const rows = ref<any[]>([
level: "หลักสูตร ๔ ปี", level: "หลักสูตร ๔ ปี",
expert: "๖ ปี", expert: "๖ ปี",
special: "๘ ปี", special: "๘ ปี",
checked: "ต่ำกว่าปริญญาตรี", checked: "ปริญญาตรี",
// year: 4, year: 4,
}, },
{ {
degree: "ปริญญาตรี หรือเทียบเท่า", degree: "ปริญญาตรี หรือเทียบเท่า",
@ -178,9 +178,9 @@ watch(props, () => {
</q-td> </q-td>
<q-td key="checked" :props="props"> <q-td key="checked" :props="props">
<!-- v-if="educations?.find((x:any)=> (props.row.year && x.educationLevel == props.row.checked && x.year == props.row.year) || (!props.row.year && x.educationLevel == props.row.checked))" --> <!-- v-if="educations?.find((x:any)=> (props.row.year && x.educationLevel == props.row.checked && x.year == props.row.year) || (!props.row.year && x.educationLevel == props.row.checked))" -->
<!-- {{ props.row.year }}-{{ props.row.checked }}-{{ educations }} -->
<q-icon <q-icon
v-if="props.rowIndex == 0" v-if="educations?.find((x:any)=> (props.row.year && x.educationLevel == props.row.checked && x.durationYear == props.row.year) || (!props.row.year && x.educationLevel == props.row.checked))"
name="checked" name="checked"
color="primary" color="primary"
size="xs" size="xs"

View file

@ -391,8 +391,10 @@ onMounted(async () => {
<q-btn <q-btn
v-if=" v-if="
store.step >= store.currentStep && store.step >= store.currentStep &&
store.step !== 3 &&
store.step !== 4 && store.step !== 4 &&
store.step !== 5 && store.step !== 5 &&
store.step !== 7 &&
store.step !== 8 && store.step !== 8 &&
store.step !== 9 store.step !== 9
" "
@ -401,6 +403,16 @@ onMounted(async () => {
color="public" color="public"
@click="onCilckNextStep" @click="onCilckNextStep"
/> />
<q-btn
v-else-if="
store.step >= store.currentStep &&
(store.step == 3 || store.step == 7)
"
unelevated
label="ยื่นเอกการ"
color="public"
@click="onCilckNextStep"
/>
</div> </div>
</div> </div>
</div> </div>

View file

@ -61,7 +61,7 @@ async function fetchDetail() {
formDetail.fullName = `${data.firstName} ${data.lastName}`; formDetail.fullName = `${data.firstName} ${data.lastName}`;
formDetail.position = data.position; formDetail.position = data.position;
formDetail.oc = data.oc; formDetail.oc = data.oc;
formDetail.salary = data.salary; formDetail.salary = data.salary.toLocaleString("th-TH");
formDetail.positionLevel = data.positionLevel; formDetail.positionLevel = data.positionLevel;
formDetail.posNo = data.posNo; formDetail.posNo = data.posNo;
formDetail.birthDate = data.birthDate && date2Thai(data.birthDate); formDetail.birthDate = data.birthDate && date2Thai(data.birthDate);
@ -240,120 +240,123 @@ onMounted(async () => {
<span class="q-ml-lg q-my-sm">ประวการศกษา </span> <span class="q-ml-lg q-my-sm">ประวการศกษา </span>
</div> </div>
<q-separator /> <q-separator />
<div <div v-if="formDetail.educations.length > 0">
class="row q-pa-sm" <div
v-for="(education, index) in formDetail.educations" class="row q-pa-sm"
:key="index" v-for="(education, index) in formDetail.educations"
> :key="index"
<div class="col-xs-6 col-sm-4 col-md-3"> >
<q-input <div class="col-xs-6 col-sm-4 col-md-3">
borderless <q-input
readonly borderless
:model-value="education.educationLevel" readonly
label="ระดับศึกษา" :model-value="education.educationLevel"
/> label="ระดับศึกษา"
</div> />
</div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.institute" :model-value="education.institute"
label="สถานศึกษา" label="สถานศึกษา"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
:model-value="date2Thai(education.startDate)" :model-value="date2Thai(education.startDate)"
readonly readonly
label="ตั้งแต่" label="ตั้งแต่"
> >
<template v-slot:prepend> <template v-slot:prepend>
<q-icon class="size-icon" name="o_calendar_today" /> <q-icon class="size-icon" name="o_calendar_today" />
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
:model-value="date2Thai(education.endDate)" :model-value="date2Thai(education.endDate)"
readonly readonly
label="ถึง" label="ถึง"
> >
<template v-slot:prepend> <template v-slot:prepend>
<q-icon class="size-icon" name="o_calendar_today" /> <q-icon class="size-icon" name="o_calendar_today" />
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
:model-value="date2Thai(education.finishDate)" :model-value="date2Thai(education.finishDate)"
readonly readonly
label="วันทราสำเร็จการศึกษา" label="วันทราสำเร็จการศึกษา"
> >
<template v-slot:prepend> <template v-slot:prepend>
<q-icon class="size-icon" name="o_calendar_today" /> <q-icon class="size-icon" name="o_calendar_today" />
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.degree" :model-value="education.degree"
label="วุฒิการศึกษาในตําแหน่ง" label="วุฒิการศึกษาในตําแหน่ง"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.degree" :model-value="education.degree"
label="วุฒิการศึกษา" label="วุฒิการศึกษา"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.field" :model-value="education.field"
label="สาขาวิชา/ทาง" label="สาขาวิชา/ทาง"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.fundName" :model-value="education.fundName"
label="ทุน" label="ทุน"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.gpa" :model-value="education.gpa"
label="เกรดเฉลี่ย" label="เกรดเฉลี่ย"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-6"> <div class="col-xs-6 col-sm-4 col-md-6">
<q-input <q-input
borderless borderless
readonly readonly
:model-value="education.country" :model-value="education.country"
label="ประเทศ" label="ประเทศ"
/> />
</div>
</div> </div>
</div> </div>
<div v-else class="row col-12 q-pa-md">ไมประวการศกษา</div>
<q-separator /> <q-separator />
</q-card> </q-card>
@ -406,6 +409,7 @@ onMounted(async () => {
<q-separator /> <q-separator />
<div class="row q-pa-sm"> <div class="row q-pa-sm">
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
-
<!-- <TableData <!-- <TableData
:columns="columnTraining" :columns="columnTraining"
:row="formDetail.Trainings" :row="formDetail.Trainings"