hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
* 'develop' of github.com:Frappet/hrms-mgt:
  refactor(worklist): formatDate colunm checkInTime  checkOutTime
This commit is contained in:
Warunee Tamkoo 2026-04-24 16:25:36 +07:00
commit 83b6d723ba
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/09_leave/components/02_WorkList/DialogDetail.vue
View file

@ -267,7 +267,9 @@ watch(
<div class="q-pa-md q-gutter-md">
<div class="row">
<div class="col text-grey-8">เวลาเข้างาน</div>
<div class="col">{{ formData.checkInTime }}</div>
<div class="col">
{{ `${formData.checkInDate} ${formData.checkInTime} น.` }}
</div>
</div>
<div class="row">
<div class="col text-grey-8">สถานที่ทำงาน</div>
@ -337,7 +339,11 @@ watch(
<div class="q-pa-md q-gutter-md">
<div class="row">
<div class="col text-grey-8">เวลาออกงาน</div>
<div class="col">{{ formData.checkOutTime }}</div>
<div class="col">
{{
`${formData.checkOutDate} ${formData.checkOutTime} น.`
}}
</div>
</div>
<div class="row">
<div class="col text-grey-8">สถานที่ทำงาน</div>

6
src/modules/09_leave/components/02_WorkList/Tab1.vue
View file

@ -74,6 +74,9 @@ const columns = ref<QTableProps["columns"]>([
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<QTableProps["columns"]>([
field: "checkOutTime",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.checkOutDate} ${val} น.`;
},
},
{
name: "checkOutLocation",

6
src/modules/09_leave/components/02_WorkList/Tab2.vue
View file

@ -70,6 +70,9 @@ const columns = ref<QTableProps["columns"]>([
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<QTableProps["columns"]>([
field: "checkOutTime",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.checkOutDate} ${val} น.`;
},
},
{
name: "checkOutLocation",