- ซ่อนเอกสารเพิ่มเติมในส่วนของ

- ซ่อนปิด error ของ inbox และ noti
- fix bug บรรจุในส่วน filter

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",
   },

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);
 };
 

src/modules/05_placement/components/PersonalList/TableDetail.vue

@@ -334,19 +334,19 @@ const putpersonalForm = async () => {
             </q-card>
           </div>
 
-          <div class="contanier-box-mini">
+          <!-- <div class="contanier-box-mini"> -->
-            <q-card bordered class="card-panding">
+            <!-- <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>
+            <!-- </q-card>
-          </div>
+          </div> -->
-        </div>
+        </div> 
         <!-- <q-separator />
         <div>
           <DialogFooter

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 +
             " " +

src/views/Dashboard.vue

@@ -103,7 +103,7 @@ const getData = async () => {
       inboxList.value = list;
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     })
     .finally(() => {
       hideLoader();

src/views/MainLayout.vue

@@ -101,7 +101,7 @@ const getDataNotification = async () => {
       notiList.value = list;
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     })
     .finally(() => {
       hideLoader();