From dccc41ac475160ea2659e3094e5f1434eda59455 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Mon, 25 Mar 2024 07:54:38 +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=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=94=E0=B9=89=E0=B8=A7=E0=B8=A2=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD,=20=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=8A,=20=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87;=20=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=95=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryNew/components/TableView.vue   |  4 +-
 src/modules/04_registryNew/views/list.vue     | 66 ++++++++++++-------
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue
index 72eae6878..902a31381 100644
--- a/src/modules/04_registryNew/components/TableView.vue
+++ b/src/modules/04_registryNew/components/TableView.vue
@@ -74,7 +74,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "สายงาน",
     sortable: true,
-    field: (v) => v.posType.posTypeName,
+    field: (v) => (v.posType ? v.posType.posTypeName : "-"),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -85,7 +85,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ระดับชั้นงาน",
     sortable: true,
-    field: (v) => v.posLevel.posLevelName,
+    field: (v) => (v.posLevel ? v.posLevel.posLevelName : "-"),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue
index aa385d8d9..20d9f8f98 100644
--- a/src/modules/04_registryNew/views/list.vue
+++ b/src/modules/04_registryNew/views/list.vue
@@ -109,13 +109,23 @@ function fetchYearOption() {
   }
 }
 
-function fetchDataPerson() {
+async function fetchDataPerson(search: boolean = false) {
   showLoader();
+
+  let queryParams = {
+    page: formFilter.page,
+    pageSize: formFilter.pageSize,
+  };
+
+  if (search) {
+    queryParams = Object.assign({}, queryParams, {
+      searchField: searchType.value,
+      searchKeyword: formFilter.keyword,
+    });
+  }
+
   http
-    .get(
-      config.API.registryNew +
-        `?page=${formFilter.page}&pageSize=${formFilter.pageSize}&keyword=${formFilter.keyword}`
-    )
+    .get(config.API.registryNew, { params: queryParams })
     .then((res) => {
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
       dataPersonMain.value = res.data.result.data;
@@ -149,7 +159,7 @@ function onclickSearch() {
     fetchYearOption();
   }
   formFilter.keyword = formFilter.keyword === null ? "" : formFilter.keyword;
-  fetchDataPerson();
+  fetchDataPerson(true);
 }
 
 function selectType(item: DataOption) {
@@ -194,9 +204,13 @@ onMounted(async () => {
 
   <q-card class="q-mt-md">
     <q-card-section class="card-img q-pb-lg">
-      <div class="text-h5 text-center q-py-md text-weight-medium">ค้นหาข้อมูลทะเบียนประวัติ</div>
+      <div class="text-h5 text-center q-py-md text-weight-medium">
+        ค้นหาข้อมูลทะเบียนประวัติ
+      </div>
       <div class="row justify-center">
-        <div class="col-xs-12 col-sm-12 col-md-11 q-pa-md bg-Search rounded-borders">
+        <div
+          class="col-xs-12 col-sm-12 col-md-11 q-pa-md bg-Search rounded-borders"
+        >
           <q-form @submit="onclickSearch">
             <div class="bg-white row col-12 q-pa-none rounded-borders">
               <div class="row col-11">
@@ -212,10 +226,9 @@ onMounted(async () => {
                     option-label="name"
                     option-value="id"
                     map-options
-                    class="selectS col-11 q-px-md "
+                    class="selectS col-11 q-px-md"
                     color="deep-orange"
                     dropdown-icon="mdi-chevron-down"
-                    
                   />
                   <q-separator vertical />
                 </div>
@@ -234,12 +247,18 @@ onMounted(async () => {
                 </q-input>
               </div>
               <div class="row col-1">
-                <q-btn class="fit btnSearch" unelevated color="deep-orange" label="ค้นหา" type="submit" />
+                <q-btn
+                  class="fit btnSearch"
+                  unelevated
+                  color="deep-orange"
+                  label="ค้นหา"
+                  type="submit"
+                />
               </div>
             </div>
           </q-form>
           <div v-if="isShowBtnFilter" class="col-12 row q-mt-sm">
-            <q-space/>
+            <q-space />
             <q-btn
               flat
               label="ตัวเลือกเพิ่มเติม"
@@ -299,8 +318,7 @@ onMounted(async () => {
               label-color="white"
               dropdown-icon="mdi-chevron-down"
               class="q-px-sm"
-              
-            ><!-- class="custom-btn" -->
+              ><!-- class="custom-btn" -->
               <template v-slot:label>
                 {{
                   labelOption.posType !== "ทั้งหมด"
@@ -341,7 +359,7 @@ onMounted(async () => {
               label-color="white"
               dropdown-icon="mdi-chevron-down"
               class="q-px-sm"
-            ><!-- class="custom-btn" -->
+              ><!-- class="custom-btn" -->
               <template v-slot:label>
                 {{
                   labelOption.posLevel !== "ทั้งหมด"
@@ -382,7 +400,7 @@ onMounted(async () => {
               label-color="white"
               dropdown-icon="mdi-chevron-down"
               class="q-px-sm"
-            ><!-- class="custom-btn" -->
+              ><!-- class="custom-btn" -->
               <template v-slot:label>
                 {{ `ปีเกษียณ${labelOption.retireYear}` }}
                 <q-btn
@@ -464,7 +482,7 @@ onMounted(async () => {
               label-color="white"
               dropdown-icon="mdi-chevron-down"
               class="q-px-sm"
-            ><!-- class="custom-btn" -->
+              ><!-- class="custom-btn" -->
               <template v-slot:label>
                 {{
                   `อายุราชการ (${formFilter.rangeYear.min} - ${formFilter.rangeYear.max} ปี)`
@@ -520,7 +538,7 @@ onMounted(async () => {
               dropdown-icon="mdi-chevron-down"
               :label="`เงื่อนไขอื่นๆ  ${conditionTotal}`"
               class="q-px-sm"
-            ><!-- class="custom-btn" -->
+              ><!-- class="custom-btn" -->
               <q-list>
                 <q-item clickable v-close-popup>
                   <q-item-section>
@@ -562,7 +580,7 @@ onMounted(async () => {
   </q-card>
 </template>
 
-<style >
+<style>
 .card-img {
   background: url("@/assets/registry-banner.png");
   background-size: cover;
@@ -581,19 +599,19 @@ onMounted(async () => {
   background-color: #36969f;
 }
 
-.btnSearch{
+.btnSearch {
   border-radius: 0px 4px 4px 0px;
 }
-.bg-Search{
+.bg-Search {
   background: #00000015;
 }
-.lineFil{
-  transform:rotate(30deg);
+.lineFil {
+  transform: rotate(30deg);
   height: 20px;
   margin-top: 15px;
   background: #ffffff7b !important;
 }
-.selectS .q-field__control .q-field__append .q-icon{
+.selectS .q-field__control .q-field__append .q-icon {
   color: #ff5722 !important;
 }
 </style>