แก้ Conflicts
This commit is contained in:
Tanyalak
parent
6ccdc99892
commit
17df87bc10
1 changed files with 105 additions and 95 deletions
|
|
@ -41,7 +41,13 @@ const mixin = useCounterMixin();
|
|||
const $q = useQuasar();
|
||||
const splitterModel = 20;
|
||||
|
||||
const { showLoader, hideLoader, messageError, dialogConfirm } = mixin;
|
||||
const {
|
||||
showLoader,
|
||||
hideLoader,
|
||||
messageError,
|
||||
dialogConfirm,
|
||||
dialogMessageNotify,
|
||||
} = mixin;
|
||||
|
||||
const externalLink =
|
||||
"https://accreditation.ocsc.go.th/accreditation/search/curriculum";
|
||||
|
|
@ -56,14 +62,18 @@ function onClickPopupHistory() {
|
|||
/** function NextToStep*/
|
||||
async function onCilckNextStep() {
|
||||
const functionCreateDoc: (() => Promise<void>) | null =
|
||||
store.step === 1
|
||||
? await saveStep1
|
||||
: store.step === 3
|
||||
// store.step === 1
|
||||
// ? await saveStep1
|
||||
// :
|
||||
store.step === 3
|
||||
? await saveStep3
|
||||
: store.step === 7
|
||||
? await saveStep7
|
||||
: null;
|
||||
store.step === 2 || store.step === 6
|
||||
|
||||
store.step === 1
|
||||
? checkSelectForm()
|
||||
: store.step === 2 || store.step === 6
|
||||
? validateForm()
|
||||
: store.step == 3 || store.step == 7
|
||||
? dialogConfirm(
|
||||
|
|
@ -74,16 +84,7 @@ async function onCilckNextStep() {
|
|||
"ยืนยันการยื่นเอกสาร",
|
||||
"ต้องการยืนยันการยื่นเอกสารใช่หรือไม่? หากยืนยันแล้วคุณจะไม่สามารถกลับมาแก้ไขเอกสารได้อีก"
|
||||
)
|
||||
: store.step < 9 &&
|
||||
dialogConfirm(
|
||||
$q,
|
||||
async () => {
|
||||
showLoader();
|
||||
await functionCreateDoc?.();
|
||||
},
|
||||
"ยืนยันการดำเนินการ",
|
||||
"ต้องการยืนยันการดำเนินการต่อใช่หรือไม่?"
|
||||
);
|
||||
: null;
|
||||
}
|
||||
|
||||
/** function validateForm Step 2,4*/
|
||||
|
|
@ -187,6 +188,7 @@ const formSpec = reactive<FormSpec>({
|
|||
});
|
||||
const formDetail = ref<any>();
|
||||
const formDataStep1 = ref<PersonInformation>();
|
||||
|
||||
/**
|
||||
* function เรียกข่้อมูลตรวจสอบคุณสมบัติ
|
||||
* @param id id ประเมิน
|
||||
|
|
@ -222,6 +224,7 @@ async function updateCheckSpec(data: FormSpec) {
|
|||
formSpec.isHaveProLicense = data.isHaveProLicense;
|
||||
formSpec.isHaveMinPeriodOrHoldPos = data.isHaveMinPeriodOrHoldPos;
|
||||
}
|
||||
|
||||
/**
|
||||
* funciton อัปเดทข้อมูลส่วนตัว
|
||||
* @param data ข้อมูลส่วนตัว
|
||||
|
|
@ -229,6 +232,21 @@ async function updateCheckSpec(data: FormSpec) {
|
|||
function updateFormDetail(data: any) {
|
||||
formDetail.value = data;
|
||||
}
|
||||
/** function เช็คการการคุณสมบัติ*/
|
||||
function checkSelectForm() {
|
||||
const isTrue = Object.keys(formSpec).find((key) => formSpec[key] === true);
|
||||
isTrue
|
||||
? dialogConfirm(
|
||||
$q,
|
||||
async () => {
|
||||
showLoader();
|
||||
saveStep1();
|
||||
},
|
||||
"ยืนยันการดำเนินการ",
|
||||
"ต้องการยืนยันการดำเนินการต่อใช่หรือไม่?"
|
||||
)
|
||||
: dialogMessageNotify($q, "กรุณาเลือกคุณสมบัติ");
|
||||
}
|
||||
/** function บันทักตรวจสอบคุณสมบัติ*/
|
||||
async function saveStep1() {
|
||||
const salaries = formDetail.value.trainings.map((e: any) => ({
|
||||
|
|
@ -575,68 +593,66 @@ onMounted(async () => {
|
|||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-12 col-md-11 row">
|
||||
<div class="col-12 row">
|
||||
<div class="col-12">
|
||||
<q-card bordered class="col-12 row caedNone">
|
||||
<div class="col-xs-12 col-sm-3 row">
|
||||
<div class="col-12 row no-wrap">
|
||||
<div class="col-12 row q-py-md q-px-lg" >
|
||||
<div class="col-12">
|
||||
<div class="col-12 row items-center no-wrap">
|
||||
<div class="toptitle2">
|
||||
{{
|
||||
route.params.type === "expert"
|
||||
? "ประเมินชำนาญการ"
|
||||
: "ประเมินชำนาญการพิเศษ"
|
||||
}}
|
||||
</div>
|
||||
<q-space/>
|
||||
<div>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
dense
|
||||
color="primary"
|
||||
icon="history"
|
||||
@click="onClickPopupHistory"
|
||||
>
|
||||
<q-tooltip>ประวัติการประเมิน</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<div class="col-12 q-py-md q-px-lg">
|
||||
<div class="col-12 row items-center no-wrap">
|
||||
<div class="toptitle2">
|
||||
{{
|
||||
route.params.type === "expert"
|
||||
? "ประเมินชำนาญการ"
|
||||
: "ประเมินชำนาญการพิเศษ"
|
||||
}}
|
||||
</div>
|
||||
<q-space />
|
||||
<div>
|
||||
<Stepper />
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
dense
|
||||
color="primary"
|
||||
icon="history"
|
||||
@click="onClickPopupHistory"
|
||||
>
|
||||
<q-tooltip>ประวัติการประเมิน</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<Stepper />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 row">
|
||||
<q-separator vertical/>
|
||||
<q-separator :vertical="!$q.screen.lt.md" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-9 q-pa-md row" v-if="showLoadStatus">
|
||||
<div class="col-12">
|
||||
<div class="col-12 row items-center">
|
||||
<div class="toptitle2">
|
||||
{{ store.step }}.{{ store.title[store.step - 1] }}
|
||||
</div>
|
||||
<q-space/>
|
||||
<div>
|
||||
<q-btn
|
||||
v-if="store.step === 1"
|
||||
:href="externalLink"
|
||||
target="_blank"
|
||||
outline
|
||||
color="blue"
|
||||
dense
|
||||
class="q-px-md"
|
||||
no-caps
|
||||
>
|
||||
ตรวจสอบคุณสมบัติกับ ก.พ.
|
||||
</q-btn>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-9 q-pa-md " v-if="showLoadStatus">
|
||||
<div class="col-12 row items-center">
|
||||
<div class="toptitle2">
|
||||
{{ store.step }}.{{ store.title[store.step - 1] }}
|
||||
</div>
|
||||
<div class="row q-col-gutter-md col-12 q-pt-sm">
|
||||
<q-space/>
|
||||
<div >
|
||||
<q-btn
|
||||
v-if="store.step === 1"
|
||||
:href="externalLink"
|
||||
target="_blank"
|
||||
outline
|
||||
color="blue"
|
||||
dense
|
||||
class="q-px-md"
|
||||
no-caps
|
||||
>
|
||||
ตรวจสอบคุณสมบัติกับ ก.พ.
|
||||
</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
<div class=" col-12 q-pt-sm">
|
||||
<div class="q-col-gutter-md col-12 row">
|
||||
<div
|
||||
:class="
|
||||
store.step === 2 ||
|
||||
|
|
@ -645,44 +661,38 @@ onMounted(async () => {
|
|||
store.step === 6 ||
|
||||
store.step === 8 ||
|
||||
store.step === 9
|
||||
? 'col-xs-12 col-sm-12 row'
|
||||
: 'col-xs-12 col-sm-5 row'
|
||||
? 'col-12 '
|
||||
: 'col-xs-12 col-sm-5 '
|
||||
"
|
||||
>
|
||||
<q-card flat bordered class="col-12 shadow-0">
|
||||
<Step1
|
||||
v-if="store.step === 1"
|
||||
@update:spec="updateCheckSpec"
|
||||
:data="formDataStep1"
|
||||
:educations="formDetail?.educations"
|
||||
/>
|
||||
<Step2
|
||||
v-if="store.step === 2"
|
||||
@update:form="updateformCommand"
|
||||
/>
|
||||
<Step3
|
||||
v-if="store.step === 3"
|
||||
@update:file="updateFilePDF"
|
||||
/>
|
||||
<Step4 v-if="store.step === 4" />
|
||||
<Step5 v-if="store.step === 5" />
|
||||
<Step6
|
||||
v-if="store.step === 6"
|
||||
@update:form="updateformCommand"
|
||||
/>
|
||||
<Step7
|
||||
v-if="store.step === 7"
|
||||
@update:file="updateFilePDF"
|
||||
/>
|
||||
<Step8 v-if="store.step === 8" />
|
||||
<Step9 v-if="store.step === 9" />
|
||||
<Step1
|
||||
v-if="store.step === 1"
|
||||
@update:spec="updateCheckSpec"
|
||||
:data="formDataStep1"
|
||||
:educations="formDetail?.educations"
|
||||
/>
|
||||
<Step2
|
||||
v-if="store.step === 2"
|
||||
@update:form="updateformCommand"
|
||||
/>
|
||||
<Step3 v-if="store.step === 3" @update:file="updateFilePDF" />
|
||||
<Step4 v-if="store.step === 4" />
|
||||
<Step5 v-if="store.step === 5" />
|
||||
<Step6
|
||||
v-if="store.step === 6"
|
||||
@update:form="updateformCommand"
|
||||
/>
|
||||
<Step7 v-if="store.step === 7" @update:file="updateFilePDF" />
|
||||
<Step8 v-if="store.step === 8" />
|
||||
<Step9 v-if="store.step === 9" />
|
||||
</q-card>
|
||||
</div>
|
||||
<div
|
||||
class="col-xs-12 col-sm-7 row"
|
||||
class="col-xs-12 col-sm-7"
|
||||
v-if="store.step === 1 || store.step === 3 || store.step === 7"
|
||||
>
|
||||
<div class="col-12 ">
|
||||
<div class="col-12">
|
||||
<ViewStep1
|
||||
v-if="store.step === 1"
|
||||
@update:formDeital="updateFormDetail"
|
||||
|
|
@ -701,7 +711,8 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="q-pt-md q-gutter-md" align="right">
|
||||
</div>
|
||||
<div class="q-pt-sm q-gutter-sm" align="right">
|
||||
<q-btn
|
||||
v-if="
|
||||
store.step >= store.currentStep &&
|
||||
|
|
@ -757,7 +768,6 @@ onMounted(async () => {
|
|||
@click="onCilckNextStep()"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue