diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 1ca8790e8..dfda8ee8f 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -586,6 +586,11 @@ function clickSaveDeceased() { formData.append("Location", placeDeathCertificate.value); formData.append("Reason", reasonDeath.value); formData.append("ProfileId", profileId.value); + formData.append( + "ProfileType", + empType.value === "-employee" ? "EMPLOYEE" : "OFFICER" + ); + await http .post(config.API.listDeceased(), formData) .then(async () => { @@ -594,8 +599,6 @@ function clickSaveDeceased() { }) .catch((e) => { messageError($q, e); - }) - .finally(() => { hideLoader(); }); }); diff --git a/src/modules/06_retirement/views/05_deceased.vue b/src/modules/06_retirement/views/05_deceased.vue index b8fb457d9..2b47a9677 100644 --- a/src/modules/06_retirement/views/05_deceased.vue +++ b/src/modules/06_retirement/views/05_deceased.vue @@ -13,7 +13,14 @@ import { checkPermission } from "@/utils/permissions"; const $q = useQuasar(); const router = useRouter(); const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai, findOrgName ,onSearchDataTable} = mixin; +const { + showLoader, + hideLoader, + messageError, + date2Thai, + findOrgName, + onSearchDataTable, +} = mixin; /** คอลัมน์ */ const rows = ref([]); @@ -43,7 +50,28 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return `${row.prefix ?? ""}${row.firstName} ${row.lastName}`; + return row.firstName + ? ` ${row.prefix ?? ""}${row.firstName} ${row.lastName}` + : "-"; + }, + }, + + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return `${ + row.profileType === "OFFICER" + ? "ข้าราชการ กทม. สามัญ" + : row.profileType === "EMPLOYEE" + ? "ลูกจ้างประจำ กทม." + : "-" + } `; }, }, { @@ -109,6 +137,7 @@ const visibleColumns = ref([ "positionExecutive", "org", "createdAt", + "profileType", ]); /**เรียกข้อมูลจาก APi */