diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue index 371a1ac17..a98088d4f 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue +++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue @@ -45,6 +45,8 @@ const visibleColumns = ref([ "date", "createdFullName", "createdAt", + "lastUpdateFullName", + "lastUpdatedAt", ]); const columns = ref([ { @@ -116,22 +118,22 @@ const columns = ref([ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "createdFullName", + name: "lastUpdateFullName", align: "left", label: "ผู้ดำเนินการ", sortable: true, - field: "createdFullName", + field: "lastUpdateFullName", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "createdAt", + name: "lastUpdatedAt", align: "left", label: "วันที่แก้ไข", sortable: true, - field: "createdAt", + field: "lastUpdatedAt", format: (v) => date2Thai(v), headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -149,6 +151,7 @@ function getHistory() { rows.value = []; data.map((e: RequestItemsObject) => { rows.value.push({ + ...e, id: e.id, level: e.level, detail: e.detail, @@ -156,9 +159,6 @@ function getHistory() { refCommandNo: e.refCommandNo, refCommandDate: e.refCommandDate == null ? null : new Date(e.refCommandDate), - date: new Date(e.date), - createdFullName: e.createdFullName, - createdAt: new Date(e.createdAt), }); }); })