Merge branch 'develop' into working

This commit is contained in:
Tanyalak 2024-01-17 08:48:44 +07:00
commit 9b87bea96b
4 changed files with 388 additions and 380 deletions

View file

@ -614,7 +614,7 @@ onMounted(async () => {
<template v-slot:after>
<div class="col-12 row q-pa-md" >
<div class="col-12 row" v-if="showLoadStatus">
<div class="toptitle2 q-pt-xs">
<div class="toptitle2 q-pt-xs items-center">
{{ store.step }}.{{ store.title[store.step - 1] }}
</div>
<q-space />
@ -649,7 +649,7 @@ onMounted(async () => {
>
<q-card v-if="store.step === 1" flat bordered class="col-12 q-pa-md shadow-0">
<Step1
v-if="store.step === 1"
@update:spec="updateCheckSpec"
:data="formDataStep1"
:educations="formDetail?.educations"
@ -657,14 +657,14 @@ onMounted(async () => {
</q-card>
<q-card v-if="store.step === 2" flat bordered class="col-12 shadow-0" :style="$q.screen.lt.sm ? '' : 'height: 60vh; overflow: scroll;' ">
<Step2
v-if="store.step === 2"
@update:form="updateformCommand"
/>
</q-card>
<q-card
v-if="store.step === 3" flat bordered class="col-12 shadow-0">
<Step3
v-if="store.step === 3"
@update:file="updateFilePDF"
/>
</q-card>
@ -696,8 +696,9 @@ onMounted(async () => {
flat
v-if="store.step === 1"
>
<div class="col-12 row">
<div class="col-12 row" >
<ViewStep1
v-if="store.step === 1"
@update:formDeital="updateFormDetail"
:data="formDataStep1"
/>
@ -705,12 +706,14 @@ onMounted(async () => {
</q-card>
<q-card v-if="store.step === 3 && pdfSrc" class="row shadow-0" bordered flat >
<ViewStep3
v-if="store.step === 3 && pdfSrc"
:pdfSrc="pdfSrc"
:urlDownloadFile="urlDownloadFile"
/>
</q-card>
<q-card v-if="store.step === 7 && pdfSrc" class="row shadow-0" bordered flat >
<ViewStep7
v-if="store.step === 7 && pdfSrc"
:pdfSrc="pdfSrc"
:urlDownloadFile="urlDownloadFile"
/>