From a27091a81ac195d8c63f3bd69c7b57a451ceeeb8 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 14 Jun 2024 10:59:54 +0700 Subject: [PATCH] fixing response error message for response type blob --- .../03_recruiting/views/01_compete/Detail.vue | 24 +-- .../views/01_compete/DetailEx.vue | 8 +- .../views/02_qualify/DisableDetail.vue | 12 +- .../views/02_qualify/DisableDetailEx.vue | 8 +- .../detail/PersonalInformation/03_Address.vue | 172 +++++++++++------- src/stores/mixin.ts | 72 ++++---- 6 files changed, 157 insertions(+), 139 deletions(-) diff --git a/src/modules/03_recruiting/views/01_compete/Detail.vue b/src/modules/03_recruiting/views/01_compete/Detail.vue index ac7e6cdf7..8f2cabea3 100644 --- a/src/modules/03_recruiting/views/01_compete/Detail.vue +++ b/src/modules/03_recruiting/views/01_compete/Detail.vue @@ -386,8 +386,8 @@ const downloadExam = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); @@ -407,14 +407,8 @@ const downloadPassExam = async () => { // start download a.click(); }) - .catch((e) => { - messageError( - $q, - e, - rows.value.length == 0 - ? "ไม่พบข้อมูลผลการสอบ กรุณาตรวจสอบความถูกต้องอีกครั้ง!" - : "" - ); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); @@ -434,14 +428,8 @@ const downloadPassResultExam = async () => { // start download a.click(); }) - .catch((e) => { - messageError( - $q, - e, - rows.value.length == 0 - ? "ไม่พบข้อมูลผลการสอบ กรุณาตรวจสอบความถูกต้องอีกครั้ง!" - : "" - ); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); diff --git a/src/modules/03_recruiting/views/01_compete/DetailEx.vue b/src/modules/03_recruiting/views/01_compete/DetailEx.vue index 3ed5ce89c..25e504865 100644 --- a/src/modules/03_recruiting/views/01_compete/DetailEx.vue +++ b/src/modules/03_recruiting/views/01_compete/DetailEx.vue @@ -336,8 +336,8 @@ const downloadScore = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); @@ -358,8 +358,8 @@ const downloadCertificate = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue index aad8efb37..ebc378469 100644 --- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue +++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue @@ -344,8 +344,8 @@ const downloadExam = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); @@ -365,8 +365,8 @@ const downloadPassExam = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); @@ -386,8 +386,8 @@ const downloadPassResultExam = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue index 75a2f501f..79442ce4d 100644 --- a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue +++ b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue @@ -339,8 +339,8 @@ const downloadScore = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); @@ -363,8 +363,8 @@ const downloadCertificate = async () => { // start download a.click(); }) - .catch((e) => { - messageError($q, e); + .catch(async (e) => { + messageError($q, JSON.parse(await e.response.data.text())); }) .finally(() => { hideLoader(); diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue index bf1868667..8c5bc0a28 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue @@ -65,13 +65,13 @@ const adsName = reactive({ const dataLabel = { registrationAddress: "ที่อยู่ตามทะเบียนบ้าน", registrationProvince: "จังหวัด", - registrationDistrict: "เขต / อำเภอ", + registrationDistrict: "เขต/อำเภอ", registrationSubDistrict: "แขวง / ตำบล", registrationZipCode: "รหัสไปรษณีย์", currentAddress: "ที่อยู่ปัจจุบัน", currentProvince: "จังหวัด", - currentDistrict: "เขต / อำเภอ", + currentDistrict: "เขต/อำเภอ", currentSubDistrict: "แขวง / ตำบล", currentZipCode: "รหัสไปรษณีย์", @@ -81,7 +81,6 @@ const dataLabel = { const visibleColumnsHistory = ref([ "currentAddress", "currentDistrict", - "currentProvince", "currentSubDistrict", "currentZipCode", "registrationAddress", @@ -481,6 +480,7 @@ onMounted(async () => { await fetchAll(); }); +