diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue index c842f43ae..da057ff33 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue @@ -32,7 +32,6 @@ const { showLoader, hideLoader, messageError } = mixin; const assignId = ref(route.params.form.toString()); const personalId = ref(route.params.personalId.toString()); - const tab = ref("save1"); const dataArrayNumber = ref(); const dataRole = ref("mentor"); @@ -52,7 +51,7 @@ async function fecthAssign(id: string) { // messageError($q, e); }) .finally(() => { - probationStore.checkLoad && hideLoader(); + hideLoader(); }); } @@ -82,13 +81,13 @@ async function FileDownload(type: string) { `แบบบันทึกผล(ผู้ดูเเล)_${probationStore.person.name}_ครั้งที่${numTab.no}`, type ); - hideLoader(); }) .catch(async (e) => { messageError($q, JSON.parse(await e.response.data.text())); - hideLoader(); }) - .finally(() => {}); + .finally(() => { + hideLoader(); + }); } else { //ผุ้บังคับ showLoader(); @@ -101,13 +100,13 @@ async function FileDownload(type: string) { `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}`, type ); - hideLoader(); }) .catch(async (e) => { messageError($q, JSON.parse(await e.response.data.text())); - hideLoader(); }) - .finally(() => {}); + .finally(() => { + hideLoader(); + }); } } diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue index f806db285..e10902eee 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue @@ -65,21 +65,10 @@ async function fecthAssign(id: string) { // messageError($q, e); }) .finally(() => { - probationStore.checkLoad && hideLoader(); + hideLoader(); }); } -/** เปลี่ยน type file */ -function downloadFile(response: any, filename: string) { - const link = document.createElement("a"); - var fileName = filename; - link.href = window.URL.createObjectURL(new Blob([response.data])); - link.setAttribute("download", fileName); - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); -} - /** * download file * @param type type @@ -96,13 +85,13 @@ async function FileDownload(type: string) { `แบบประเมินผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}`, type ); - hideLoader(); }) .catch(async (e) => { messageError($q, JSON.parse(await e.response.data.text())); - hideLoader(); }) - .finally(() => {}); + .finally(() => { + hideLoader(); + }); } /** เปลี่ยนหน้า เพิ่ม */ diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue index 886bec951..d31f486ef 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue @@ -59,7 +59,7 @@ const fecthAssign = async (id: string) => { // messageError($q, e); }) .finally(() => { - probationStore.checkLoad && hideLoader(); + hideLoader(); }); }; @@ -75,13 +75,13 @@ const FileDownload = async (type: string) => { `แบบประเมินผล(คณะกรรมการ)_${probationStore.person.name}_ครั้งที่${numTab.no}`, type ); - hideLoader(); }) .catch(async (e) => { messageError($q, JSON.parse(await e.response.data.text())); - hideLoader(); }) - .finally(() => {}); + .finally(() => { + hideLoader(); + }); }; const addData = () => { router.push( diff --git a/src/modules/05_placement/storeProbation.ts b/src/modules/05_placement/storeProbation.ts index 471a408a3..7033b7d32 100644 --- a/src/modules/05_placement/storeProbation.ts +++ b/src/modules/05_placement/storeProbation.ts @@ -5,25 +5,24 @@ import type { DataPermissions, TabPermissions, } from "@/modules/05_placement/interface/index/Main"; - + export const useProbationDataStore = defineStore("probationStore", () => { const dataPermissions = ref(); - + const assign = ref([]); const evaluate = ref([]); const tabs = ref([]); const mainTab = ref(""); - const checkLoad = ref(false) + const checkLoad = ref(false); const assignOutput = ref([]); const director = ref([]); const person = ref([]); const fecthdataAssign = async (data: any) => { - checkLoad.value = data.evaluate.length == 0 ? true:false + checkLoad.value = data.evaluate.length == 0 ? true : false; assign.value = await data.assign; evaluate.value = await data.evaluate; tabs.value = await data.evaluate; - }; const fecthAssignoutput = (data: any) => { assignOutput.value = data.assign_output; @@ -114,6 +113,6 @@ export const useProbationDataStore = defineStore("probationStore", () => { behavior_no2, behavior_no3, dataPermissions, - checkLoad + checkLoad, }; });