From f698d036ab5a5258d82bdeee23d3831cb9181bbc Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 16 Aug 2023 22:08:59 +0700
Subject: [PATCH] =?UTF-8?q?-=20=E0=B8=8B=E0=B9=88=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=B2=E0=B8=A3=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=83=E0=B8=99=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=87=20-=20=E0=B8=8B=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9B=E0=B8=B4=E0=B8=94=20error=20=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=20inbox=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20noti?=
 =?UTF-8?q?=20-=20fix=20bug=20=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B8=E0=B9=83=E0=B8=99=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=20filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/AppointMent/Main.vue     |  8 ++++----
 src/modules/05_placement/components/Main.vue         |  6 +++++-
 .../components/PersonalList/TableDetail.vue          | 12 ++++++------
 .../05_placement/components/Receive/receiveMain.vue  |  4 ++--
 src/views/Dashboard.vue                              |  2 +-
 src/views/MainLayout.vue                             |  2 +-
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue
index 2aa65f1e8..3104f9c59 100644
--- a/src/modules/05_placement/components/AppointMent/Main.vue
+++ b/src/modules/05_placement/components/AppointMent/Main.vue
@@ -91,7 +91,7 @@ const fecthlistappointment = async () => {
       rows.value = response.map((e: any) => ({
         personalId: e.id,
         citizenId: e.citizenId,
-        fullname: e.firstname + "  " + e.lastname,
+        fullname: e.prefix+e.firstname + "  " + e.lastname,
         organizationName:
           e.organizationName +
           " " +
@@ -105,7 +105,7 @@ const fecthlistappointment = async () => {
         positionNumber: e.positionNumber,
         positionPath: e.positionPath,
         status: status(e.status),
-        birthday: date2Thai(e.dateOfBirth),
+        birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth),
       }));
       // console.log(rows.value);
       rows2.value = rows.value.filter((e: any) => e.orgName !== null);
@@ -172,7 +172,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "เลขประจำตัวประชาชน",
     sortable: true,
-    field: "fullname",
+    field: "citizenId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -230,7 +230,7 @@ const columns2 = ref<QTableProps["columns"]>([
     align: "left",
     label: "เลขประจำตัวประชาชน",
     sortable: true,
-    field: "fullname",
+    field: "citizenId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 14eb38d5a..374cf980c 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -160,6 +160,10 @@ const fetchPlacementData = async (val: number) => {
       console.log(e);
     })
     .finally(() => {
+      filterKeyword.value = "";
+      examTime.value = "all"
+      examType.value = "all"
+      expiredAccount.value = false
       hideLoader();
     });
 };
@@ -183,7 +187,7 @@ const fetchYearOptions = async () => {
     });
 };
 const filterYear = () => {
-  console.log("searchYear", searchYear.value);
+  // console.log("searchYear", searchYear.value);
   fetchPlacementData(searchYear.value);
 };
 
diff --git a/src/modules/05_placement/components/PersonalList/TableDetail.vue b/src/modules/05_placement/components/PersonalList/TableDetail.vue
index cdbea6068..c4942705d 100644
--- a/src/modules/05_placement/components/PersonalList/TableDetail.vue
+++ b/src/modules/05_placement/components/PersonalList/TableDetail.vue
@@ -334,19 +334,19 @@ const putpersonalForm = async () => {
             </q-card>
           </div>
 
-          <div class="contanier-box-mini">
-            <q-card bordered class="card-panding">
+          <!-- <div class="contanier-box-mini"> -->
+            <!-- <q-card bordered class="card-panding">
               <div class="col-12 row items-center q-pa-sm header-text">
                 เอกสารเพิ่มเติม
-              </div>
+              </div> -->
               <!-- <div v-for="(item, index) of personalForm.isProperty" :key="index" class="q-pa-sm">
                 <q-checkbox size="xs" v-model="item.value" :val="item.value" :label="item.name" keep-color color="teal"
                   :rules="[isRequired]" class="checkbox-group" />
                 <q-separator />
               </div> -->
-            </q-card>
-          </div>
-        </div>
+            <!-- </q-card>
+          </div> -->
+        </div> 
         <!-- <q-separator />
         <div>
           <DialogFooter
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index 7843f42d5..2426e9d37 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -150,7 +150,7 @@ const columns2 = ref<QTableProps["columns"]>([
     align: "left",
     label: "เลขประจำตัวประชาชน",
     sortable: true,
-    field: "fullname",
+    field: "citizenId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -202,7 +202,7 @@ const fecthlistRecevice = async () => {
         list.push({
           personalId: e.id ?? "",
           citizenId: e.citizenId ?? "-",
-          fullname: e.firstname + "  " + e.lastname,
+          fullname: e.prefix+e.firstname + "  " + e.lastname,
           organizationName:
             e.organizationName +
             " " +
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index bd94f5884..9668dfe25 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -103,7 +103,7 @@ const getData = async () => {
       inboxList.value = list;
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     })
     .finally(() => {
       hideLoader();
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 056b56a06..73622e73e 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -101,7 +101,7 @@ const getDataNotification = async () => {
       notiList.value = list;
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     })
     .finally(() => {
       hideLoader();