Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m25s

* develop:
  fix(retire): delete style width columns
  fix(leave):close sort status
This commit is contained in:
Warunee Tamkoo 2025-09-30 16:26:25 +07:00
commit 27ef434b22
2 changed files with 5 additions and 5 deletions

View file

@ -51,7 +51,7 @@ const columns = ref<QTableProps["columns"]>([
sortable: true,
field: "no",
headerStyle: "font-size: 14px",
style: "font-size: 14px; width:5%;",
style: "font-size: 14px;",
},
{
name: "placeLeave",
@ -60,7 +60,7 @@ const columns = ref<QTableProps["columns"]>([
sortable: true,
field: "placeLeave",
headerStyle: "font-size: 14px",
style: "font-size: 14px; width:15%;",
style: "font-size: 14px;",
},
{
name: "dateStartLeave",
@ -69,7 +69,7 @@ const columns = ref<QTableProps["columns"]>([
sortable: true,
field: "dateStartLeave",
headerStyle: "font-size: 14px",
style: "font-size: 14px; width:15%;",
style: "font-size: 14px; ",
},
{
name: "dateLeave",
@ -87,7 +87,7 @@ const columns = ref<QTableProps["columns"]>([
sortable: true,
field: "statustext",
headerStyle: "font-size: 14px",
style: "font-size: 14px; width:10%;",
style: "font-size: 14px;",
},
]);

View file

@ -245,7 +245,7 @@ export const useLeaveStore = defineStore("Leave", () => {
name: "status",
align: "left",
label: "สถานะ",
sortable: true,
sortable: false,
field: "status",
headerStyle: "font-size: 14px",
style: "font-size: 14px; width:10%;",