diff --git a/src/api/registry/api.profile.ts b/src/api/registry/api.profile.ts index d82276464..f4bc2fb58 100644 --- a/src/api/registry/api.profile.ts +++ b/src/api/registry/api.profile.ts @@ -179,7 +179,8 @@ export default { profileReportEmpId: (profileId: string) => `${report}kk1-employee/${profileId}`, profileKp7ShortId: (profileId: string) => `${report}kp7-short/${profileId}`, - profileKp7ShortEmpId: (profileId: string) => `${report}kp7-short-employee/${profileId}`, + profileKp7ShortEmpId: (profileId: string) => + `${report}kp7-short-employee/${profileId}`, profileChangeNameId: (profileId: string) => `${profile}changeName/${profileId}`, @@ -220,5 +221,10 @@ export default { `${profile}search/new-page/oc/${id}/officer?page=${page}&pageSize=${pageSize}`, orgProfileAvatar: `${registryNew}avatar`, - orgProfileAvatarbyType:(type:string)=> `${avatarNew}${type}/avatar`, + orgProfileAvatarbyType: (type: string) => `${avatarNew}${type}/avatar`, + + profilFull: (id: string, type: string) => + `${env.API_URI}/org/${type}/kk1/${id}`, + profilshort: (id: string, type: string) => + `${env.API_URI}/org/${type}/kp7-short/${id}`, }; diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 86f837bb7..37daea1da 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -399,11 +399,11 @@ async function onClickDownloadKp7(type: string) { const url = type === "FULL" ? empType.value - ? config.API.profileReportEmpId(profileId.value) - : config.API.profileReportId(profileId.value) + ? config.API.profilFull(profileId.value, "profile-employee") + : config.API.profilFull(profileId.value, "profile") : empType.value - ? config.API.profileKp7ShortEmpId(profileId.value) - : config.API.profileKp7ShortId(profileId.value); + ? config.API.profilshort(profileId.value, "profile-employee") + : config.API.profilshort(profileId.value, "profile"); const fileName = type === "FULL" ? "ก.พ.7/ก.ก.1" : "ประวัติแบบย่อ"; await http @@ -411,13 +411,13 @@ async function onClickDownloadKp7(type: string) { .then(async (res) => { const data = await res.data.result; await genReport(data, `${fileName}`, type); - hideLoader(); }) .catch((err) => { messageError($q, err); - hideLoader(); }) - .finally(() => {}); + .finally(() => { + hideLoader(); + }); } /** @@ -1089,7 +1089,10 @@ onMounted(async () => { - +