แก้ไขการแสดงผลประวัติการลงเวลา

src/stores/chekin.ts

@@ -16,23 +16,16 @@ export const useChekIn = defineStore('checkin', () => {
     // console.log(data)
     rows.value = []
     const datalist = await data.map((e: any) => ({
-      id: e.checkInId,
-      date: date2Thai(e.checkInDate),
-      no: e.no,
-      in: e.checkInTime,
-      out: e.checkOutTime,
-      Morningstatus: convertStatus(e.checkInStatus),
-      AfternoonStatus: convertStatus(e.checkOutStatus),
-      loIn: e.checkInLocation,
-      loOut: e.checkOutLocation,
-      status: e.statusEdit,
+      checkInId: e.checkInId,
+      checkInDate: date2Thai(e.checkInDate),
+      checkInTime: e.checkInTime,
+      checkOutTime: e.checkOutTime != '' ? e.checkOutTime : '-',
+      checkInStatus: convertStatus(e.checkInStatus),
+      checkOutStatus:
+        e.checkOutStatus != null ? convertStatus(e.checkOutStatus) : '-',
+      checkInLocation: e.checkInLocation,
+      checkOutLocation: e.checkOutLocation != '' ? e.checkOutLocation : '-',
       // statusEditName: convertStatusEdit(e.statusEdit),
-      // checkInTime: e.checkInTime,
-      // checkInLocation: e.checkInLocation,
-      // checkOutTime: e.checkOutTime,
-      // checkOutLocation: e.checkOutLocation,
-      // checkInStatus: convertStatus(e.checkInStatus),
-      // checkOutStatus: convertStatus(e.checkOutStatus),
     }))
     rows.value = datalist
   }
@@ -65,6 +58,8 @@ export const useChekIn = defineStore('checkin', () => {
         return 'orange'
       case 'approve':
         return 'green'
+      case 'reject':
+        return 'red'
     }
   }