diff --git a/src/modules/10_registry/05_Other/02_File.vue b/src/modules/10_registry/05_Other/02_File.vue index 36f7a12..9de25d4 100644 --- a/src/modules/10_registry/05_Other/02_File.vue +++ b/src/modules/10_registry/05_Other/02_File.vue @@ -8,9 +8,9 @@ import config from "@/app.config"; import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry"; interface ArrayFileList { - id:string - pathName:string - fileName:string + id: string; + pathName: string; + fileName: string; } const fileList = ref([]); const store = useRegistryInFormationStore(); @@ -48,7 +48,9 @@ function getData() { messageError($q, e); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1500); }); } @@ -56,7 +58,7 @@ function getData() { * ดาวน์โหลดลิงค์ไฟล์ * @param fileName file name */ - function downloadFile(fileName: string) { +function downloadFile(fileName: string) { showLoader(); http .get( diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue index 5a2ebb8..9be68b5 100644 --- a/src/modules/10_registry/views/main.vue +++ b/src/modules/10_registry/views/main.vue @@ -46,26 +46,35 @@ function onMobile(type: string) { function getMain() { showLoader(); - http.get(config.API.profilePosition()).then((res) => { - const data = res.data.result; - formData.prefix = data.prefix; - formData.firstName = data.firstName; - formData.lastName = data.lastName; - formData.position = data.position; + http + .get(config.API.profilePosition()) + .then(async (res) => { + const data = res.data.result; + formData.prefix = data.prefix; + formData.firstName = data.firstName; + formData.lastName = data.lastName; + formData.position = data.position; - formData.posTypeName = data.posTypeName; - formData.posExecutiveName = data.posExecutiveName; - formData.posLevelName = data.posLevelName; - store.profileId = data.profileId; - if (data.avatarName) { - getImg(data.profileId, data.avatarName); - } else { - profileImg.value = avatar; - } - }); + formData.posTypeName = data.posTypeName; + formData.posExecutiveName = data.posExecutiveName; + formData.posLevelName = data.posLevelName; + store.profileId = data.profileId; + if (data.avatarName) { + await getImg(data.profileId, data.avatarName); + } else { + profileImg.value = avatar; + } + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + hideLoader(); + }); } function getImg(id: string, pathName: string) { + showLoader(); http .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName)) .then((res) => {