From 30e04bf60c473a47a3dbff293994d1f0d4e7bffe Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Mon, 24 Jun 2024 16:23:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=95=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ListRetirement/AddList.vue       |  8 ++++----
 .../06_retirement/components/resign/Resign.vue  | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index 458848879..74e66bd21 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -112,7 +112,7 @@ function findOrgName(obj: any) {
         ? obj.orgChild1Name
         : "";
     name += obj.orgRootName != null ? obj.orgRootName : "";
-    return name == "" ? "-" : name;
+    return name == "" ? "" : name;
   } else {
     return "";
   }
@@ -140,7 +140,7 @@ const fecthProfile = async () => {
         level:
           e.posTypeName && e.posLevelName
             ? e.posTypeName + " (" + e.posLevelName + ")"
-            : "-",
+            : "",
         organizationOrganization: findOrgName(e),
       }));
     })
@@ -273,13 +273,13 @@ const paginationLabel = (start: number, end: number, total: number) => {
               <q-td key="position" :props="props">
                 {{ props.row.position ? props.row.position:'-' }}
               </q-td>
-              <q-td key="level" :props="props">{{ props.row.level }}</q-td>
+              <q-td key="level" :props="props">{{ props.row.level ? props.row.level :'-' }}</q-td>
               <q-td
                 key="organizationOrganization"
                 :props="props"
                 class="table_ellipsis"
               >
-                {{ props.row.organizationOrganization }}
+                {{ props.row.organizationOrganization ? props.row.organizationOrganization:'-' }}
               </q-td>
               <q-td>
                 <q-btn
diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue
index 0829cb473..459aa2327 100644
--- a/src/modules/06_retirement/components/resign/Resign.vue
+++ b/src/modules/06_retirement/components/resign/Resign.vue
@@ -316,7 +316,22 @@ const pagination = ref({
                   <div v-if="col.name === 'no'">
                     {{ props.rowIndex + 1 }}
                   </div>
-
+                  <div v-else-if="col.name === 'fullname'">
+                    <div
+                      v-if="
+                        !props.row.prefix &&
+                        !props.row.firstName &&
+                        !props.row.lastName
+                      "
+                    >
+                      -
+                    </div>
+                    <div v-else>
+                      {{ props.row.prefix ? props.row.prefix : ""
+                      }}{{ props.row.firstName ? props.row.firstName : "" }}
+                      {{ props.row.lastName ? props.row.lastName : "" }}
+                    </div>
+                  </div>
                   <div
                     v-else
                     :class="