From 371fc432827f882dbb819591b965b334dc15f573 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Fri, 14 Jun 2024 14:11:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99?=
 =?UTF-8?q?=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/PersonalInformation/01_Profile.vue    | 6 +++---
 src/modules/06_retirement/components/resign/Deceased.vue    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
index 9e59670a3..1ec7c9426 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
@@ -443,9 +443,9 @@ onMounted(async () => {
           </div>
           <div class="q-py-xs">
             {{
-              `${informaData.rank ? informaData.rank : informaData.prefix} ${
-                informaData.firstName
-              } ${informaData.lastName}`
+              `${
+                informaData.rank ? informaData.rank : informaData.prefix ?? ""
+              } ${informaData.firstName} ${informaData.lastName}`
             }}
           </div>
           <div class="q-py-xs">
diff --git a/src/modules/06_retirement/components/resign/Deceased.vue b/src/modules/06_retirement/components/resign/Deceased.vue
index 5ded44e80..685ac5c50 100644
--- a/src/modules/06_retirement/components/resign/Deceased.vue
+++ b/src/modules/06_retirement/components/resign/Deceased.vue
@@ -41,7 +41,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.prefix}${row.firstName} ${row.lastName}`;
+      return `${row.prefix ?? ""}${row.firstName} ${row.lastName}`;
     },
   },
   {