From b0b97b89dba1417f9fc9f4b855ce5678625c7c8b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Dec 2024 14:25:57 +0700
Subject: [PATCH] fix format colums table

---
 .../components/02_resign/Table.vue            | 14 ++++++++----
 .../components/03_resignEmp/Table.vue         | 13 ++++++++---
 .../08_registryEmployee/views/Main.vue        | 10 +++++++--
 .../13_salary/components/InfoLeave.vue        | 22 ++++++++++++++-----
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue
index 7441de979..ec911e81d 100644
--- a/src/modules/06_retirement/components/02_resign/Table.vue
+++ b/src/modules/06_retirement/components/02_resign/Table.vue
@@ -23,7 +23,8 @@ const stroeResign = useDataStore();
 const { statusText } = stroe;
 const router = useRouter();
 const mixin = useCounterMixin();
-const { messageError, date2Thai, showLoader, hideLoader,onSearchDataTable } = mixin;
+const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
+  mixin;
 
 /** Table */
 const rows = ref<ResponseItems[]>([]);
@@ -45,7 +46,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ชื่อ-นามสกุล",
     sortable: true,
-    field: (row) => `${row.prefix}${row.firstName} ${row.lastName}`,
+    field: `fullname`,
+    format(val, row) {
+      return `${row.prefix}${row.firstName} ${row.lastName}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -101,7 +105,6 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วันที่ยื่น",
     sortable: true,
-    // field: (row) => date2Thai(new Date(row.createdAt)),
     field: "createdAt",
     format(val, row) {
       return date2Thai(new Date(val));
@@ -115,7 +118,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "สถานะ",
     sortable: true,
-    field: (row) => statusText(row.status),
+    field: "status",
+    format(val, row) {
+      return statusText(row.status);
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue
index 0272b4c64..5a3e7f973 100644
--- a/src/modules/06_retirement/components/03_resignEmp/Table.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue
@@ -23,7 +23,8 @@ const stroeResign = useDataStore();
 const { statusText } = stroe;
 const router = useRouter();
 const mixin = useCounterMixin();
-const { messageError, date2Thai, showLoader, hideLoader,onSearchDataTable } = mixin;
+const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
+  mixin;
 
 /** Table */
 const rows = ref<ResponseItems[]>([]);
@@ -45,7 +46,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ชื่อ-นามสกุล",
     sortable: true,
-    field: (row) => `${row.prefix}${row.firstName} ${row.lastName}`,
+    field: "fullname",
+    format(val, row) {
+      return `${row.prefix}${row.firstName} ${row.lastName}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -114,7 +118,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "สถานะ",
     sortable: true,
-    field: (row) => statusText(row.status),
+    field: "status",
+    format(val, row) {
+      return statusText(row.status);
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 50d5ca07e..e320a6c5d 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -81,7 +81,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ชื่อ-นามสกุล",
     sortable: true,
-    field: (row) => `${row.prefix}${row.firstName}  ${row.lastName}`,
+    field: "fullname",
+    format(val, row) {
+      return `${row.prefix}${row.firstName}  ${row.lastName}`;
+    },
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
   },
@@ -175,7 +178,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "สถานะ",
     sortable: true,
-    field: (row) => statusText(row.draftOrgEmployeeStatus),
+    field: "statustext",
+    format(val, row) {
+      return statusText(row.draftOrgEmployeeStatus);
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
diff --git a/src/modules/13_salary/components/InfoLeave.vue b/src/modules/13_salary/components/InfoLeave.vue
index ab3cfce15..ebdcb4c19 100644
--- a/src/modules/13_salary/components/InfoLeave.vue
+++ b/src/modules/13_salary/components/InfoLeave.vue
@@ -38,7 +38,6 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ลำดับ",
     sortable: false,
-
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     field: (row) => rows.value.indexOf(row) + 1,
@@ -48,20 +47,24 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ประเภทการลา",
     sortable: true,
-
+    field: "leaveType",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    field: (row) => row.leaveType.name,
+    format(val, row) {
+      return row.leaveType.name;
+    },
   },
   {
     name: "dateLeave",
     align: "left",
     label: "วัน เดือน ปี ที่ลา",
     sortable: true,
-
+    field: "dateLeave",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    field: (row) => dateThaiRange([row.dateLeaveStart, row.dateLeaveEnd]),
+    format(val, row) {
+      return dateThaiRange([row.dateLeaveStart, row.dateLeaveEnd]);
+    },
   },
   {
     name: "leaveDays",
@@ -165,7 +168,14 @@ onMounted(() => {
   <q-card-section class="q-pt-none">
     <div class="row items-center q-gutter-x-sm q-pb-sm">
       <q-space />
-      <q-input dense outlined v-model="keyword" label="ค้นหา" class="q-mr-sm" @keydown.enter="onSearch">
+      <q-input
+        dense
+        outlined
+        v-model="keyword"
+        label="ค้นหา"
+        class="q-mr-sm"
+        @keydown.enter="onSearch"
+      >
         <template v-slot:append>
           <q-icon name="search" />
         </template>