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