From 96a1722435bb8a0b2cf62ac1944f6bdc9d9ba3e2 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 5 Sep 2024 10:07:52 +0700
Subject: [PATCH] fixing registy

---
 .../components/TableView.vue                  | 20 +++++++++++++------
 .../interface/request/Main.ts                 |  1 +
 .../interface/response/Main.ts                |  1 +
 src/modules/04_registryPerson/store.ts        |  1 +
 src/modules/04_registryPerson/views/list.vue  | 10 +++++-----
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index e5b14f53f..d672f6bf6 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -352,9 +352,13 @@ watch(
                     class="text-weight-medium"
                   >
                     {{
-                      `${props.row.prefix ? props.row.prefix : ""}${
-                        props.row.firstName
-                      } ${props.row.lastName}`
+                      `${
+                        props.row.rank
+                          ? props.row.rank
+                          : props.row.prefix
+                          ? props.row.prefix
+                          : ""
+                      }${props.row.firstName} ${props.row.lastName}`
                     }}
                   </div>
                   <div
@@ -367,9 +371,13 @@ watch(
                   >
                     <q-tooltip>รายละเอียด</q-tooltip>
                     {{
-                      `${props.row.prefix ? props.row.prefix : ""}${
-                        props.row.firstName
-                      } ${props.row.lastName}`
+                      `${
+                        props.row.rank
+                          ? props.row.rank
+                          : props.row.prefix
+                          ? props.row.prefix
+                          : ""
+                      }${props.row.firstName} ${props.row.lastName}`
                     }}
                     <q-icon name="mdi-open-in-new" size="xs"></q-icon>
                   </div>
diff --git a/src/modules/04_registryPerson/interface/request/Main.ts b/src/modules/04_registryPerson/interface/request/Main.ts
index ecda33aae..0d25eb0b2 100644
--- a/src/modules/04_registryPerson/interface/request/Main.ts
+++ b/src/modules/04_registryPerson/interface/request/Main.ts
@@ -3,6 +3,7 @@ interface FormFilter {
   pageSize: number;
   keyword: string;
   type: string;
+  searchType?: string;
   posType: string;
   posLevel: string;
   retireYear: string | null;
diff --git a/src/modules/04_registryPerson/interface/response/Main.ts b/src/modules/04_registryPerson/interface/response/Main.ts
index 5735b5363..2a290a06a 100644
--- a/src/modules/04_registryPerson/interface/response/Main.ts
+++ b/src/modules/04_registryPerson/interface/response/Main.ts
@@ -22,6 +22,7 @@ interface DataPerson {
   posTypeId: string;
   position: string;
   prefix: string;
+  rank?: string;
 }
 
 export type { DataType, DataLevel, DataPerson };
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 867a7e72d..3b4a67fd0 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -64,6 +64,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     isAll: true,
     nodeId: null,
     node: null,
+    searchType: "fullName",
   });
 
   const labelOption = reactive({
diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue
index efeb09e1e..4e3f11c5f 100644
--- a/src/modules/04_registryPerson/views/list.vue
+++ b/src/modules/04_registryPerson/views/list.vue
@@ -34,7 +34,7 @@ const isShowFilter = ref<boolean>(true);
 const isShowBtnFilter = ref<boolean>(false);
 const empType = ref<string>("officer"); // officer / employee / perm
 
-const searchType = ref<string>("fullName");
+// const searchType = ref<string>("fullName");
 const node = ref<any>([]);
 const expanded = ref<any>([]);
 const maxPage = ref<number>(1);
@@ -117,7 +117,7 @@ function fetchDataPerson() {
 
   if (store.formFilter.keyword) {
     queryParams = Object.assign({}, queryParams, {
-      searchField: searchType.value,
+      searchField: store.formFilter.searchType,
       searchKeyword: store.formFilter.keyword,
     });
   }
@@ -264,9 +264,9 @@ async function selectType() {
       empType.value === "officer"
         ? "เลือกหน่วยงาน/ส่วนราชการ"
         : "เลือกหน่วยงาน";
+    store.formFilter.searchType = "fullName";
   } else {
     // แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้
-
     if (
       store.formFilter.keyword != "" ||
       store.labelOption.posType != "ทั้งหมด" ||
@@ -391,7 +391,7 @@ onMounted(async () => {
                   <q-select
                     borderless
                     bg-color="white"
-                    v-model="searchType"
+                    v-model="store.formFilter.searchType"
                     :options="store.searchTypeOption"
                     emit-value
                     dense
@@ -572,7 +572,7 @@ onMounted(async () => {
               inset
               vertical
               class="lineFil"
-              v-if="empType !== 'officer'"
+              v-if="empType !== 'officer' && store.formFilter.nodeId"
             />
 
             <q-toggle