From 6f9a82faa3f46ce7eafe8d8bcdffc70553197c3d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 11 Jun 2024 11:17:43 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=3D>=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryNew/components/TableView.vue        |  8 ++++++--
 src/modules/04_registryNew/views/list.vue          | 14 --------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue
index 3fbd2da6e..b8988c058 100644
--- a/src/modules/04_registryNew/components/TableView.vue
+++ b/src/modules/04_registryNew/components/TableView.vue
@@ -323,7 +323,9 @@ watch(
                   >
                     <q-tooltip>ดูทะเบียนประวัติ</q-tooltip>
                     {{
-                      `${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
+                      `${props.row.prefix ? props.row.prefix : ""}${
+                        props.row.firstName
+                      } ${props.row.lastName}`
                     }}
                   </div>
                   <div class="text-weight-light">{{ props.row.citizenId }}</div>
@@ -347,7 +349,9 @@ watch(
 
             <div class="text-weight-medium q-mt-md">
               {{
-                `${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
+                `${props.row.prefix ? props.row.prefix : ""}${
+                  props.row.firstName
+                } ${props.row.lastName}`
               }}
             </div>
             <div class="text-weight-light full-width text-center">
diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue
index efbce7087..93d4f45c5 100644
--- a/src/modules/04_registryNew/views/list.vue
+++ b/src/modules/04_registryNew/views/list.vue
@@ -70,9 +70,6 @@ function fetchType() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -85,14 +82,10 @@ function fetchLevel() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
 function fetchOptionGroup() {
-  showLoader();
   http
     .get(config.API.orgEmployeeType)
     .then((res) => {
@@ -100,14 +93,10 @@ function fetchOptionGroup() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
 function fetchLevelGroup() {
-  showLoader();
   http
     .get(config.API.orgEmployeelevel)
     .then((res) => {
@@ -115,9 +104,6 @@ function fetchLevelGroup() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }