diff --git a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue index 9202066c0..176b593bb 100644 --- a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue +++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue @@ -267,7 +267,9 @@ watch(
เวลาเข้างาน
-
{{ formData.checkInTime }}
+
+ {{ `${formData.checkInDate} ${formData.checkInTime} น.` }} +
สถานที่ทำงาน
@@ -337,7 +339,11 @@ watch(
เวลาออกงาน
-
{{ formData.checkOutTime }}
+
+ {{ + `${formData.checkOutDate} ${formData.checkOutTime} น.` + }} +
สถานที่ทำงาน
diff --git a/src/modules/09_leave/components/02_WorkList/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue index c33afe3c8..e4939c42f 100644 --- a/src/modules/09_leave/components/02_WorkList/Tab1.vue +++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue @@ -74,6 +74,9 @@ const columns = ref([ field: "checkInTime", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.checkInDate} ${val} น.`; + }, }, { name: "checkInLocation", @@ -101,6 +104,9 @@ const columns = ref([ field: "checkOutTime", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.checkOutDate} ${val} น.`; + }, }, { name: "checkOutLocation", diff --git a/src/modules/09_leave/components/02_WorkList/Tab2.vue b/src/modules/09_leave/components/02_WorkList/Tab2.vue index 6c6af46b8..9475328a6 100644 --- a/src/modules/09_leave/components/02_WorkList/Tab2.vue +++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue @@ -70,6 +70,9 @@ const columns = ref([ field: "checkInTime", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.checkInDate} ${val} น.`; + }, }, { name: "checkInLocation", @@ -88,6 +91,9 @@ const columns = ref([ field: "checkOutTime", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.checkOutDate} ${val} น.`; + }, }, { name: "checkOutLocation",