Merge branch 'develop' of github.com:Frappet/hrms-checkin into develop

* 'develop' of github.com:Frappet/hrms-checkin:
  refactor(history): formatDate Colunm checkInTime  checkOutTime

src/components/TableHistory.vue

@@ -62,15 +62,15 @@ const selected = ref<string[]>([])
 const columns = ref<QTableProps['columns']>(
   props.tab == 'history'
     ? [
-        {
+        // {
-          name: 'checkInDate',
+        //   name: 'checkInDate',
-          align: 'left',
+        //   align: 'left',
-          label: 'วัน/เดือน/ปี',
+        //   label: 'วัน/เดือน/ปี',
-          sortable: true,
+        //   sortable: true,
-          field: 'checkInDate',
+        //   field: 'checkInDate',
-          headerStyle: 'font-size: 14px',
+        //   headerStyle: 'font-size: 14px',
-          style: 'font-size: 14px; width:15%;',
+        //   style: 'font-size: 14px; width:15%;',
-        },
+        // },
         {
           name: 'checkInTime',
           align: 'left',
@@ -79,6 +79,9 @@ const columns = ref<QTableProps['columns']>(
           field: 'checkInTime',
           headerStyle: 'font-size: 14px',
           style: 'font-size: 14px; width:15%;',
+          format: (val: string, row: DataCheckIn) => {
+            return `${row.checkInDate} ${val} น.`
+          },
         },
         {
           name: 'checkInLocation',
@@ -107,7 +110,9 @@ const columns = ref<QTableProps['columns']>(
           headerStyle: 'font-size: 14px',
           style: 'font-size: 14px; width:15%;',
           format: (val: string, row: DataCheckIn) => {
-            return row.checkOutStatus != '-' && val ? val : '-'
+            return row.checkOutStatus != '-' && val
+              ? `${row.checkOutDate} ${val} น.`
+              : '-'
           },
         },
         {
@@ -182,7 +187,6 @@ const columns = ref<QTableProps['columns']>(
 )
 const visibleColumns = ref<string[]>([
   'checkInDateTime',
-  'checkInDate',
   'checkInTime',
   'checkInLocation',
   'checkInStatus',

src/interface/index/Main.ts

@@ -38,6 +38,7 @@ interface DataCheckIn {
   checkInLocation: string
   checkInStatus: string
   checkInTime: string
+  checkOutDate: string
   checkOutLocation: string
   checkOutStatus: string
   checkOutTime: string

src/stores/checkin.ts

@@ -33,6 +33,7 @@ export const useCheckIn = defineStore('checkin', () => {
       editStatus: e.editStatus != '' ? convertEditStatus(e.editStatus) : '',
       editReason: e.editReason,
       isEdit: e.isEdit,
+      checkOutDate: e.checkOutDate ? date2Thai(e.checkOutDate) : null,
     }))
     rows.value = dataList
   }