diff --git a/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue index 1fe633968..6777cb98a 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue @@ -44,6 +44,7 @@ const props = defineProps({ }); const id = ref(route.params.id as string); // id รายการประเมิน +const isLoadView = ref(false); const modalHistory = ref(false); const formCommand = reactive({ @@ -72,6 +73,7 @@ function updateformCommand(val: any, ref: any) { /** function เช็คขั้นตอน*/ async function fetchCheckStep() { + isLoadView.value = false; showLoader(); await http .get(config.API.evaluateGetStep(id.value)) @@ -100,12 +102,15 @@ async function fetchCheckStep() { store.currentStep = step; store.step = step; + isLoadView.value = true; }) .catch((e) => { messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 3000); }); } @@ -132,7 +137,7 @@ onMounted(async () => { : "ประเมินชำนาญการ" }} - +
{
-
+
{{ store.step }}.{{ store.titel[store.step - 1] }} @@ -176,15 +181,15 @@ onMounted(async () => { " > - - - - - - - - - + + + + + + + + +
{ - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1000); }); } onMounted(async () => { diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue index 97d6dec5a..e7eb2548b 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue @@ -333,21 +333,23 @@ async function checkDoc10() { "10-ประกาศผลการคัดเลือกบุคคล (เอกสารหมายเลข 10)" ) ) - .then((res: any) => { + .then(async (res) => { download10Url.value = res.data.downloadUrl; - fetchProfile(); + await fetchProfile(); }) .catch(() => { // messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 2000); }); } /** function เรียกข้แมูลคุณสมบัติ*/ async function fetchProfile() { - // showLoader(); + showLoader(); await http .get(config.API.evaluateGetDetail(id.value)) .then((res) => { @@ -358,7 +360,9 @@ async function fetchProfile() { messageError($q, err); }) .finally(() => { - // hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } @@ -379,13 +383,14 @@ async function fetchDataSigner() { messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } onMounted(async () => { - await checkDoc10(); - await fetchDataSigner(); + await Promise.all([checkDoc10(), fetchDataSigner()]); }); diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue index d0ea0d812..4cbafa5f9 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue @@ -189,14 +189,16 @@ async function getDate() { messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } const download10Url = ref(""); /** function เช็คไฟล์อัปโหลด*/ async function checkDocResult() { - // showLoader(); + showLoader(); await http .get( config.API.evaluationPatchData( @@ -208,11 +210,10 @@ async function checkDocResult() { .then((res: any) => { download10Url.value = res.data.downloadUrl; }) - .catch(() => { - // messageError($q, e); - }) .finally(() => { - // hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } @@ -234,14 +235,14 @@ async function fetchDataSigner() { messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } onMounted(async () => { - await getDate(); - await checkDocResult(); - await fetchDataSigner(); + await Promise.all([getDate(), checkDocResult(), fetchDataSigner()]); }); diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue index dd54bae02..4567b18b2 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue @@ -45,7 +45,9 @@ async function getDate() { messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } @@ -67,23 +69,26 @@ async function getSigner() { } }) .catch((e) => { - // messageError($q, e); + messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } onMounted(async () => { - await getSigner(); - await getDate(); + await Promise.all([getSigner(), getDate()]); });