diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue index 435c123..2fb6e5d 100644 --- a/src/modules/10_registry/01_Information/05_Educations.vue +++ b/src/modules/10_registry/01_Information/05_Educations.vue @@ -78,10 +78,14 @@ const columns = ref([ align: "left", label: "ตั้งแต่", sortable: true, - field: "startDate", headerStyle: "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) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, @@ -91,7 +95,11 @@ const columns = ref([ label: "ถึง", sortable: true, 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", style: "font-size: 14px", sort: (a: string, b: string) => @@ -291,9 +299,11 @@ const columnsHistory = ref([ label: "ตั้งแต่", sortable: true, field: (v) => - v.isDate - ? date2Thai(v.startDate) - : new Date(v.startDate).getFullYear() + 543, + v.startDate + ? v.isDate + ? date2Thai(v.startDate) + : new Date(v.startDate).getFullYear() + 543 + : "-", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -305,7 +315,11 @@ const columnsHistory = ref([ label: "ถึง", sortable: true, 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", style: "font-size: 14px", sort: (a: string, b: string) =>