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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-09-25 13:57:30 +07:00
commit 342529d979
3 changed files with 206 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/18_command/components/Main/TableMain.vue
View file

@ -57,11 +57,11 @@ const columns = ref<QTableProps["columns"]>([
style: "font-size: 14px",
},
{
name: "commandExcecuteDate",
name: "commandAffectDate",
align: "left",
label: "วันที่ลงนาม",
sortable: false,
field: "commandExcecuteDate",
field: "commandAffectDate",
format(val) {
return val ? date2Thai(val) : "-";
},
@ -69,11 +69,11 @@ const columns = ref<QTableProps["columns"]>([
style: "font-size: 14px",
},
{
name: "commandAffectDate",
name: "commandExcecuteDate",
align: "left",
label: "วันที่คำสั่งมีผล",
sortable: false,
field: "commandAffectDate",
field: "commandExcecuteDate",
format(val) {
return val ? date2Thai(val) : "-";
},