diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue index 263f9c8bc..0e3317d15 100644 --- a/src/modules/04_registry/components/Insignia.vue +++ b/src/modules/04_registry/components/Insignia.vue @@ -23,7 +23,7 @@ @click="selectData(props)" class="cursor-pointer" > -
{{ col.value == null ? null : date2Thai(col.value) }} -
-
+
--> +
{{ col.value + 543 }}
@@ -532,7 +532,7 @@ const checkValidate = ref(false); //validate data ผ่านหรื const profileId = ref( route.params.id ? route.params.id.toString() : "" ); -const rows = ref([]); +const rows = ref([]); const filter = ref(""); //search data table const visibleColumns = ref([]); profileData.insignia.columns.length == 0 @@ -550,6 +550,7 @@ profileData.insignia.columns.length == 0 "dateAnnounce", "refCommandNo", "refCommandDate", + "createdAt" ]) : (visibleColumns.value = profileData.insignia.columns); const columns = ref([ @@ -961,13 +962,13 @@ const fetchData = async () => { volume: e.volume, section: e.section, page: e.page, - receiveDate: new Date(e.receiveDate), - dateAnnounce: new Date(e.dateAnnounce), + receiveDate: date2Thai(e.receiveDate), + dateAnnounce: date2Thai(e.dateAnnounce), refCommandNo: e.refCommandNo, refCommandDate: - e.refCommandDate == null ? null : new Date(e.refCommandDate), + e.refCommandDate == null ? null : date2Thai(e.refCommandDate), createdFullName: e.createdFullName, - createdAt: new Date(e.createdAt), + createdAt: date2Thai(e.createdAt), }); }); }) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 90c712a87..ab566ea3e 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -1,5 +1,5 @@