diff --git a/src/modules/10_registry/02_Government/01_Government.vue b/src/modules/10_registry/02_Government/01_Government.vue
index a04d1dc..0f95ce8 100644
--- a/src/modules/10_registry/02_Government/01_Government.vue
+++ b/src/modules/10_registry/02_Government/01_Government.vue
@@ -75,105 +75,6 @@ const visibleColumnsHistory = ref<string[]>([
 ]);
 
 const columnsHistory = ref<QTableProps["columns"]>([
-  {
-    name: "oc",
-    align: "left",
-    label: "สังกัด",
-    sortable: true,
-    field: "oc",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionPathSide",
-    align: "left",
-    label: "ตำแหน่ง",
-    sortable: true,
-    field: "positionPathSide",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "position",
-    align: "left",
-    label: "ด้าน/สาขา",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "posNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionLine",
-    align: "left",
-    label: "สายงาน",
-    sortable: true,
-    field: "positionLine",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionType",
-    align: "left",
-    label: "ประเภท",
-    sortable: true,
-    field: "positionType",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionLevel",
-    align: "left",
-    label: "ระดับ",
-    sortable: true,
-    field: "positionLevel",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionExecutive",
-    align: "left",
-    label: "ตำแหน่งทางการบริหาร",
-    sortable: true,
-    field: "positionExecutive",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionExecutiveSide",
-    align: "left",
-    label: "ด้านทางการบริหาร",
-    sortable: true,
-    field: "positionExecutiveSide",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
   {
     name: "dateAppoint",
     align: "left",
@@ -198,51 +99,6 @@ const columnsHistory = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "retireDate",
-    align: "left",
-    label: "วันเกษียณอายุ",
-    sortable: true,
-    field: "retireDate",
-    format: (v) => date2Thai(v),
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "govAge",
-    align: "left",
-    label: "อายุราชการ",
-    sortable: true,
-    field: "govAge",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "govAgeAbsent",
-    align: "left",
-    label: "ขาดราชการ",
-    sortable: true,
-    field: "govAgeAbsent",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "govAgePlus",
-    align: "left",
-    label: "อายุราชการเกื้อกูล",
-    sortable: true,
-    field: "govAgePlus",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
   {
     name: "reasonSameDate",
     align: "left",
@@ -271,7 +127,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
     label: "วันที่แก้ไข",
     sortable: true,
     field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -279,6 +135,213 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
+/** ไม่เเน่ใจ ใช้เเบบไหน คอมเม้นไว้ก่อน */
+
+// const columnsHistory = ref<QTableProps["columns"]>([
+//   {
+//     name: "oc",
+//     align: "left",
+//     label: "สังกัด",
+//     sortable: true,
+//     field: "oc",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "positionPathSide",
+//     align: "left",
+//     label: "ตำแหน่ง",
+//     sortable: true,
+//     field: "positionPathSide",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "position",
+//     align: "left",
+//     label: "ด้าน/สาขา",
+//     sortable: true,
+//     field: "position",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "posNo",
+//     align: "left",
+//     label: "ตำแหน่งเลขที่",
+//     sortable: true,
+//     field: "posNo",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "positionLine",
+//     align: "left",
+//     label: "สายงาน",
+//     sortable: true,
+//     field: "positionLine",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "positionType",
+//     align: "left",
+//     label: "ประเภท",
+//     sortable: true,
+//     field: "positionType",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "positionLevel",
+//     align: "left",
+//     label: "ระดับ",
+//     sortable: true,
+//     field: "positionLevel",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "positionExecutive",
+//     align: "left",
+//     label: "ตำแหน่งทางการบริหาร",
+//     sortable: true,
+//     field: "positionExecutive",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "positionExecutiveSide",
+//     align: "left",
+//     label: "ด้านทางการบริหาร",
+//     sortable: true,
+//     field: "positionExecutiveSide",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "dateAppoint",
+//     align: "left",
+//     label: "วันที่บรรจุ",
+//     sortable: true,
+//     field: "dateAppoint",
+//     format: (v) => date2Thai(v),
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "dateStart",
+//     align: "left",
+//     label: "เริ่มปฎิบัติราชการ",
+//     sortable: true,
+//     field: "dateStart",
+//     format: (v) => date2Thai(v),
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "retireDate",
+//     align: "left",
+//     label: "วันเกษียณอายุ",
+//     sortable: true,
+//     field: "retireDate",
+//     format: (v) => date2Thai(v),
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "govAge",
+//     align: "left",
+//     label: "อายุราชการ",
+//     sortable: true,
+//     field: "govAge",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "govAgeAbsent",
+//     align: "left",
+//     label: "ขาดราชการ",
+//     sortable: true,
+//     field: "govAgeAbsent",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "govAgePlus",
+//     align: "left",
+//     label: "อายุราชการเกื้อกูล",
+//     sortable: true,
+//     field: "govAgePlus",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "reasonSameDate",
+//     align: "left",
+//     label: "เหตุผลกรณีไม่ตรงวัน",
+//     sortable: true,
+//     field: "reasonSameDate",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "lastUpdateFullName",
+//     align: "left",
+//     label: "ผู้ดำเนินการ",
+//     sortable: true,
+//     field: "lastUpdateFullName",
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+//   {
+//     name: "lastUpdatedAt",
+//     align: "left",
+//     label: "วันที่แก้ไข",
+//     sortable: true,
+//     field: "lastUpdatedAt",
+//     format: (v) => date2Thai(v),
+//     headerStyle: "font-size: 14px",
+//     style: "font-size: 14px",
+//     sort: (a: string, b: string) =>
+//       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+//   },
+// ]);
+
 function onHistory() {
   modalHistory.value = true;
 }