From 51bd71ad83b15a9be10000ccbd426a2238d1f1e0 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 25 Mar 2025 09:27:27 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20-=20=E0=B9=80=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B9=89=E0=B8=A7=20=E0=B8=AA=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B8=AD=E0=B9=83=E0=B8=AB=E0=B9=89=20back?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/05_deceased/SendCircularPage.vue        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue b/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue
index 0d57e86c4..25acbaf16 100644
--- a/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue
+++ b/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue
@@ -141,7 +141,7 @@ async function getData() {
         list.push({
           id: r.id,
           personalId: r.profileId ?? "",
-          name: `${r.prefix}${r.firstName} ${r.lastName}`,
+          name: r.firstName ? `${r.prefix}${r.firstName} ${r.lastName}` : "",
           idCard: r.citizenId ?? "",
           position: r.positionName ?? "",
           unit: r.organizationName ?? "-",
@@ -370,16 +370,16 @@ onMounted(async () => {
                 {{ props.rowIndex + 1 }}
               </q-td>
               <q-td key="idCard" :props="props">
-                {{ props.row.idCard }}
+                {{ props.row.idCard ? props.row.idCard : "-" }}
               </q-td>
               <q-td key="name" :props="props">
-                {{ props.row.name }}
+                {{ props.row.name ? props.row.name : "-" }}
               </q-td>
               <q-td key="position" :props="props">
-                {{ props.row.position }}
+                {{ props.row.position ? props.row.position : "-" }}
               </q-td>
               <q-td key="unit" :props="props">
-                {{ props.row.unit }}
+                {{ props.row.unit ? props.row.unit : "-" }}
               </q-td>
               <q-td key="send" :props="props">
                 <q-select