diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index df5d4f024..53bdcecf0 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -43,13 +43,13 @@ interface optionType {
 }
 
 const menuList = readonly<any[]>([
-  {
-    key: 1,
-    icon: "mdi-home-variant-outline",
-    label: "หน้าแรก",
-    path: "dashboard",
-    role: "dashboard",
-  },
+  // {
+  //   key: 1,
+  //   icon: "mdi-home-variant-outline",
+  //   label: "หน้าแรก",
+  //   path: "dashboard",
+  //   role: "dashboard",
+  // },
   // {
   //   key: 2,
   //   icon: "o_person",
@@ -84,529 +84,529 @@ const menuList = readonly<any[]>([
   //     },
   //   ],
   // },
-  {
-    key: 2,
-    icon: "o_person",
-    label: "ข้อมูลการประเมิน",
-    path: "metadataNew",
-    role: "evaluateKPI",
-    children: [
-      {
-        key: 2.1,
-        label: "ตัวชี้วัด",
-        role: "evaluateKPI",
-        children: [
-          {
-            label: "ตามแผน",
-            path: "KPIIndicatorByPlan",
-            role: "evaluateKPI",
-          },
-          {
-            label: "ตามตำแหน่ง",
-            path: "KPIIndicatorByRole",
-            role: "evaluateKPI",
-          },
-          {
-            label: "งานที่ได้รับมอบหมาย",
-            path: "KPIAssignment",
-            role: "evaluateKPI",
-          },
-        ],
-      },
-      {
-        key: 2.0,
-        label: "สมรรถนะ",
-        path: "KPICompetency",
-        role: "evaluateKPI",
-      },
-      {
-        key: 2.0,
-        label: "ยุทธศาสตร์",
-        path: "strategic",
-        role: "development",
-      },
-    ],
-  },
-  {
-    key: 3,
-    icon: "o_groups",
-    label: "โครงสร้างอัตรากำลัง",
-    path: "organizationalNew",
-    role: "organization",
-  },
-  {
-    key: 3,
-    icon: "mdi-account-convert",
-    label: "รักษาการในตำแหน่ง",
-    path: "acting",
-    role: "organization",
-  },
-  {
-    key: 3,
-    icon: "o_groups",
-    label: "อัตรากำลังลูกจ้างประจำฯ",
-    path: "positionEmployee",
-    role: "positionEmployee",
-  },
-  {
-    key: 4,
-    icon: "o_contact_page",
-    label: "ทะเบียนประวัติ",
-    path: "registryNew",
-    role: "registry",
-  },
-  {
-    key: 4,
-    icon: "o_contact_page",
-    label: "ทะเบียนประวัติลูกจ้าง",
-    path: "registry-employee",
-    role: "registryEmployee",
-  },
-  {
-    key: 6,
-    icon: "mdi-file-certificate-outline",
-    label: "ออกคำสั่ง",
-    path: "order",
-    role: "order",
-  },
-  {
-    key: 7,
-    icon: "o_search",
-    label: "สรรหา",
-    path: "recruiting",
-    role: "recruit",
-    children: [
-      {
-        label: "ตั้งค่าเว็บสรรหา",
-        path: "editorweb",
-        key: 7.1,
-        role: "recruit",
-      },
-      {
-        label: "สอบแข่งขัน",
-        path: "",
-        key: 7.2,
-        role: "recruit",
-        children: [
-          {
-            label: "จัดการรอบสอบแข่งขัน" /* แข่งขัน */,
-            path: "competePeriod",
-            role: "recruit",
-          },
-          {
-            label: "สถิติสมัครสอบแข่งขัน" /* แข่งขัน */,
-            path: "competePeriodStat",
-            role: "recruit",
-          },
-        ],
-      },
-      {
-        label: "คัดเลือก",
-        path: "",
-        key: 7.3,
-        role: "recruit",
-        children: [
-          {
-            label: "จัดการรอบคัดเลือก",
-            path: "qualifyPeriod",
-            role: "recruit",
-          },
-          {
-            label: "จัดการรอบคัดเลือกคนพิการ",
-            path: "disablePeriod",
-            role: "recruit",
-          },
-          {
-            label: "จัดการรายชื่อคัดเลือก",
-            path: "manage",
-            role: "recruit",
-          },
-          {
-            label: "สถิติสมัครคัดเลือก",
-            path: "qualifyPeriodStat",
-            role: "recruit",
-          },
-          {
-            label: "สถิติสมัครคัดเลือกคนพิการ",
-            path: "qualifyPeriodStatDisable",
-            role: "recruit",
-          },
-        ],
-      },
-    ],
-  },
-  {
-    key: 8,
-    path: "placement",
-    icon: "how_to_reg",
-    label: "บรรจุ แต่งตั้ง ย้าย โอน",
-    role: "placement",
-    children: [
-      {
-        label: "รายชื่อผู้สอบผ่าน",
-        path: "placement",
-        role: "placement",
-      },
-      // {
-      //   label: "การทดลองปฏิบัติหน้าที่ราชการ",
-      //   path: "probation",
-      //   role: "probation",
-      // },
-      {
-        label: "รายการขอโอน",
-        path: "transfer",
-        role: "placement",
-      },
-      {
-        label: "รายการรับโอน",
-        path: "receive",
-        role: "placement",
-      },
-      {
-        label: "รายการช่วยราชการ",
-        path: "help-government",
-        role: "placement",
-      },
-      {
-        label: "รายการส่งตัวกลับ",
-        path: "repatriate",
-        role: "placement",
-      },
-      {
-        label: "รายการแต่งตั้ง-เลื่อน-ย้าย",
-        path: "appoint-promote",
-        role: "placement",
-      },
-      {
-        label: "ปรับระดับชั้นงาน-ย้ายลูกจ้าง",
-        path: "appoint-employee",
-        role: "placement",
-      },
-      // {
-      //   label: "ออกคำสั่งย้ายสับเปลี่ยนตำแหน่ง",
-      //   path: "changePositions",
-      //   role: "placement",
-      // },
-      {
-        label: "รายการอื่นๆ",
-        path: "other",
-        role: "placement",
-      },
-    ],
-  },
-  {
-    key: 81,
-    icon: "badge",
-    label: "ทดลองปฏิบัติหน้าที่ราชการ",
-    path: "probation",
-    role: "probation",
-  },
-  {
-    key: 9,
-    icon: "mdi-account-cancel-outline",
-    label: "พ้นจากราชการ",
-    path: "retirement",
-    role: "retirement",
-    children: [
-      {
-        label: "ประกาศเกษียณ",
-        path: "retirement",
-        role: "retirement",
-      },
-      {
-        label: "รายการลาออก",
-        path: "resign",
-        role: "retirement",
-      },
-      {
-        label: "Exit interview",
-        path: "exit-Interview",
-        role: "retirement",
-      },
-      {
-        label: "รายการบันทึกการถึงแก่กรรม",
-        path: "deceased",
-        role: "retirement",
-      },
-      {
-        label: "รายการให้ออก",
-        path: "dismiss-order",
-        role: "retirement",
-      },
-    ],
-  },
-  {
-    key: 10,
-    icon: "mdi-medal-outline",
-    label: "เครื่องราชฯ",
-    path: "insignia",
-    role: "insignia",
-    children: [
-      {
-        label: "รอบการเสนอขอ",
-        path: "insigniaProposals",
-        role: "insignia",
-      },
-      {
-        label: "จัดการคำขอ",
-        path: "insigniaManage",
-        role: "insignia",
-      },
-      {
-        label: "บันทึกผลการเสนอขอ",
-        path: "insigniaRecord",
-        role: "insignia",
-      },
-      {
-        label: "จัดสรรเครื่องราชฯ",
-        path: "insigniaAllocate",
-        role: "insignia",
-      },
-      {
-        label: "ยืม-คืนเครื่องราชฯ",
-        path: "insigniaBorrow",
-        role: "insignia",
-      },
-      {
-        label: "รายงาน",
-        path: "insigniaReport",
-        role: "insignia",
-      },
-    ],
-  },
-  {
-    key: 11,
-    icon: "mdi-calendar",
-    label: "การลา",
-    path: "leave",
-    role: "leave",
-    children: [
-      {
-        label: "รอบการปฏิบัติงาน",
-        path: "roundTime",
-        role: "leave",
-      },
-      {
-        label: "แก้ไขรอบการปฎิบัติงานผู้ใช้งาน",
-        path: "changeRound",
-        role: "leave",
-      },
-      {
-        label: "รายการลงเวลาปฏิบัติงาน",
-        path: "workList",
-        role: "leave",
-      },
-      {
-        label: "ลงเวลากรณีพิเศษ",
-        path: "timestampSpecial",
-        role: "leave",
-      },
-      {
-        label: "รายการลา",
-        path: "leave",
-        role: "leave",
-      },
-      {
-        label: "รายงานสถิติการลา",
-        path: "leaveReport",
-        role: "leave",
-      },
-    ],
-  },
-  {
-    key: 12,
-    icon: "mdi-scale-balance",
-    label: "วินัย",
-    role: "discipline",
-    children: [
-      {
-        key: 12.0,
-        label: "เรื่องร้องเรียน",
-        path: "disciplineComplaints",
-        role: "discipline",
-      },
-      {
-        key: 12.0,
-        label: "สืบสวนข้อเท็จจริง",
-        path: "disciplineInvestigatefacts",
-        role: "discipline",
-      },
-      {
-        key: 12.0,
-        label: "สอบสวนความผิดทางวินัย",
-        path: "disciplineDisciplinary",
-        role: "discipline",
-      },
-      {
-        key: 12.0,
-        label: "สรุปผลการพิจารณาความผิดทางวินัย",
-        path: "disciplineResult",
-        role: "discipline",
-      },
-      {
-        key: 12.0,
-        label: "รายชื่อผู้ถูกพักราชการ",
-        path: "disciplineListSuspend",
-        role: "discipline",
-      },
-      {
-        key: 12.0,
-        label: "อุทธรณ์/ร้องทุกข์",
-        path: "appealComplain",
-        role: "discipline",
-      },
-      {
-        key: 12.0,
-        label: "ออกคำสั่งลงโทษทางวินัย",
-        path: "disciplineOrder",
-        role: "discipline",
-      },
-      {
-        label: "ข้อมูลพื้นฐาน",
-        path: "",
-        key: 12.1,
-        role: "discipline",
-        children: [
-          {
-            label: "กรรมการ",
-            path: "disciplineDirector",
-            role: "discipline",
-          },
-          {
-            label: "ช่องทางการร้องเรียน",
-            path: "disciplineChannel",
-            role: "discipline",
-          },
-        ],
-      },
-    ],
-  },
-  {
-    key: 13,
-    icon: "mdi-account-check",
-    label: "ประเมินบุคคล",
-    role: "evaluate",
-    children: [
-      {
-        key: 13.0,
-        label: "คำขอประเมิน",
-        path: "evaluate",
-        role: "discipline",
-      },
-      {
-        label: "กรรมการและการประชุม",
-        path: "",
-        key: 13.1,
-        role: "evaluate",
-        children: [
-          {
-            label: "กรรมการ",
-            path: "evaluateDirector",
-            role: "evaluate",
-          },
-          {
-            label: "การประชุม",
-            path: "evaluateMeeting",
-            role: "evaluate",
-          },
-        ],
-      },
-    ],
-  },
-  {
-    key: 14,
-    icon: "mdi-cash",
-    label: "เงินเดือน/ค่าจ้าง",
-    role: "salary",
-    children: [
-      {
-        label: "ผังบัญชีเงินเดือนข้าราชการฯ",
-        path: "salaryChart",
-        role: "salary",
-      },
-      {
-        label: "ผังบัญชีค่าจ้างลูกจ้างประจำ",
-        path: "salaryEmployeeChart",
-        role: "salary",
-      },
-      {
-        label: "รอบการเลื่อนเงินเดือน",
-        path: "salaryRound",
-        role: "salary",
-      },
-      {
-        label: "เลื่อนเงินเดือนข้าราชการฯ",
-        path: "salaryLists",
-        role: "salary",
-      },
-      {
-        label: "เลื่อนค่าจ้างลูกจ้างประจำ",
-        path: "salaryEmployeeLists",
-        role: "salary",
-      },
-      {
-        label: "ออกคำสั่งเลื่อนเงินเดือน/ค่าจ้าง",
-        path: "commandSalary",
-        role: "salary",
-      },
-    ],
-  },
-  {
-    key: 15,
-    icon: "mdi-account-star",
-    label: "ประเมินผลการปฏิบัติราชการระดับบุคคล",
-    role: "evaluateKPI",
-    children: [
-      {
-        label: "รอบการประเมิน",
-        path: "KPIRound",
-        role: "evaluateKPI",
-      },
-      {
-        label: "รายการการประเมินผล",
-        path: "KPI​List",
-        role: "evaluateKPI",
-      },
-      {
-        label: "ประกาศผล",
-        path: "KPIResults",
-        role: "evaluateKPI",
-      },
-      {
-        label: "รายงาน",
-        path: "KPIReport",
-        role: "evaluateKPI",
-      },
-    ],
-  },
-  {
-    key: 16,
-    icon: "mdi-briefcase-account",
-    label: "พัฒนาบุคลากร",
-    role: "development",
-    children: [
-      {
-        label: "โครงการ/หลักสูตรการฝึกอบรม",
-        path: "developmentMain",
-        role: "development",
-      },
-      {
-        label: "ประวัติฝึกอบรม/ดูงาน ขรก.",
-        path: "developmentHistory",
-        role: "development",
-      },
-      {
-        label: "ประวัติฝึกอบรม/ดูงานลูกจ้าง",
-        path: "developmentEmployeeHistory",
-        role: "development",
-      },
-      {
-        label: "ทุนการศึกษา/ฝึกอบรม",
-        path: "developmentScholarship",
-        role: "development",
-      },
-    ],
-  },
+  // {
+  //   key: 2,
+  //   icon: "o_person",
+  //   label: "ข้อมูลการประเมิน",
+  //   path: "metadataNew",
+  //   role: "evaluateKPI",
+  //   children: [
+  //     {
+  //       key: 2.1,
+  //       label: "ตัวชี้วัด",
+  //       role: "evaluateKPI",
+  //       children: [
+  //         {
+  //           label: "ตามแผน",
+  //           path: "KPIIndicatorByPlan",
+  //           role: "evaluateKPI",
+  //         },
+  //         {
+  //           label: "ตามตำแหน่ง",
+  //           path: "KPIIndicatorByRole",
+  //           role: "evaluateKPI",
+  //         },
+  //         {
+  //           label: "งานที่ได้รับมอบหมาย",
+  //           path: "KPIAssignment",
+  //           role: "evaluateKPI",
+  //         },
+  //       ],
+  //     },
+  //     {
+  //       key: 2.0,
+  //       label: "สมรรถนะ",
+  //       path: "KPICompetency",
+  //       role: "evaluateKPI",
+  //     },
+  //     {
+  //       key: 2.0,
+  //       label: "ยุทธศาสตร์",
+  //       path: "strategic",
+  //       role: "development",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 3,
+  //   icon: "o_groups",
+  //   label: "โครงสร้างอัตรากำลัง",
+  //   path: "organizationalNew",
+  //   role: "organization",
+  // },
+  // {
+  //   key: 3,
+  //   icon: "mdi-account-convert",
+  //   label: "รักษาการในตำแหน่ง",
+  //   path: "acting",
+  //   role: "organization",
+  // },
+  // {
+  //   key: 3,
+  //   icon: "o_groups",
+  //   label: "อัตรากำลังลูกจ้างประจำฯ",
+  //   path: "positionEmployee",
+  //   role: "positionEmployee",
+  // },
+  // {
+  //   key: 4,
+  //   icon: "o_contact_page",
+  //   label: "ทะเบียนประวัติ",
+  //   path: "registryNew",
+  //   role: "registry",
+  // },
+  // {
+  //   key: 4,
+  //   icon: "o_contact_page",
+  //   label: "ทะเบียนประวัติลูกจ้าง",
+  //   path: "registry-employee",
+  //   role: "registryEmployee",
+  // },
+  // {
+  //   key: 6,
+  //   icon: "mdi-file-certificate-outline",
+  //   label: "ออกคำสั่ง",
+  //   path: "order",
+  //   role: "order",
+  // },
+  // {
+  //   key: 7,
+  //   icon: "o_search",
+  //   label: "สรรหา",
+  //   path: "recruiting",
+  //   role: "recruit",
+  //   children: [
+  //     {
+  //       label: "ตั้งค่าเว็บสรรหา",
+  //       path: "editorweb",
+  //       key: 7.1,
+  //       role: "recruit",
+  //     },
+  //     {
+  //       label: "สอบแข่งขัน",
+  //       path: "",
+  //       key: 7.2,
+  //       role: "recruit",
+  //       children: [
+  //         {
+  //           label: "จัดการรอบสอบแข่งขัน" /* แข่งขัน */,
+  //           path: "competePeriod",
+  //           role: "recruit",
+  //         },
+  //         {
+  //           label: "สถิติสมัครสอบแข่งขัน" /* แข่งขัน */,
+  //           path: "competePeriodStat",
+  //           role: "recruit",
+  //         },
+  //       ],
+  //     },
+  //     {
+  //       label: "คัดเลือก",
+  //       path: "",
+  //       key: 7.3,
+  //       role: "recruit",
+  //       children: [
+  //         {
+  //           label: "จัดการรอบคัดเลือก",
+  //           path: "qualifyPeriod",
+  //           role: "recruit",
+  //         },
+  //         {
+  //           label: "จัดการรอบคัดเลือกคนพิการ",
+  //           path: "disablePeriod",
+  //           role: "recruit",
+  //         },
+  //         {
+  //           label: "จัดการรายชื่อคัดเลือก",
+  //           path: "manage",
+  //           role: "recruit",
+  //         },
+  //         {
+  //           label: "สถิติสมัครคัดเลือก",
+  //           path: "qualifyPeriodStat",
+  //           role: "recruit",
+  //         },
+  //         {
+  //           label: "สถิติสมัครคัดเลือกคนพิการ",
+  //           path: "qualifyPeriodStatDisable",
+  //           role: "recruit",
+  //         },
+  //       ],
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 8,
+  //   path: "placement",
+  //   icon: "how_to_reg",
+  //   label: "บรรจุ แต่งตั้ง ย้าย โอน",
+  //   role: "placement",
+  //   children: [
+  //     {
+  //       label: "รายชื่อผู้สอบผ่าน",
+  //       path: "placement",
+  //       role: "placement",
+  //     },
+  //     // {
+  //     //   label: "การทดลองปฏิบัติหน้าที่ราชการ",
+  //     //   path: "probation",
+  //     //   role: "probation",
+  //     // },
+  //     {
+  //       label: "รายการขอโอน",
+  //       path: "transfer",
+  //       role: "placement",
+  //     },
+  //     {
+  //       label: "รายการรับโอน",
+  //       path: "receive",
+  //       role: "placement",
+  //     },
+  //     {
+  //       label: "รายการช่วยราชการ",
+  //       path: "help-government",
+  //       role: "placement",
+  //     },
+  //     {
+  //       label: "รายการส่งตัวกลับ",
+  //       path: "repatriate",
+  //       role: "placement",
+  //     },
+  //     {
+  //       label: "รายการแต่งตั้ง-เลื่อน-ย้าย",
+  //       path: "appoint-promote",
+  //       role: "placement",
+  //     },
+  //     {
+  //       label: "ปรับระดับชั้นงาน-ย้ายลูกจ้าง",
+  //       path: "appoint-employee",
+  //       role: "placement",
+  //     },
+  //     // {
+  //     //   label: "ออกคำสั่งย้ายสับเปลี่ยนตำแหน่ง",
+  //     //   path: "changePositions",
+  //     //   role: "placement",
+  //     // },
+  //     {
+  //       label: "รายการอื่นๆ",
+  //       path: "other",
+  //       role: "placement",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 81,
+  //   icon: "badge",
+  //   label: "ทดลองปฏิบัติหน้าที่ราชการ",
+  //   path: "probation",
+  //   role: "probation",
+  // },
+  // {
+  //   key: 9,
+  //   icon: "mdi-account-cancel-outline",
+  //   label: "พ้นจากราชการ",
+  //   path: "retirement",
+  //   role: "retirement",
+  //   children: [
+  //     {
+  //       label: "ประกาศเกษียณ",
+  //       path: "retirement",
+  //       role: "retirement",
+  //     },
+  //     {
+  //       label: "รายการลาออก",
+  //       path: "resign",
+  //       role: "retirement",
+  //     },
+  //     {
+  //       label: "Exit interview",
+  //       path: "exit-Interview",
+  //       role: "retirement",
+  //     },
+  //     {
+  //       label: "รายการบันทึกการถึงแก่กรรม",
+  //       path: "deceased",
+  //       role: "retirement",
+  //     },
+  //     {
+  //       label: "รายการให้ออก",
+  //       path: "dismiss-order",
+  //       role: "retirement",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 10,
+  //   icon: "mdi-medal-outline",
+  //   label: "เครื่องราชฯ",
+  //   path: "insignia",
+  //   role: "insignia",
+  //   children: [
+  //     {
+  //       label: "รอบการเสนอขอ",
+  //       path: "insigniaProposals",
+  //       role: "insignia",
+  //     },
+  //     {
+  //       label: "จัดการคำขอ",
+  //       path: "insigniaManage",
+  //       role: "insignia",
+  //     },
+  //     {
+  //       label: "บันทึกผลการเสนอขอ",
+  //       path: "insigniaRecord",
+  //       role: "insignia",
+  //     },
+  //     {
+  //       label: "จัดสรรเครื่องราชฯ",
+  //       path: "insigniaAllocate",
+  //       role: "insignia",
+  //     },
+  //     {
+  //       label: "ยืม-คืนเครื่องราชฯ",
+  //       path: "insigniaBorrow",
+  //       role: "insignia",
+  //     },
+  //     {
+  //       label: "รายงาน",
+  //       path: "insigniaReport",
+  //       role: "insignia",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 11,
+  //   icon: "mdi-calendar",
+  //   label: "การลา",
+  //   path: "leave",
+  //   role: "leave",
+  //   children: [
+  //     {
+  //       label: "รอบการปฏิบัติงาน",
+  //       path: "roundTime",
+  //       role: "leave",
+  //     },
+  //     {
+  //       label: "แก้ไขรอบการปฎิบัติงานผู้ใช้งาน",
+  //       path: "changeRound",
+  //       role: "leave",
+  //     },
+  //     {
+  //       label: "รายการลงเวลาปฏิบัติงาน",
+  //       path: "workList",
+  //       role: "leave",
+  //     },
+  //     {
+  //       label: "ลงเวลากรณีพิเศษ",
+  //       path: "timestampSpecial",
+  //       role: "leave",
+  //     },
+  //     {
+  //       label: "รายการลา",
+  //       path: "leave",
+  //       role: "leave",
+  //     },
+  //     {
+  //       label: "รายงานสถิติการลา",
+  //       path: "leaveReport",
+  //       role: "leave",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 12,
+  //   icon: "mdi-scale-balance",
+  //   label: "วินัย",
+  //   role: "discipline",
+  //   children: [
+  //     {
+  //       key: 12.0,
+  //       label: "เรื่องร้องเรียน",
+  //       path: "disciplineComplaints",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       key: 12.0,
+  //       label: "สืบสวนข้อเท็จจริง",
+  //       path: "disciplineInvestigatefacts",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       key: 12.0,
+  //       label: "สอบสวนความผิดทางวินัย",
+  //       path: "disciplineDisciplinary",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       key: 12.0,
+  //       label: "สรุปผลการพิจารณาความผิดทางวินัย",
+  //       path: "disciplineResult",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       key: 12.0,
+  //       label: "รายชื่อผู้ถูกพักราชการ",
+  //       path: "disciplineListSuspend",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       key: 12.0,
+  //       label: "อุทธรณ์/ร้องทุกข์",
+  //       path: "appealComplain",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       key: 12.0,
+  //       label: "ออกคำสั่งลงโทษทางวินัย",
+  //       path: "disciplineOrder",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       label: "ข้อมูลพื้นฐาน",
+  //       path: "",
+  //       key: 12.1,
+  //       role: "discipline",
+  //       children: [
+  //         {
+  //           label: "กรรมการ",
+  //           path: "disciplineDirector",
+  //           role: "discipline",
+  //         },
+  //         {
+  //           label: "ช่องทางการร้องเรียน",
+  //           path: "disciplineChannel",
+  //           role: "discipline",
+  //         },
+  //       ],
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 13,
+  //   icon: "mdi-account-check",
+  //   label: "ประเมินบุคคล",
+  //   role: "evaluate",
+  //   children: [
+  //     {
+  //       key: 13.0,
+  //       label: "คำขอประเมิน",
+  //       path: "evaluate",
+  //       role: "discipline",
+  //     },
+  //     {
+  //       label: "กรรมการและการประชุม",
+  //       path: "",
+  //       key: 13.1,
+  //       role: "evaluate",
+  //       children: [
+  //         {
+  //           label: "กรรมการ",
+  //           path: "evaluateDirector",
+  //           role: "evaluate",
+  //         },
+  //         {
+  //           label: "การประชุม",
+  //           path: "evaluateMeeting",
+  //           role: "evaluate",
+  //         },
+  //       ],
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 14,
+  //   icon: "mdi-cash",
+  //   label: "เงินเดือน/ค่าจ้าง",
+  //   role: "salary",
+  //   children: [
+  //     {
+  //       label: "ผังบัญชีเงินเดือนข้าราชการฯ",
+  //       path: "salaryChart",
+  //       role: "salary",
+  //     },
+  //     {
+  //       label: "ผังบัญชีค่าจ้างลูกจ้างประจำ",
+  //       path: "salaryEmployeeChart",
+  //       role: "salary",
+  //     },
+  //     {
+  //       label: "รอบการเลื่อนเงินเดือน",
+  //       path: "salaryRound",
+  //       role: "salary",
+  //     },
+  //     {
+  //       label: "เลื่อนเงินเดือนข้าราชการฯ",
+  //       path: "salaryLists",
+  //       role: "salary",
+  //     },
+  //     {
+  //       label: "เลื่อนค่าจ้างลูกจ้างประจำ",
+  //       path: "salaryEmployeeLists",
+  //       role: "salary",
+  //     },
+  //     {
+  //       label: "ออกคำสั่งเลื่อนเงินเดือน/ค่าจ้าง",
+  //       path: "commandSalary",
+  //       role: "salary",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 15,
+  //   icon: "mdi-account-star",
+  //   label: "ประเมินผลการปฏิบัติราชการระดับบุคคล",
+  //   role: "evaluateKPI",
+  //   children: [
+  //     {
+  //       label: "รอบการประเมิน",
+  //       path: "KPIRound",
+  //       role: "evaluateKPI",
+  //     },
+  //     {
+  //       label: "รายการการประเมินผล",
+  //       path: "KPI​List",
+  //       role: "evaluateKPI",
+  //     },
+  //     {
+  //       label: "ประกาศผล",
+  //       path: "KPIResults",
+  //       role: "evaluateKPI",
+  //     },
+  //     {
+  //       label: "รายงาน",
+  //       path: "KPIReport",
+  //       role: "evaluateKPI",
+  //     },
+  //   ],
+  // },
+  // {
+  //   key: 16,
+  //   icon: "mdi-briefcase-account",
+  //   label: "พัฒนาบุคลากร",
+  //   role: "development",
+  //   children: [
+  //     {
+  //       label: "โครงการ/หลักสูตรการฝึกอบรม",
+  //       path: "developmentMain",
+  //       role: "development",
+  //     },
+  //     {
+  //       label: "ประวัติฝึกอบรม/ดูงาน ขรก.",
+  //       path: "developmentHistory",
+  //       role: "development",
+  //     },
+  //     {
+  //       label: "ประวัติฝึกอบรม/ดูงานลูกจ้าง",
+  //       path: "developmentEmployeeHistory",
+  //       role: "development",
+  //     },
+  //     {
+  //       label: "ทุนการศึกษา/ฝึกอบรม",
+  //       path: "developmentScholarship",
+  //       role: "development",
+  //     },
+  //   ],
+  // },
   // {
   //   key: 13,
   //   icon: "o_note",
diff --git a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
index 7bf7d8703..1d88483f7 100644
--- a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
@@ -115,7 +115,7 @@ onMounted(() => {
       color="primary"
       @click="router.go(-1)"
     />
-    รายละเอียดงานที่ได้รับมอบหมาย
+    รายละเอียดงานอื่นๆ ที่ได้รับมอบหมาย
   </div>
   <q-card flat>
     <q-card-section>
diff --git a/src/modules/01_masterdata/components/Indicators/Summary.vue b/src/modules/01_masterdata/components/Indicators/Summary.vue
index 856abde1b..e1f7d31b6 100644
--- a/src/modules/01_masterdata/components/Indicators/Summary.vue
+++ b/src/modules/01_masterdata/components/Indicators/Summary.vue
@@ -54,7 +54,7 @@ onMounted(() => {
 });
 </script>
 <template>
-  <q-card bordered class="q-mb-sm q-pa-xs bg-grey-1">
+  <q-card bordered class="q-pa-xs bg-grey-1">
     <div class="row q-col-gutter-sm">
       <div
         v-for="i in indicatorTotal"
diff --git a/src/modules/01_masterdata/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue
index 4a570c312..c149e9ca9 100644
--- a/src/modules/01_masterdata/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@@ -13,7 +13,7 @@ import type {
 } from "@/modules/01_masterdata/interface/index/Main";
 import type { FormFilterAssignment } from "@/modules/01_masterdata/interface/request/Main";
 import type { ResAssignment } from "@/modules/01_masterdata/interface/response/Main";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -174,12 +174,10 @@ onMounted(() => {
   <div class="toptitle text-dark col-12 row items-center">
     รายการงานอื่นๆ ที่ได้รับมอบหมาย
   </div>
+
+  <Summary />
+
   <q-card flat bordered class="q-pa-md">
-    <div class="row">
-      <div class="col-12">
-        <IndicatorTotal />
-      </div>
-    </div>
     <div class="row q-col-gutter-sm q-pl-sm">
       <q-toolbar style="padding: 0">
         <div class="row q-gutter-sm">
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index 69cd271c1..c58689350 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -8,7 +8,7 @@ import config from "@/app.config";
 
 import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
 import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -205,6 +205,9 @@ onMounted(() => {
   <div class="toptitle text-dark col-12 row items-center">
     รายการตัวชี้วัดตามแผนฯ
   </div>
+
+  <Summary />
+
   <q-card bordered class="col-12 row caedNone">
     <div class="col-xs-12 col-sm-3 row">
       <div class="col-12 row no-wrap">
@@ -268,7 +271,6 @@ onMounted(() => {
     </div>
     <div class="col-xs-12 col-sm-9 q-pa-md row">
       <div class="col-12">
-        <IndicatorTotal />
         <div class="row q-col-gutter-sm items-center q-mb-sm no-wrap">
           <datepicker
             menu-class-name="modalfix"
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index d844e9645..da61fc132 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -12,7 +12,7 @@ import type {
 } from "@/modules/01_masterdata/interface/index/Main";
 
 import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -273,10 +273,10 @@ onMounted(async () => {
   <div class="toptitle text-dark col-12 row items-center">
     รายการตัวชี้วัดตามตำแหน่ง
   </div>
+
+  <Summary />
+
   <q-card flat bordered class="q-pa-md">
-    <div class="col-12">
-      <IndicatorTotal />
-    </div>
     <div class="row q-gutter-sm no-wrap q-mb-sm">
       <q-select
         dense
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
index 2bb4519e6..934824ba7 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -168,7 +168,7 @@ const historyColumns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
index b34b81fa3..66e70def4 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -282,7 +282,7 @@ const historyColumns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index 1080a96e5..16df2dff7 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -405,7 +405,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
index d200d2749..37027aee8 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -186,7 +186,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
index f6a2e43fe..ca1578f5f 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -253,7 +253,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
index a6baf3f4c..230ff4f78 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -255,7 +255,7 @@ const columns = ref<QTableColumn[]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
   },
 ]);
 const visibleColumns = ref<String[]>([
diff --git a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
index 3dfbd0357..79612f3ac 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -71,7 +71,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
   },
 ]);
 const visibleColumns = ref<string[]>([
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index 52e83625e..95c64c4f6 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -289,7 +289,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) =>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
index d61853389..ea0ecb324 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
@@ -142,7 +142,7 @@ const columns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
index e720b67ea..3b793484c 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
@@ -139,7 +139,7 @@ const columns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
index 1bbdacece..f2e7a1aa6 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
@@ -144,7 +144,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
index 24846e062..3c39ec9b1 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
@@ -92,7 +92,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index 29f1fe76c..a08ddbb53 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -255,7 +255,7 @@ const columnsHistory = ref<QTableColumn[]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
index e7ff8f5d8..505d81236 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -178,7 +178,7 @@ const columns = 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) =>
@@ -247,7 +247,7 @@ const historyColumns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
index 4ebc4f6db..56f15c1f0 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
@@ -245,7 +245,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
index be44fabf2..713d4a05c 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -390,7 +390,7 @@ const historyColumns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
index 27005f003..19eaf688c 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -133,7 +133,7 @@ const historyColumns = 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) =>
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
index 56f1d1414..1e9a6f681 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
@@ -194,7 +194,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
   },
 ]);
 const visibleColumns = ref<string[]>([
diff --git a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
index ffe2b3238..295a59aac 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
@@ -100,7 +100,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },