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

Merge branch 'NiceDev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-05-13 11:58:58 +07:00
commit 2c43a3ac58
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/modules/10_registry/01_Information/05_Educations.vue
View file

@ -78,10 +78,14 @@ const columns = ref<QTableProps["columns"]>([
align: "left", align: "left",
label: "ตั้งแต่", label: "ตั้งแต่",
sortable: true, sortable: true,
field: "startDate",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
format: (v) => date2Thai(v), field: (v) =>
v.startDate
? v.isDate
? date2Thai(v.startDate)
: new Date(v.startDate).getFullYear() + 543
: "-",
sort: (a: string, b: string) => sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
}, },
@ -91,7 +95,11 @@ const columns = ref<QTableProps["columns"]>([
label: "ถึง", label: "ถึง",
sortable: true, sortable: true,
field: (v) => field: (v) =>
v.isDate ? date2Thai(v.endDate) : new Date(v.endDate).getFullYear() + 543, v.endDate
? v.isDate
? date2Thai(v.endDate)
: new Date(v.endDate).getFullYear() + 543
: "-",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
sort: (a: string, b: string) => sort: (a: string, b: string) =>
@ -291,9 +299,11 @@ const columnsHistory = ref<QTableProps["columns"]>([
label: "ตั้งแต่", label: "ตั้งแต่",
sortable: true, sortable: true,
field: (v) => field: (v) =>
v.isDate v.startDate
? date2Thai(v.startDate) ? v.isDate
: new Date(v.startDate).getFullYear() + 543, ? date2Thai(v.startDate)
: new Date(v.startDate).getFullYear() + 543
: "-",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
sort: (a: string, b: string) => sort: (a: string, b: string) =>
@ -305,7 +315,11 @@ const columnsHistory = ref<QTableProps["columns"]>([
label: "ถึง", label: "ถึง",
sortable: true, sortable: true,
field: (v) => field: (v) =>
v.isDate ? date2Thai(v.endDate) : new Date(v.endDate).getFullYear() + 543, v.endDate
? v.isDate
? date2Thai(v.endDate)
: new Date(v.endDate).getFullYear() + 543
: "-",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
sort: (a: string, b: string) => sort: (a: string, b: string) =>