diff --git a/src/modules/06_retirement/components/resign/DetailDeceased.vue b/src/modules/06_retirement/components/resign/DetailDeceased.vue index 5db7009e7..d84c505e8 100644 --- a/src/modules/06_retirement/components/resign/DetailDeceased.vue +++ b/src/modules/06_retirement/components/resign/DetailDeceased.vue @@ -44,8 +44,6 @@ const fetchData = async () => { const data = res.data.result; dataProfile.value = data as DataProfile; detail.value = data; - console.log(detail.value?.firstName); - fullName.value = `${data.prefix}${data.firstName} ${data.lastName}`; }) .catch((e) => { @@ -74,20 +72,20 @@ const fileDownload = async (type: string) => { showLoader(); await http .get(config.API.DeceasedReport(type, profileId.value)) - .then((res) => { + .then(async (res) => { const data = res.data.result; - genReport( + await genReport( data, `รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม-${fullName.value}`, type ); + hideLoader(); }) .catch(async (e) => { messageError($q, JSON.parse(await e.response.data.text())); - }) - .finally(() => { hideLoader(); - }); + }) + .finally(() => {}); }; diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index e86b5d07f..13f82046b 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -1552,7 +1552,7 @@ onMounted(async () => { flat round color="blue" - icon="mdi-download-outline" + icon="mdi-download" @click=" downloadRenameFileByLink( file.pathName,