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

---
 src/modules/04_registryNew/components/DialogHistory.vue | 8 ++++++--
 src/modules/04_registryNew/views/list.vue               | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryNew/components/DialogHistory.vue b/src/modules/04_registryNew/components/DialogHistory.vue
index 31a768e8d..9b8e78bf0 100644
--- a/src/modules/04_registryNew/components/DialogHistory.vue
+++ b/src/modules/04_registryNew/components/DialogHistory.vue
@@ -154,7 +154,7 @@ function clickSearch(type: string) {
             rows.value = data.map((e: any) => ({
               id: e.id,
               citizenId: e.citizenId,
-              name: e.firstName + "    " + e.lastName,
+              name: e.fullName,
               posNo: e.posNo,
               position: e.position,
               date: date2Thai(e.date),
@@ -190,7 +190,11 @@ function filterFn(val: string, update: any) {
   }
 }
 function clickRedirect(id: string) {
-  router.push(`/registry/${id}`);
+  const url =
+    employeeClass.value === "officer"
+      ? "registry-new"
+      : "registry-new-employee";
+  router.push(`${url}/${id}`);
 }
 
 const paging = ref<boolean>(true);
diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue
index 38aeac255..5e6b0e550 100644
--- a/src/modules/04_registryNew/views/list.vue
+++ b/src/modules/04_registryNew/views/list.vue
@@ -260,7 +260,7 @@ function selectType(item: DataOption) {
     fetchLevel();
   }
 
-  fetchDataPerson();
+  fetchDataPerson(true);
 }
 
 function selectPosType(item: DataOption) {