From 5ea590ec60e3334b8143a5625bbec8e5d6e4b2c2 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 25 Feb 2025 15:21:22 +0700
Subject: [PATCH 1/5] fixing text

---
 src/views/DashboardAll.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/DashboardAll.vue b/src/views/DashboardAll.vue
index 1f8ec55b1..713fb3e8d 100644
--- a/src/views/DashboardAll.vue
+++ b/src/views/DashboardAll.vue
@@ -18,7 +18,7 @@ onMounted(async () => {
   const data = await menuDashboard?.children?.find(
     (item: ListMenu) => item.path === route.name
   );
-  title.value = `สิถิติ${data?.sysName}`;
+  title.value = `สถิติ${data?.sysName}`;
   panelUrl.value = `${env.DASHBOARD_URL}/goto/${data?.sysDescription}`;
 });
 </script>

From fd120a918f277d1d6c70733f6f543b1f311c717e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Feb 2025 15:27:01 +0700
Subject: [PATCH 2/5] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=3D=3D=20>=20TableSort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TableView.vue                  | 167 +++++-------------
 .../Achievement/01_ProfessionalLicense.vue    |  21 ++-
 .../detail/Achievement/02_Train.vue           |  47 +++--
 .../detail/Achievement/03_Insignia.vue        |  52 +++---
 .../Achievement/04_DeclarationHonor.vue       |  39 ++--
 .../Achievement/05_ResultsPerformance.vue     | 114 +++++++++---
 .../detail/Employee/01_DataEmployee.vue       |  63 ++++++-
 .../detail/Employee/02_Employment.vue         |  43 +++--
 .../detail/GovernmentInformation/01_Info.vue  |   5 +-
 .../GovernmentInformation/02_Discipline.vue   |  17 +-
 .../02_DisciplineHistory.vue                  |   9 +-
 .../detail/GovernmentInformation/03_Leave.vue |  31 +++-
 .../GovernmentInformation/03_LeaveHistory.vue |   9 +-
 .../04_PerformSpecialWork.vue                 |  24 ++-
 .../04_PerformSpecialWorkHistory.vue          |   5 +-
 .../GovernmentInformation/05_ActingPos.vue    |  34 +++-
 .../05_ActingPosHistory.vue                   |  19 +-
 .../06_HelpGovernment.vue                     |  30 +++-
 .../06_HelpGovernmentHistory.vue              |  17 +-
 .../GovernmentInformation/07_Position.vue     |  41 ++++-
 .../07_PositionHistory.vue                    |  58 ++++--
 .../detail/Other/01_OtherInformation.vue      |  21 ++-
 .../Other/01_OtherInformationHistory.vue      |   8 +-
 .../detail/PersonalInformation/01_Profile.vue |  18 +-
 .../02_NameChangeHistory.vue                  |  11 +-
 .../detail/PersonalInformation/03_Address.vue |   8 +-
 .../PersonalInformation/04_FamilyNew.vue      |  14 +-
 .../PersonalInformation/05_Education.vue      |  35 ++--
 .../PersonalInformation/06_SpecialSkill.vue   |  36 ++--
 .../detail/Salary/01_PositionSalary.vue       |  49 ++++-
 .../Salary/01_PositionSalaryHistory.vue       |  81 ++++++++-
 .../detail/Salary/02_NotReceiveSalary.vue     |  20 ++-
 .../Salary/02_NotReceiveSalaryHistory.vue     |   5 +-
 .../04_registryPerson/views/listView.vue      |   2 +-
 .../08_registryEmployee/views/Main.vue        |  20 +--
 35 files changed, 800 insertions(+), 373 deletions(-)

diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index 835bbf6e2..5fcfb4a03 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -1,44 +1,28 @@
 <script setup lang="ts">
-import { ref, watch, computed } from "vue";
-import axios from "axios";
-import http from "@/plugins/http";
-import config from "@/app.config";
+import { ref, watch, computed, onMounted } from "vue";
 
 import { checkPermission } from "@/utils/permissions";
 import { useRouter } from "vue-router";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useCounterMixin } from "@/stores/mixin";
 
-//importType
+/** importType*/
 import { useQuasar, type QTableProps } from "quasar";
 import type {
   FormFilter,
   RangeAge,
 } from "@/modules/04_registryPerson/interface/request/Main";
 
-//importComponent
+/** importComponent*/
 import DialogHistory from "@/modules/04_registryPerson/components/DialogHistory.vue";
-import DialogHeader from "@/components/DialogHeader.vue";
-//use
 
+/* use*/
 const $q = useQuasar();
-const mixin = useCounterMixin();
-const { messageError, date2Thai } = mixin;
-const store = useRegistryNewDataStore();
 const router = useRouter();
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
+const store = useRegistryNewDataStore();
 
-const detailReport = ref<any>();
-const rangeAge = ref<RangeAge>({
-  min: 18,
-  max: 60,
-});
-
-const objMarkerLabel = computed(() => {
-  return { 39: `ช่วงอายุ ${rangeAge.value.min}-${rangeAge.value.max} ปี` };
-});
-
-const loadingBtn = ref<boolean>(false);
-const year = ref<number>(new Date().getFullYear());
 //props
 const formFilter = defineModel<FormFilter>("formFilter", { required: true }); //ข้อมูลการค้นหา
 const maxPage = defineModel<Number>("maxPage", { required: true }); //จำนวนหน้าทั้งหมด
@@ -51,6 +35,16 @@ const props = defineProps({
   total: { type: Number, default: 0 },
 });
 
+const rangeAge = ref<RangeAge>({
+  min: 18,
+  max: 60,
+});
+
+const objMarkerLabel = computed(() => {
+  return { 39: `ช่วงอายุ ${rangeAge.value.min}-${rangeAge.value.max} ปี` };
+});
+const year = ref<number>(new Date().getFullYear());
+
 //ตัวแปร
 const modalHistory = ref<boolean>(false); //ประวัติถือครองตำแหน่ง
 const modalReport = ref<boolean>(false);
@@ -128,36 +122,14 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateAppoint",
     align: "left",
     label: "วันที่บรรจุ",
-    sortable: false,
+    sortable: true,
     field: "dateAppoint",
-    headerStyle: "font-size: 14px",
-    format(val, row) {
+    headerStyle: "font-size: 14px;pointer-events: none;",
+    format(val) {
       return date2Thai(val);
     },
     style: "font-size: 14px",
   },
-  // {
-  //   name: "year",
-  //   align: "left",
-  //   label: "ปีงบประมาณ",
-  //   sortable: true,
-  //   field: "year",
-  //   headerStyle: "font-size: 14px",
-  //   style: "font-size: 14px",
-  //   sort: (a: string, b: string) =>
-  //     a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  // },
-  // {
-  //   name: "salary",
-  //   align: "left",
-  //   label: "ค่าจ้าง",
-  //   sortable: true,
-  //   field: "salary",
-  //   headerStyle: "font-size: 14px",
-  //   style: "font-size: 14px",
-  //   sort: (a: string, b: string) =>
-  //     a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  // },
 ]);
 const visibleColumns = ref<string[]>([
   "no",
@@ -173,8 +145,27 @@ const visibleColumns = ref<string[]>([
 const pagination = ref({
   page: formFilter.value.page,
   rowsPerPage: formFilter.value.pageSize,
+  sortBy: "",
+  descending: false,
 });
 
+watch(
+  () => store.formFilter.dateAppoint,
+  () => {
+    checkFilterDateAppoint();
+  }
+);
+
+function checkFilterDateAppoint() {
+  if (store.formFilter.dateAppoint) {
+    pagination.value.sortBy = "dateAppoint";
+    pagination.value.descending =
+      formFilter.value.dateAppoint === "DESC" ? true : false;
+  } else {
+    pagination.value.sortBy = "";
+  }
+}
+
 /**  function เปลี่ยนหน้า Table*/
 function updatePagePagination() {
   props.fetchData?.();
@@ -215,82 +206,6 @@ function redirectToPagePetition() {
   }
 }
 
-// function onGovernment() {
-//   modalReport.value = true;
-// }
-
-// function closeDialog() {
-//   modalReport.value = false;
-//   rangeAge.value = {
-//     min: 18,
-//     max: 60,
-//   };
-// }
-
-// async function getReport() {
-//   loadingBtn.value = true;
-//   await http
-//     .get(
-//       config.API.reportOrgByType(
-//         empType.value == "officer" ? "officer" : "emp"
-//       ) +
-//         `?rootId=&year=${year.value}&ageMin=${rangeAge.value.min}&ageMax=${rangeAge.value.max}`
-//     )
-//     .then((res) => {
-//       const data = res.data.result;
-//       genReportXLSX(data);
-//     })
-//     .catch((err) => {
-//       messageError($q, err);
-//     })
-//     .finally(() => {
-//       setTimeout(() => {
-//         loadingBtn.value = false;
-//       }, 500);
-//     });
-// }
-
-// /**
-//  * function เรียกไฟล์ XLSX
-//  * @param data ข้อมูลรายงานสถิติการลา
-//  */
-// async function genReportXLSX(data: any) {
-//   await axios
-//     .post(`${config.API.reportTemplate}/xlsx`, data, {
-//       headers: {
-//         accept:
-//           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-//         "content-Type": "application/json",
-//       },
-//       responseType: "blob",
-//     })
-//     .then(async (res) => {
-//       const blob = new Blob([res.data]);
-//       await downloadReport(blob, "xlsx");
-//     })
-//     .catch(async (e) => {
-//       messageError($q, JSON.parse(await e.response.data.text()));
-//     });
-// }
-
-// /**
-//  *
-//  * @param data ข้อมูลรายงานสถิติการลา
-//  * @param type นามสกุลไฟล์
-//  */
-// async function downloadReport(data: any, type: string) {
-//   const link = document.createElement("a");
-//   var fileName =
-//     empType.value == "officer"
-//       ? "รายงานสถิติข้อมูลข้าราชการ กทม. สามัญ"
-//       : "รายงานสถิติข้อมูลลูกจ้างประจำ กทม.";
-//   link.href = window.URL.createObjectURL(new Blob([data]));
-//   link.setAttribute("download", `${fileName}.${type}`);
-//   document.body.appendChild(link);
-//   link.click();
-//   document.body.removeChild(link);
-// }
-
 /**
  * ดูการเปลี่ยนแปลงของ formFilter.value.pageSize
  * เมื่อมีการเปลี่ยนแปลงจำทำการดึงข้อมูลรายการทะเบียนประวัติใหม่ตามจำนวน  formFilter.value.pageSize
@@ -301,6 +216,10 @@ watch(
     props.fetchData?.();
   }
 );
+
+onMounted(() => {
+  checkFilterDateAppoint();
+});
 </script>
 
 <template>
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 6e2b126d6..6db8b64da 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -105,6 +105,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "certificateType",
@@ -112,10 +124,10 @@ const visibleColumns = ref<string[]>([
   "certificateNo",
   "issueDate",
   "expireDate",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 //Table ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ
@@ -215,8 +227,7 @@ const historyVisibleColumns = ref<string[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 const profesLicenseData = reactive<RequestItemsObject>({
@@ -470,10 +481,8 @@ onMounted(() => {
     row-key="name"
     flat
     bordered
-    :paging="true"
     dense
     v-model:pagination="pagination"
-    :rows-per-page-options="[20, 50, 100]"
     class="custom-header-table"
     :visible-columns="visibleColumns"
   >
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 c6d8f9bfa..32da164f3 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -100,7 +100,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "endDate",
@@ -116,7 +118,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "yearly",
@@ -128,7 +132,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "place",
@@ -186,6 +192,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "name", // ชื่อโครงงาน
@@ -198,10 +216,10 @@ const visibleColumns = ref<string[]>([
   "dateOrder", // คำสั่งลงวันที่
   "startDate", // วันเริ่มต้น
   "endDate", // วันสิ้นสุด
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 //Table ประวัติแก้ไข
@@ -245,7 +263,9 @@ const historyColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "endDate",
@@ -261,7 +281,9 @@ const historyColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "yearly",
@@ -273,7 +295,9 @@ const historyColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "place",
@@ -370,8 +394,7 @@ const historyVisibleColumns = ref<string[]>([
   "lastUpdatedAt", // แก้ไขเมื่อวันที่
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** ยืนยันการบันทึกข้อมูล*/
@@ -630,9 +653,7 @@ onMounted(() => {
     row-key="name"
     flat
     bordered
-    :paging="true"
     dense
-    :rows-per-page-options="[20, 50, 100]"
     v-model:pagination="pagination"
     class="custom-header-table"
     :visible-columns="visibleColumns"
@@ -1163,9 +1184,7 @@ onMounted(() => {
           flat
           v-model:pagination="historyPagination"
           bordered
-          :paging="true"
           dense
-          :rows-per-page-options="[10, 25, 50, 100]"
           class="custom-header-table"
           :visible-columns="historyVisibleColumns"
         >
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 de1285812..a8b86bae0 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -13,7 +13,6 @@ import config from "@/app.config";
 import type { QTableProps } from "quasar";
 import type {
   DataOption,
-  DataOptionInsignia,
   InsigniaOps,
   InsigniasType,
   InsigniasTypeSub,
@@ -76,19 +75,11 @@ const isEdit = ref<boolean>(false); //สถานะการแก้ไขข
 const modal = ref<boolean>(false); //แสดง popup ข้อมูลเครื่องราชอิสริยาภรณ์
 const modeView = ref<string>("table"); //การแสดงผล Table,Card
 const modalHistory = ref<boolean>(false); //แสดง popup ประวัติแก้ไข
-//ข้อมูลเครื่องราช
-const OpsFilter = ref<InsigniaOps>({
-  insigniaOptions: [],
-});
 
 const insigniaOptions = ref<InsigniasType[]>([]);
 const insigniaOptionsMain = ref<InsigniasType[]>([]);
 const insigniaOptionsName = ref<InsigniasTypeSub[]>([]);
 const insigniaOptionsNameMain = ref<InsigniasTypeSub[]>([]);
-//ต้วลือกรายการครื่องราช
-const Ops = ref<InsigniaOps>({
-  insigniaOptions: [],
-});
 
 //Table Main
 const rows = ref<ResponseObject[]>([]);
@@ -104,6 +95,11 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => v + 543,
+    sort: (a: string, b: string) =>
+      a.toString().localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
   },
   {
     name: "receiveDate",
@@ -255,6 +251,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<String[]>([
   "insignia",
@@ -271,10 +279,10 @@ const visibleColumns = ref<String[]>([
   "refCommandNo",
   "refCommandDate",
   "note",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 //Table ประวัติแก้ไข
@@ -291,6 +299,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => v + 543,
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "receiveDate",
@@ -473,8 +485,7 @@ const visibleColumnsHistory = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** fetch ข้อมูลรายการเครื่องราชอิสริยาภรณ์*/
@@ -527,15 +538,14 @@ async function addEditData(editStatus: boolean = false) {
     isUpload: !isEdit.value ? undefined : isUpload.value,
     profileEmployeeId:
       !editStatus && empType.value !== "" ? profileId.value : undefined,
-      
+
     profileId:
       !editStatus && empType.value === "" ? profileId.value : undefined,
-      
   };
   try {
     await http[method](url, reqBody).then(async (res) => {
       if ((fileUpload.value && id.value) || res.data.result) {
-        await uploadProfile(editStatus ? id.value:res.data.result);
+        await uploadProfile(editStatus ? id.value : res.data.result);
       }
     });
 
@@ -568,7 +578,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value,id);
+      await uploadFileURL(uploadUrl.value, fileUpload.value, id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -580,7 +590,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any,id:string) {
+async function uploadFileURL(uploadUrl: string, file: any, id: string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -598,7 +608,7 @@ async function uploadFileURL(uploadUrl: string, file: any,id:string) {
     });
 }
 
-async function isUploadFn(id:string) {
+async function isUploadFn(id: string) {
   await http
     .patch(config.API.profileNewInsignById(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
@@ -904,12 +914,10 @@ onMounted(async () => {
     dense
     bordered
     :rows="rows"
-    :paging="true"
     :columns="columns"
     v-model:pagination="pagination"
     :grid="modeView === 'card'"
     :visible-columns="visibleColumns"
-    :rows-per-page-options="[20, 50, 100]"
     :card-container-class="modeView === 'card' ? 'q-col-gutter-md' : ''"
   >
     <template v-slot:header="props">
@@ -1517,8 +1525,6 @@ onMounted(async () => {
           dense
           :columns="columnsHistory"
           :rows="rowsHistory"
-          :paging="true"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumnsHistory"
         >
           >
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 9c0eaac45..e64fa3808 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -93,6 +93,10 @@ const columns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "issuer",
@@ -139,6 +143,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<String[]>([
   "issuer",
@@ -146,10 +162,10 @@ const visibleColumns = ref<String[]>([
   "issueDate",
   "refCommandNo",
   "refCommandDate",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 //Table ประวัติแก้ไข
@@ -170,6 +186,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "issuer",
@@ -250,8 +270,7 @@ const visibleColumnsHistory = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** fetch รายการข้อมูลประกาศเกียรติคุณ*/
@@ -301,7 +320,7 @@ async function addEditData(editStatus: boolean = false) {
   try {
     await http[method](url, reqBody).then(async (res) => {
       if ((fileUpload.value && id.value) || res.data.result) {
-        await uploadProfile(editStatus ? id.value:res.data.result);
+        await uploadProfile(editStatus ? id.value : res.data.result);
       }
     });
     await fetchData();
@@ -338,7 +357,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value,id);
+      await uploadFileURL(uploadUrl.value, fileUpload.value, id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -350,7 +369,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any,id:string) {
+async function uploadFileURL(uploadUrl: string, file: any, id: string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -368,7 +387,7 @@ async function uploadFileURL(uploadUrl: string, file: any,id:string) {
     });
 }
 
-async function isUploadFn(id:string) {
+async function isUploadFn(id: string) {
   await http
     .patch(config.API.profileNewHonorById(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
@@ -594,12 +613,10 @@ onMounted(() => {
     dense
     bordered
     :rows="rows"
-    :paging="true"
     :columns="columns"
     :grid="modeView === 'card'"
     v-model:pagination="pagination"
     :visible-columns="visibleColumns"
-    :rows-per-page-options="[20, 50, 100]"
     :card-container-class="modeView === 'card' ? 'q-col-gutter-md' : ''"
   >
     <template v-slot:header="props">
@@ -1090,9 +1107,7 @@ onMounted(() => {
           dense
           :columns="columnsHistory"
           :rows="rowsHistory"
-          :paging="true"
           v-model:pagination="historyPagination"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumnsHistory"
         >
           >
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 831325f1d..5d4fb6d09 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -93,6 +93,10 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "year",
@@ -105,6 +109,10 @@ const columns = ref<QTableProps["columns"]>([
     format: (v) => {
       return `${v ? Number(v) + 543 : "-"}`;
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "period",
@@ -119,6 +127,10 @@ const columns = ref<QTableProps["columns"]>([
         periodOp.value.find((item: DataOptions) => item.id === v)?.name || "-"
       );
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point1Total",
@@ -129,7 +141,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point1",
@@ -140,7 +154,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point2Total",
@@ -151,7 +167,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point2",
@@ -162,7 +180,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "pointSumTotal",
@@ -173,7 +193,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "pointSum",
@@ -184,7 +206,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "name",
@@ -197,6 +221,20 @@ const columns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "lastUpdatedAt",
+    align: "left",
+    label: "วันที่แก้ไข",
+    sortable: true,
+    field: "lastUpdatedAt",
+    format: (v) => date2Thai(v, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -212,10 +250,10 @@ const visibleColumns = ref<String[]>([
   "pointSum",
   "name",
   "date",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 //Table การพัฒนารายบุคคล (Individual Development Plan)
@@ -226,7 +264,7 @@ const columnsPlan = ref<QTableProps["columns"]>([
     name: "no",
     align: "left",
     label: "ลำดับ",
-    sortable: true,
+    sortable: false,
     field: "no",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -236,7 +274,7 @@ const columnsPlan = ref<QTableProps["columns"]>([
     name: "name",
     align: "left",
     label: "ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -247,7 +285,7 @@ const columnsPlan = ref<QTableProps["columns"]>([
     name: "developmentProjects",
     align: "left",
     label: "วิธีการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentProjects",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -258,7 +296,7 @@ const columnsPlan = ref<QTableProps["columns"]>([
     name: "developmentTarget",
     align: "left",
     label: "เป้าหมายการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentTarget",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -269,7 +307,7 @@ const columnsPlan = ref<QTableProps["columns"]>([
     name: "developmentResults",
     align: "left",
     label: "วิธีการวัดผลการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentResults",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -280,7 +318,7 @@ const columnsPlan = ref<QTableProps["columns"]>([
     name: "developmentReport",
     align: "left",
     label: "รายงานผลการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentReport",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -311,6 +349,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "year",
@@ -323,6 +365,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
     format: (v) => {
       return `${v ? Number(v) + 543 : "-"}`;
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "period",
@@ -337,6 +383,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
         periodOp.value.find((item: DataOptions) => item.id === v)?.name || "-"
       );
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point1Total",
@@ -346,6 +396,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "point1Total",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point1",
@@ -356,7 +410,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point2Total",
@@ -367,7 +423,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "point2",
@@ -378,7 +436,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "pointSumTotal",
@@ -389,7 +449,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "pointSum",
@@ -400,7 +462,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "name",
@@ -414,7 +478,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdateFullName",
@@ -455,8 +521,7 @@ const visibleColumnsHistory = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** fetch รายการข้อมูลผลการประเมินการปฏิบัติราชการ*/
@@ -747,12 +812,10 @@ onMounted(async () => {
             dense
             bordered
             :rows="rows"
-            :paging="true"
             :columns="columns"
             v-model:pagination="pagination"
             :grid="modeView === 'card'"
             :visible-columns="visibleColumns"
-            :rows-per-page-options="[20, 50, 100]"
             :card-container-class="modeView === 'card' ? 'q-col-gutter-md' : ''"
           >
             <template v-slot:header="props">
@@ -943,7 +1006,6 @@ onMounted(async () => {
             :card-container-class="
               modeViewPlan === 'card' ? 'q-col-gutter-md' : ''
             "
-            :rows-per-page-options="[10, 25, 50, 100]"
             @update:pagination="updatePaginationIdp"
           >
             <template v-slot:pagination="scope">
@@ -1378,8 +1440,6 @@ onMounted(async () => {
           :columns="columnsHistory"
           v-model:pagination="historyPagination"
           :rows="rowsHistory"
-          :paging="true"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumnsHistory"
         >
           >
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 d07dd9284..7ae0444c1 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -157,6 +157,10 @@ const columns = ref<QTableColumn[]>([
     field: "positionEmployeeGroupId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionEmployeeLineId",
@@ -166,6 +170,10 @@ const columns = ref<QTableColumn[]>([
     field: "positionEmployeeLineId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionEmployeePositionId",
@@ -175,6 +183,10 @@ const columns = ref<QTableColumn[]>([
     field: "positionEmployeePositionId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeOc",
@@ -184,6 +196,10 @@ const columns = ref<QTableColumn[]>([
     field: "employeeOc",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeTypeIndividual",
@@ -193,6 +209,10 @@ const columns = ref<QTableColumn[]>([
     field: "employeeTypeIndividual",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeWage",
@@ -202,6 +222,10 @@ const columns = ref<QTableColumn[]>([
     field: "employeeWage",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeMoneyIncrease",
@@ -211,6 +235,10 @@ const columns = ref<QTableColumn[]>([
     field: "employeeMoneyIncrease",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeMoneyAllowance",
@@ -220,6 +248,10 @@ const columns = ref<QTableColumn[]>([
     field: "employeeMoneyAllowance",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeMoneyEmployee",
@@ -229,6 +261,10 @@ const columns = ref<QTableColumn[]>([
     field: "employeeMoneyEmployee",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "employeeMoneyEmployer",
@@ -238,18 +274,26 @@ const columns = ref<QTableColumn[]>([
     field: "employeeMoneyEmployer",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .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
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "createdAt",
+    name: "lastUpdatedAt",
     align: "left",
     label: "วันที่แก้ไข",
     sortable: true,
@@ -257,6 +301,10 @@ const columns = ref<QTableColumn[]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v, false, true),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<String[]>([
@@ -270,9 +318,12 @@ const visibleColumns = ref<String[]>([
   "employeeMoneyAllowance",
   "employeeMoneyEmployee",
   "employeeMoneyEmployer",
-  "createdFullName",
-  "createdAt",
+  "lastUpdateFullName",
+  "lastUpdatedAt",
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 function onClickHistory() {
   showLoader();
@@ -630,8 +681,8 @@ onMounted(() => {
           dense
           :columns="columns"
           :rows="rows"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
+          v-model:pagination="pagination"
         >
           >
           <template v-slot:header="props">
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 45e68b839..de701915d 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -46,32 +46,44 @@ const columns = ref<QTableProps["columns"]>([
     name: "date",
     align: "left",
     label: "วันที่จ้าง",
-    sortable: false,
+    sortable: true,
     field: "date",
     format: (v) => date2Thai(v),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "command",
     align: "left",
     label: "คำสั่งจ้าง",
-    sortable: false,
+    sortable: true,
     field: "command",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .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
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "createdAt",
+    name: "lastUpdatedAt",
     align: "left",
     label: "วันที่แก้ไข",
     sortable: true,
@@ -79,14 +91,25 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v, false, true),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<string[]>([
   "date",
   "command",
-  "createdFullName",
-  "createdAt",
+  "lastUpdateFullName",
+  "lastUpdatedAt",
 ]);
+const pagination = ref({
+  sortBy: "",
+});
+const paginationHistory = ref({
+  sortBy: "lastUpdatedAt",
+});
+
 const modalEmployment = ref<boolean>(false);
 const isEdit = ref<boolean>(false);
 const employmentId = ref<string>("");
@@ -301,9 +324,9 @@ onMounted(() => {
       :columns="columns?.slice(0, 2)"
       :rows="rows"
       row-key="dateEmployment"
-      :paging="true"
       dense
       :visible-columns="visibleColumns"
+      v-model:pagination="pagination"
     >
       <template v-slot:header="props">
         <q-tr :props="props">
@@ -488,8 +511,8 @@ onMounted(() => {
           dense
           :columns="columns"
           :rows="rowsHistory"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
+          v-model:pagination="paginationHistory"
         >
           >
           <template v-slot:header="props">
@@ -512,8 +535,6 @@ onMounted(() => {
       </q-card-section>
 
       <q-separator />
-
-      <q-card-actions align="right"> </q-card-actions>
     </q-card>
   </q-dialog>
 </template>
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 f06769e6f..8dedfdffc 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -142,6 +142,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 /** เปิด dialog */
 function openDialogEdit() {
@@ -690,9 +693,9 @@ onMounted(() => {
           :rows="rowsHistory"
           flat
           bordered
-          :paging="true"
           dense
           :visible-columns="visibleColumnsHistory"
+          v-model:pagination="pagination"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
index 68de0d48d..9f7c86464 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -126,6 +126,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<String[]>([
   "level",
@@ -134,10 +146,10 @@ const visibleColumns = ref<String[]>([
   "refCommandNo",
   "refCommandDate",
   "date",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 const edit = ref<boolean>(false); //สถานะการแก้ไข
@@ -447,7 +459,6 @@ onMounted(() => {
     :rows="rows"
     :paging="true"
     v-model:pagination="pagination"
-    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
   >
     >
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 1505bbebb..17641c029 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
@@ -139,9 +139,8 @@ const visibleColumns = ref<String[]>([
   "lastUpdateFullName",
   "lastUpdatedAt",
 ]);
-const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
 });
 
 /** fetch ข้อมูลประวัติการแก่ไขข้อมูลวินัย*/
@@ -245,10 +244,8 @@ watch(modal, (status) => {
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
-          v-model:pagination="historyPagination"
+          v-model:pagination="pagination"
         >
           >
           <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
index ffd5bf4a4..e98d8e134 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -48,10 +48,7 @@ const profileId = ref<string>(
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 const rowsTotal = ref<ResponseTotalObject[]>([]);
 const id = ref<string>("");
-const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
-});
+
 const mode = ref<string>("table");
 const filterKeyword = ref<string>("");
 
@@ -129,7 +126,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "status",
@@ -156,6 +155,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<String[]>([
   "no",
@@ -164,8 +175,13 @@ const visibleColumns = ref<String[]>([
   "numLeave",
   "status",
   "reason",
+  "lastUpdatedAt",
 ]);
 
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
+
 const statusLeave = (val: string) => {
   switch (val) {
     case "waitting":
@@ -415,14 +431,13 @@ async function getData() {
     .then(async (res) => {
       const data = await res.data.result;
       rows.value = data.map((item: DataLeave) => ({
+        ...item,
         id: item.id,
         typeLeave: item.leaveType.name,
         code: item.leaveType.refCommandDate,
         dateStartLeave: item.dateLeaveStart,
         dateEndLeave: item.dateLeaveEnd,
         numLeave: item.leaveDays,
-        status: item.status,
-        reason: item.reason,
         typeLeaveId: item.leaveTypeId,
       }));
       rowsMain.value = rows.value;
@@ -533,9 +548,7 @@ onMounted(() => {
     :columns="columns"
     :rows="rows"
     :grid="mode === 'card'"
-    :paging="true"
     v-model:pagination="pagination"
-    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
   >
     >
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 d5d31d5c4..0682c4a7f 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
@@ -95,7 +95,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "status",
@@ -159,8 +161,7 @@ const visibleColumns = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function fetch ข้อมูลประวัติการแก้ไขการลา */
@@ -298,9 +299,7 @@ watch(modal, (status) => {
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
           v-model:pagination="historyPagination"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
         >
           >
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index b7a8860c9..74cae954c 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -135,6 +135,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<String[]>([
   "dateStart",
@@ -143,10 +155,10 @@ const visibleColumns = ref<String[]>([
   "reference",
   "refCommandNo",
   "refCommandDate",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** เปิด dialog */
@@ -296,7 +308,7 @@ async function uploadProfile(id: string) {
     )
     .then(async (res) => {
       uploadUrl.value = res.data["เอกสารหลักฐาน"].uploadUrl;
-      await uploadFileURL(uploadUrl.value, fileUpload.value,id);
+      await uploadFileURL(uploadUrl.value, fileUpload.value, id);
     })
     .catch((err) => {
       messageError($q, err);
@@ -308,7 +320,7 @@ async function uploadProfile(id: string) {
  * @param uploadUrl Path อัปโหลดไฟล์
  * @param file ไฟล์เอกสาร
  */
-async function uploadFileURL(uploadUrl: string, file: any,id:string) {
+async function uploadFileURL(uploadUrl: string, file: any, id: string) {
   await axios
     .put(uploadUrl, file, {
       headers: {
@@ -326,7 +338,7 @@ async function uploadFileURL(uploadUrl: string, file: any,id:string) {
     });
 }
 
-async function isUploadFn(id:string) {
+async function isUploadFn(id: string) {
   await http
     .patch(config.API.profileNewDutyByDutyId(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
@@ -479,8 +491,6 @@ onMounted(() => {
     :columns="columns"
     :rows="rows"
     :grid="mode === 'card'"
-    :paging="true"
-    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
     v-model:pagination="pagination"
   >
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 2219e213e..ba35091d3 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
@@ -135,8 +135,7 @@ const visibleColumns = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function fetch ข้อมูลประวติการแก้ไขข้อมูล*/
@@ -240,9 +239,7 @@ watch(modal, (status) => {
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
           v-model:pagination="historyPagination"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
         >
           >
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
index 2b584fb6a..b7ed1e294 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
@@ -55,6 +55,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "dateEnd",
@@ -65,6 +67,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "posNo",
@@ -74,6 +78,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "position",
@@ -83,6 +89,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "refCommandNo",
@@ -92,6 +100,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "refCommandNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "status",
@@ -104,6 +114,23 @@ const columns = ref<QTableProps["columns"]>([
     format(val, row) {
       return row.status ? "ใช้งาน" : "-";
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+
+  {
+    name: "lastUpdatedAt",
+    align: "left",
+    label: "วันที่แก้ไข",
+    sortable: true,
+    field: "lastUpdatedAt",
+    format: (v) => date2Thai(v, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<String[]>([
@@ -113,7 +140,11 @@ const visibleColumns = ref<String[]>([
   "position",
   "refCommandNo",
   "status",
+  "lastUpdatedAt",
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 /** Dialog*/
 const isStatusEdit = ref<boolean>(false);
@@ -310,9 +341,8 @@ onMounted(() => {
     dense
     :columns="columns"
     :rows="rows"
-    :paging="true"
-    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
+    v-model:pagination="pagination"
   >
     >
     <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPosHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPosHistory.vue
index 81ecb5897..1d780ed77 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPosHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPosHistory.vue
@@ -40,6 +40,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "dateEnd",
@@ -50,6 +52,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "posNo",
@@ -59,6 +63,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "position",
@@ -68,6 +74,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "status",
@@ -80,6 +88,8 @@ const columns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdateFullName",
@@ -89,6 +99,8 @@ const columns = ref<QTableProps["columns"]>([
     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",
@@ -99,6 +111,8 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v, false, true),
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<String[]>([
@@ -111,8 +125,7 @@ const visibleColumns = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function fetch ข้อมูลประวติการแก้ไขข้อมูล*/
@@ -202,9 +215,7 @@ watch(modal, (status) => {
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
           v-model:pagination="historyPagination"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
         >
           >
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index 3ff019b47..b28eedd98 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -58,6 +58,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "agency",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "dateStart",
@@ -68,6 +70,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "dateEnd",
@@ -78,6 +82,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "commandNo",
@@ -87,6 +93,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "commandNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "document",
@@ -96,6 +104,20 @@ const columns = ref<QTableProps["columns"]>([
     field: "document",
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<String[]>([
@@ -104,8 +126,13 @@ const visibleColumns = ref<String[]>([
   "dateEnd",
   "commandNo",
   "document",
+  "lastUpdatedAt",
 ]);
 
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
+
 /** Dialog*/
 const isStatusEdit = ref<boolean>(false);
 const isUpload = ref<boolean>(false);
@@ -405,9 +432,8 @@ onMounted(() => {
     dense
     :columns="columns"
     :rows="rows"
-    :paging="true"
-    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
+    v-model:pagination="pagination"
   >
     >
     <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernmentHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernmentHistory.vue
index 8f352f7b2..15f94a0f7 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernmentHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernmentHistory.vue
@@ -39,6 +39,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "agency",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "dateStart",
@@ -49,6 +51,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "dateEnd",
@@ -59,6 +63,8 @@ const columns = ref<QTableProps["columns"]>([
     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: "commandNo",
@@ -68,6 +74,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "commandNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "document",
@@ -77,6 +85,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "document",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdateFullName",
@@ -86,6 +96,8 @@ const columns = ref<QTableProps["columns"]>([
     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",
@@ -96,6 +108,8 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v, false, true),
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<String[]>([
@@ -108,8 +122,7 @@ const visibleColumns = ref<String[]>([
   "lastUpdatedAt",
 ]);
 const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function fetch ข้อมูลประวติการแก้ไขข้อมูล*/
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 59db59ad3..b37621bfb 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -68,6 +68,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "amount",
@@ -78,6 +82,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionSalaryAmount",
@@ -88,6 +96,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "mouthSalaryAmount",
@@ -98,6 +110,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 
   {
@@ -115,6 +131,10 @@ const baseColumns = ref<QTableProps["columns"]>([
         ? row.posNo
         : "-";
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionName",
@@ -124,6 +144,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionType",
@@ -133,6 +157,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionType",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionLevel",
@@ -151,6 +179,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "commandName",
@@ -160,6 +190,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "commandName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "refCommandNo",
@@ -174,6 +206,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "remark",
@@ -183,6 +217,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "remark",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const columns = computed(() => {
@@ -211,8 +247,7 @@ const visibleColumns = ref<string[]>([
   "remark",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "",
 });
 
 const formDataSalary = reactive<FormSalaryNew>({
@@ -729,9 +764,7 @@ onMounted(() => {
     dense
     :columns="columns"
     :rows="rows"
-    :paging="true"
     v-model:pagination="pagination"
-    :rows-per-page-options="[10, 20, 50, 100]"
     :visible-columns="visibleColumns"
   >
     <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
index 13fe3671b..efd42c67b 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
@@ -42,6 +42,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "amount",
@@ -52,6 +56,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionSalaryAmount",
@@ -62,6 +70,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "mouthSalaryAmount",
@@ -72,6 +84,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "oc",
@@ -81,6 +97,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "oc",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionName",
@@ -90,6 +108,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "posNo",
@@ -106,6 +126,8 @@ const baseColumns = ref<QTableProps["columns"]>([
         ? row.posNo
         : "-";
     },
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionLine",
@@ -115,6 +137,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionLine",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionPathSide",
@@ -124,6 +148,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionPathSide",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionType",
@@ -133,6 +159,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     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",
@@ -151,6 +179,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionExecutive",
@@ -160,6 +190,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     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",
@@ -169,6 +201,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionExecutiveSide",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "salaryClass",
@@ -178,6 +212,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "salaryClass",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "commandName",
@@ -187,6 +223,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "commandName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "refCommandNo",
@@ -201,6 +239,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "remark",
@@ -210,6 +250,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "remark",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdateFullName",
@@ -219,6 +261,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     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",
@@ -229,6 +273,8 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v, false, true),
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<string[]>([
@@ -265,20 +311,14 @@ const columns = computed(() => {
   return baseColumns.value;
 });
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function fetch ข้อมูลประวัติการแก้ไข*/
 function fetchListHistory() {
   showLoader();
   http
-    .get(
-      config.API.profileListSalaryHistoryNew(
-        salaryId.value,
-        empType.value
-      )
-    )
+    .get(config.API.profileListSalaryHistoryNew(salaryId.value, empType.value))
     .then((res) => {
       rows.value = res.data.result;
       rowsMain.value = res.data.result;
@@ -364,9 +404,7 @@ watch(
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
           v-model:pagination="pagination"
-          :rows-per-page-options="[10, 20, 50, 100]"
           :visible-columns="visibleColumns"
         >
           <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
index 969282d7d..6f957d53b 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -61,6 +61,8 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px; width: 50px;",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "detail",
@@ -73,11 +75,22 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
-const visibleColumns = ref<String[]>(["date", "detail"]);
+const visibleColumns = ref<String[]>(["date", "detail", "lastUpdatedAt"]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** fetch รายการข้อมูลอื่นๆ*/
@@ -285,9 +298,7 @@ onMounted(() => {
     flat
     :card-container-class="mode === 'card' ? 'q-col-gutter-md' : ''"
     :grid="mode === 'card'"
-    :paging="true"
     :visible-columns="visibleColumns"
-    :rows-per-page-options="[10, 25, 50, 100]"
   >
     <template v-slot:header="props">
       <q-tr :props="props">
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 529454365..a599feb76 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
@@ -42,6 +42,8 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px; width: 50px;",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "detail",
@@ -84,6 +86,9 @@ const visibleColumns = ref<String[]>([
   "lastUpdateFullName",
   "lastUpdatedAt",
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 /** ฟังก์ชันดึงข้อมูลประวัติการแก่ไขข้อมูล*/
 function getHistory() {
@@ -179,9 +184,8 @@ watch(modal, (status) => {
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
+          v-model:pagination="pagination"
         >
           >
           <template v-slot:header="props">
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 e669de283..9915ecf7b 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -232,18 +232,18 @@ const columnsHistory = ref<QTableColumn[]>([
       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,
@@ -269,14 +269,11 @@ const visibleColumnsHistory = ref<String[]>([
   "ethnicity",
   "religion",
   "phone",
-  "createdFullName",
-  "createdAt",
+  "lastUpdateFullName",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
-  sortBy: "createdAt",
-  descending: true,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function เรียกข้อมูลข้อมูลส่วนตัว*/
@@ -917,9 +914,8 @@ onMounted(() => {
           :columns="columnsHistory"
           :rows="rowsHistory"
           class="custom-header-table"
-          v-model:pagination="pagination"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumnsHistory"
+          v-model:pagination="pagination"
         >
           >
           <template v-slot:header="props">
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 e297e5529..54fc1443b 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -159,13 +159,13 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
   "lastUpdatedAt",
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
+
 const uploadUrl = ref<string>("");
 const subId = ref<string>("");
 const fileUpload = ref<File>();
-const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
-});
 
 /** ฟังก์ชันดึงข้อมูลส่วนตัว*/
 async function fetchDataPersonal() {
@@ -510,12 +510,11 @@ onMounted(async () => {
     virtual-scroll
     ref="table"
     v-bind="attrs"
-    v-model:pagination="pagination"
     :rows="rows"
     :columns="columns"
-    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
     :virtual-scroll-sticky-size-start="48"
+    v-model:pagination="pagination"
   >
     <template v-slot:header="props">
       <q-tr :props="props">
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 7d6f48a19..4aa8531f5 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
@@ -16,6 +16,7 @@ import type { RequestObject } from "@/modules/04_registryPerson/interface/reques
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
+
 const $q = useQuasar();
 const store = useAddressDataStore();
 const mixin = useCounterMixin();
@@ -93,7 +94,6 @@ const visibleColumnsHistory = ref<String[]>([
   "registrationDistrict",
   "registrationProvince",
   "registrationSame",
-
   "registrationSubDistrict",
   "registrationZipCode",
   "lastUpdateFullName",
@@ -252,6 +252,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 /**
  * ฟังก์ชันดึงข้อมูลที่อยู่
@@ -945,9 +948,8 @@ onMounted(async () => {
           dense
           :columns="columnsHistory"
           :rows="rowsHistory"
-          :paging="true"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumnsHistory"
+          v-model:pagination="pagination"
         >
           >
           <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
index a0ae70782..efed70aa5 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -43,6 +43,8 @@ const profileId = ref<string>(
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
 /** TableHisoty*/
+const rows = ref<any[]>([]);
+const rowsMain = ref<any[]>([]);
 const visibleColumns = ref<String[]>([
   "statusMarital",
   "citizenId",
@@ -149,8 +151,9 @@ const columns = ref<QTableProps["columns"]>([
     format: (val) => date2Thai(val, false, true),
   },
 ]);
-const rows = ref<any[]>([]);
-const rowsMain = ref<any[]>([]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 /** ข้อมูล*/
 const fatherData = reactive<FormPerson>({
@@ -739,7 +742,9 @@ onMounted(async () => {
             </div>
           </div>
           <div class="row items-start">
-            <div class="col-2 text-grey-6 text-weight-medium">ชื่อ - นามสกุล</div>
+            <div class="col-2 text-grey-6 text-weight-medium">
+              ชื่อ - นามสกุล
+            </div>
             <div class="col-6">
               {{
                 coupleData.prefix || coupleData.firstName || coupleData.lastName
@@ -1138,9 +1143,8 @@ onMounted(async () => {
                 )
           "
           :rows="rows"
-          :paging="true"
-          :rows-per-page-options="[10, 25, 50, 100]"
           :visible-columns="visibleColumns"
+          v-model:pagination="pagination"
         >
           >
           <template v-slot:header="props">
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 e9c5e8c7f..232f1f0ea 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -229,6 +229,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "educationLevel",
@@ -246,10 +258,10 @@ const visibleColumns = ref<string[]>([
   "startDate",
   "finishDate",
   "note",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** Table ประวัติแก้ไขประวัติการศึกษา*/
@@ -458,7 +470,6 @@ const historyColumns = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
-
 const historyVisibleColumns = ref<string[]>([
   "educationLevel",
   "institute",
@@ -478,9 +489,8 @@ const historyVisibleColumns = ref<string[]>([
   "lastUpdateFullName",
   "lastUpdatedAt",
 ]);
-const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+const paginationHistory = ref({
+  sortBy: "lastUpdatedAt",
 });
 
 const editId = ref<string>(""); //id ที่ต้องการแก้ไข
@@ -878,10 +888,10 @@ onMounted(async () => {
     bordered
     :paging="true"
     dense
-    v-model:pagination="pagination"
-    :rows-per-page-options="[20, 50, 100]"
     class="custom-header-table"
     :visible-columns="visibleColumns"
+    v-model:pagination="pagination"
+
   >
     <template v-slot:header="props">
       <q-tr :props="props">
@@ -1528,10 +1538,9 @@ onMounted(async () => {
           bordered
           :paging="true"
           dense
-          v-model:pagination="historyPagination"
-          :rows-per-page-options="[20, 50, 100]"
           class="custom-header-table"
           :visible-columns="historyVisibleColumns"
+          v-model:pagination="paginationHistory"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
@@ -1556,7 +1565,11 @@ onMounted(async () => {
     </q-card>
   </q-dialog>
 
-  <DialogSortEducation v-model:modal="modalSort" :data-sort="dataSort" :fetch-data="fetchData"/>
+  <DialogSortEducation
+    v-model:modal="modalSort"
+    :data-sort="dataSort"
+    :fetch-data="fetchData"
+  />
 </template>
 
 <style scoped>
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 d5adc6b29..a3ed7b809 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -98,13 +98,29 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "field",
   "detail",
   "remark",
   "reference",
+  "lastUpdatedAt",
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 const dialog = ref<boolean>(false); //แสดง popup ข้อมูลความสามารถพิเศษ
 const dialogStatus = ref<string>("create"); ////สถานะข้อมูลความสามารถพิเศษ
@@ -191,6 +207,9 @@ const historyVisibleColumns = ref<string[]>([
   "lastUpdateFullName",
   "lastUpdatedAt",
 ]);
+const historyPagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 //ฟอร์มข้อมูลความสามารถพิเศษ
 const specialSkill = reactive<RequestItemsObject>({
@@ -203,16 +222,6 @@ const specialSkill = reactive<RequestItemsObject>({
   dateEnd: null,
 });
 
-const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
-});
-
-const historyPagination = ref({
-  page: 1,
-  rowsPerPage: 10,
-});
-
 /** function ยืนยันการบันทึกข้อมูล*/
 function onSubmit() {
   dialogConfirm(
@@ -570,10 +579,8 @@ onMounted(() => {
     dense
     :columns="columns"
     :rows="rows"
-    :paging="true"
-    v-model:pagination="pagination"
-    :rows-per-page-options="[20, 50, 100]"
     :visible-columns="visibleColumns"
+    v-model:pagination="pagination"
   >
     <template v-slot:header="props">
       <q-tr :props="props">
@@ -911,10 +918,7 @@ onMounted(() => {
           row-key="name"
           flat
           bordered
-          :paging="true"
           dense
-          v-model:pagination="historyPagination"
-          :rows-per-page-options="[20, 50, 100]"
           class="custom-header-table"
           :visible-columns="historyVisibleColumns"
         >
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index fab4a6c31..d7c563b12 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -68,6 +68,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "amount",
@@ -78,6 +82,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionSalaryAmount",
@@ -88,6 +96,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "mouthSalaryAmount",
@@ -98,6 +110,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 
   {
@@ -115,6 +131,10 @@ const baseColumns = ref<QTableProps["columns"]>([
         ? row.posNo
         : "-";
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionName",
@@ -124,6 +144,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionType",
@@ -133,6 +157,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionType",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionLevel",
@@ -151,6 +179,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "commandName",
@@ -160,6 +192,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "commandName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "refCommandNo",
@@ -174,6 +210,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "remark",
@@ -183,6 +223,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "remark",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const columns = computed(() => {
@@ -211,8 +255,7 @@ const visibleColumns = ref<string[]>([
   "remark",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "",
 });
 
 const formDataSalary = reactive<FormSalaryNew>({
@@ -727,9 +770,7 @@ onMounted(() => {
     dense
     :columns="columns"
     :rows="rows"
-    :paging="true"
     v-model:pagination="pagination"
-    :rows-per-page-options="[10, 20, 50, 100]"
     :visible-columns="visibleColumns"
   >
     <template v-slot:header="props">
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 383c3305a..922327546 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
@@ -42,6 +42,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "amount",
@@ -52,6 +56,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionSalaryAmount",
@@ -62,6 +70,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "mouthSalaryAmount",
@@ -72,6 +84,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     format: (v) => Number(v).toLocaleString(),
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "oc",
@@ -81,6 +97,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "oc",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionName",
@@ -90,6 +110,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "posNo",
@@ -106,6 +130,10 @@ const baseColumns = ref<QTableProps["columns"]>([
         ? row.posNo
         : "-";
     },
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionLine",
@@ -115,6 +143,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionLine",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionPathSide",
@@ -124,6 +156,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionPathSide",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionType",
@@ -133,6 +169,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionType",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionLevel",
@@ -151,6 +191,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionExecutive",
@@ -160,6 +204,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionExecutive",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "positionExecutiveSide",
@@ -169,6 +217,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "positionExecutiveSide",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "salaryClass",
@@ -178,6 +230,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "salaryClass",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "commandName",
@@ -187,6 +243,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "commandName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "refCommandNo",
@@ -201,6 +261,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "remark",
@@ -210,6 +274,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "remark",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdateFullName",
@@ -219,6 +287,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "lastUpdateFullName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdatedAt",
@@ -229,6 +301,10 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (v) => date2Thai(v, false, true),
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
 const visibleColumns = ref<string[]>([
@@ -265,8 +341,7 @@ const columns = computed(() => {
   return baseColumns.value;
 });
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** function fetch ข้อมูลประวัติการแก้ไข*/
@@ -359,9 +434,7 @@ watch(
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
           v-model:pagination="pagination"
-          :rows-per-page-options="[10, 20, 50, 100]"
           :visible-columns="visibleColumns"
         >
           <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
index 7b4ccb5f7..6f4ec108d 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
@@ -115,6 +115,18 @@ const columns = ref<QTableProps["columns"]>([
     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, false, true),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "date",
@@ -122,10 +134,10 @@ const visibleColumns = ref<string[]>([
   "reference",
   "refCommandNo",
   "refCommandDate",
+  "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** funciton ยืนยันการบันทึกข้อมูล*/
@@ -315,13 +327,11 @@ onMounted(() => {
     flat
     bordered
     dense
+    :grid="modelView === 'card'"
     :columns="columns"
     :rows="rows"
-    :paging="true"
     v-model:pagination="pagination"
-    :rows-per-page-options="[20, 50, 100]"
     :visible-columns="visibleColumns"
-    :grid="modelView === 'card'"
   >
     <template v-slot:header="props">
       <q-tr :props="props">
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 d557faba4..ae6fbd6ee 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
@@ -124,8 +124,7 @@ const visibleColumns = ref<string[]>([
   "lastUpdatedAt",
 ]);
 const pagination = ref({
-  page: 1,
-  rowsPerPage: 10,
+  sortBy: "lastUpdatedAt",
 });
 
 /** fetch รายการข้อมูลประวัติการแก้ไช*/
@@ -219,9 +218,7 @@ watch(modal, (status) => {
           dense
           :columns="columns"
           :rows="rows"
-          :paging="true"
           v-model:pagination="pagination"
-          :rows-per-page-options="[20, 50, 100]"
           :visible-columns="visibleColumns"
         >
           <template v-slot:header="props">
diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index de163405f..b53f6ff4b 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -53,6 +53,7 @@ const expanded = ref<string[]>([]); //แสดงข้อมูลในโค
 
 const selectNode = ref<boolean>(false); //แสดงโครงสร้าง
 
+const isLoad = ref<boolean>(false); //โหลดข้อมูลโครงสร้าง
 const nodeData = reactive<DataNodeData>({
   name: "เลือกหน่วยงาน/ส่วนราชการ",
   nodeId: null,
@@ -338,7 +339,6 @@ function clearSelect(t: string) {
   fetchDataPerson();
 }
 
-const isLoad = ref<boolean>(false); //โหลดข้อมูลโครงสร้าง
 /**
  * ฟังก์ชันดึงข้อโครงสร้าง
  */
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index e320a6c5d..1108e0ae8 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -201,9 +201,7 @@ const visibleColumns = ref<String[]>([
   "dateAppoint",
 ]);
 
-/**
- * ฟังก์ชันดึงข้อมูลรายชื่อลูกจ้างชั่วคราว
- */
+/** ฟังก์ชันดึงข้อมูลรายชื่อลูกจ้างชั่วคราว*/
 async function fetchList() {
   showLoader();
   await http
@@ -256,24 +254,21 @@ function redirectToPageDetail(id: string) {
   router.push(`/registry-temp/${id}`);
 }
 
-/**
- * ฟังก์ชันเปิด popup เพิ่มข้อมูลลูกจ้างชั่วคราว
- */
+/** ฟังก์ชันเปิด popup เพิ่มข้อมูลลูกจ้างชั่วคราว*/
 function onClickAddEmployee() {
   modalAddEmployee.value = true;
 }
 
 /**
  * ฟังก์ชันเปิด popup เลือกหน่วยงานที่รับบรรจุ
+ * @param data ข้อมูลลูกจ้างชั่วคราว
  */
 function onClickSelectPos(data: DataEmployee) {
   modalPos.value = true;
   dataRow.value = data;
 }
 
-/**
- * ฟังก์ชันเปิด popup ส่งรายชื่อไปออกคำสั่ง
- */
+/** ฟังก์ชันเปิด popup ส่งรายชื่อไปออกคำสั่ง*/
 function onClickSendOrder() {
   modalSendOrder.value = true;
 }
@@ -287,9 +282,7 @@ function updatePagination(newPagination: NewPagination) {
   queryParams.pageSize = newPagination.rowsPerPage;
 }
 
-/**
- * ทำงานเมื่อมีการเปลี่่ยนจำนวนข้อมูลต่อหน้า
- */
+/** ทำงานเมื่อมีการเปลี่่ยนจำนวนข้อมูลต่อหน้า*/
 watch(
   () => queryParams.pageSize,
   () => {
@@ -297,8 +290,7 @@ watch(
   }
 );
 
-/**
- * ทำงานเมื่อมีการเรียกใข้ Components
+/** ทำงานเมื่อมีการเรียกใข้ Components
  */
 onMounted(async () => {
   await fetchList();

From 4ead92475dd925ef6cd38ceade8c8414ce8753af Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Feb 2025 15:51:32 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=A3=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=20=20=3D=3D>=20sortTable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../requestEdit/01_TabInformation.vue          | 10 +++++-----
 .../components/requestEdit/02_TabIDP.vue       | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue b/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue
index 0255606fc..f5e48277c 100644
--- a/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue
@@ -35,7 +35,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "createdAt",
     align: "left",
     label: "วันที่ยื่นขอ",
-    sortable: true,
+    sortable: false,
     field: "createdAt",
     format: (v) => (v ? date2Thai(v, false, true) : "-"),
     headerStyle: "font-size: 14px",
@@ -54,7 +54,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "topic",
     align: "left",
     label: "ชื่อเรื่อง",
-    sortable: true,
+    sortable: false,
     field: "topic",
     format: (v) => (v ? v : "-"),
     headerStyle: "font-size: 14px",
@@ -64,7 +64,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "detail",
     align: "left",
     label: "รายละเอียด",
-    sortable: true,
+    sortable: false,
     field: "detail",
     format: (v) => (v ? v : "-"),
     headerStyle: "font-size: 14px",
@@ -83,7 +83,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "status",
     align: "left",
     label: "สถานะคำร้อง",
-    sortable: true,
+    sortable: false,
     field: "status",
     format: (v) => store.convertStatus(v),
     headerStyle: "font-size: 14px",
@@ -93,7 +93,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "remark",
     align: "left",
     label: "หมายเหตุ",
-    sortable: true,
+    sortable: false,
     field: "remark",
     format: (v) => (v ? v : "-"),
     headerStyle: "font-size: 14px",
diff --git a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
index f7c558696..716ebd786 100644
--- a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
@@ -38,7 +38,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "createdAt",
     align: "left",
     label: "วันที่ยื่นขอ",
-    sortable: true,
+    sortable: false,
     field: "createdAt",
     format: (v) => (v ? date2Thai(v, false, true) : "-"),
     headerStyle: "font-size: 14px",
@@ -48,7 +48,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "createdFullName",
     align: "left",
     label: "ผู้ยื่นขอ",
-    sortable: true,
+    sortable: false,
     field: "createdFullName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -57,7 +57,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "name",
     align: "left",
     label: "ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -66,7 +66,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "developmentProjects",
     align: "left",
     label: "วิธีการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentProjects",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "developmentTarget",
     align: "left",
     label: "เป้าหมายการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentTarget",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -84,7 +84,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "developmentResults",
     align: "left",
     label: "วิธีการวัดผลการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentResults",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -93,7 +93,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "developmentReport",
     align: "left",
     label: "รายงานผลการพัฒนา",
-    sortable: true,
+    sortable: false,
     field: "developmentReport",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -111,7 +111,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "status",
     align: "left",
     label: "สถานะคำร้อง",
-    sortable: true,
+    sortable: false,
     field: "status",
     format: (v) => store.convertStatusIDP(v),
     headerStyle: "font-size: 14px",
@@ -121,7 +121,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "reason",
     align: "left",
     label: "หมายเหตุ",
-    sortable: true,
+    sortable: false,
     field: "reason",
     format: (v) => (v ? v : "-"),
     headerStyle: "font-size: 14px",

From a6df50d483e81178f062575d0697ea8ea5513db5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Feb 2025 15:53:47 +0700
Subject: [PATCH 4/5] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7=20=3D=3D>=20sorttable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogSendOrder.vue            | 20 ++++++++---------
 .../08_registryEmployee/views/Main.vue        | 22 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/modules/08_registryEmployee/components/DialogSendOrder.vue b/src/modules/08_registryEmployee/components/DialogSendOrder.vue
index 9dcfceb1b..07e338c05 100644
--- a/src/modules/08_registryEmployee/components/DialogSendOrder.vue
+++ b/src/modules/08_registryEmployee/components/DialogSendOrder.vue
@@ -54,7 +54,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "citizenId",
     align: "left",
     label: "เลขประจำตัวประชาชน",
-    sortable: true,
+    sortable: false,
     field: "citizenId",
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
@@ -63,7 +63,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "fullname",
     align: "left",
     label: "ชื่อ-นามสกุล",
-    sortable: true,
+    sortable: false,
     field: "fullname",
     format(val, row) {
       return `${row.prefix}${row.firstName} ${row.lastName}`;
@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "draftOrganizationOrganization",
     align: "left",
     label: "หน่วยงานที่รับการบรรจุ",
-    sortable: true,
+    sortable: false,
     field: "draftOrganizationOrganization",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -85,7 +85,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "govAge",
     align: "left",
     label: "อายุราชการ(ปี)",
-    sortable: true,
+    sortable: false,
     field: "govAge",
     format(val) {
       return val;
@@ -97,7 +97,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateEmployment",
     align: "left",
     label: "วันที่จ้าง",
-    sortable: true,
+    sortable: false,
     field: "dateEmployment",
     format: (val) => date2Thai(val),
     headerStyle: "font-size: 14px",
@@ -108,7 +108,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "salaryDate",
     align: "left",
     label: "วันที่แต่งตั้ง",
-    sortable: true,
+    sortable: false,
     field: "salaryDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -117,7 +117,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "age",
     align: "left",
     label: "อายุ",
-    sortable: true,
+    sortable: false,
     field: "age",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -126,7 +126,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "createdAt",
     align: "left",
     label: "วันที่สร้าง",
-    sortable: true,
+    sortable: false,
     field: "createdAt",
     format(val) {
       return date2Thai(val);
@@ -138,7 +138,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateRetireLaw",
     align: "left",
     label: "วันที่พ้นราชการ",
-    sortable: true,
+    sortable: false,
     field: "dateRetireLaw",
     format(val) {
       return date2Thai(val);
@@ -150,7 +150,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "statustext",
     align: "left",
     label: "สถานะ",
-    sortable: true,
+    sortable: false,
     field: "statustext",
     format(val, row) {
       return statusText(row.draftOrgEmployeeStatus);
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 1108e0ae8..80b25ec3a 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -71,7 +71,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "citizenId",
     align: "left",
     label: "เลขประจำตัวประชาชน",
-    sortable: true,
+    sortable: false,
     field: "citizenId",
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
@@ -80,7 +80,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "fullname",
     align: "left",
     label: "ชื่อ-นามสกุล",
-    sortable: true,
+    sortable: false,
     field: "fullname",
     format(val, row) {
       return `${row.prefix}${row.firstName}  ${row.lastName}`;
@@ -92,7 +92,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "draftOrganizationOrganization",
     align: "left",
     label: "หน่วยงานที่รับการบรรจุ",
-    sortable: true,
+    sortable: false,
     field: "draftOrganizationOrganization",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -101,7 +101,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "draftPositionEmployee",
     align: "left",
     label: "หน่วยงานที่บรรจุ",
-    sortable: true,
+    sortable: false,
     field: "draftPositionEmployee",
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
@@ -111,7 +111,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "govAge",
     align: "left",
     label: "อายุราชการ(ปี)",
-    sortable: true,
+    sortable: false,
     field: "govAge",
     format(val) {
       return val;
@@ -123,7 +123,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateEmployment",
     align: "left",
     label: "วันที่จ้าง",
-    sortable: true,
+    sortable: false,
     field: "dateEmployment",
     format: (val) => date2Thai(val),
     headerStyle: "font-size: 14px",
@@ -134,7 +134,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateAppoint",
     align: "left",
     label: "วันที่แต่งตั้ง",
-    sortable: true,
+    sortable: false,
     field: "dateAppoint",
     headerStyle: "font-size: 14px",
     format: (val) => date2Thai(val),
@@ -144,7 +144,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "age",
     align: "left",
     label: "อายุ",
-    sortable: true,
+    sortable: false,
     field: "age",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -153,7 +153,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "createdAt",
     align: "left",
     label: "วันที่สร้าง",
-    sortable: true,
+    sortable: false,
     field: "createdAt",
     format(val) {
       return date2Thai(val);
@@ -165,7 +165,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "dateRetireLaw",
     align: "left",
     label: "วันที่พ้นราชการ",
-    sortable: true,
+    sortable: false,
     field: "dateRetireLaw",
     format(val) {
       return date2Thai(val);
@@ -177,7 +177,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "statustext",
     align: "left",
     label: "สถานะ",
-    sortable: true,
+    sortable: false,
     field: "statustext",
     format(val, row) {
       return statusText(row.draftOrgEmployeeStatus);

From b7ed1e659f64a4d2b7f2d7cf3531cc9c649e06ac Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 25 Feb 2025 16:46:42 +0700
Subject: [PATCH 5/5] =?UTF-8?q?=E0=B8=A2=E0=B8=B7=E0=B8=A1-=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=99=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogHistoryPos.vue           | 29 ++++++++++--
 src/modules/07_insignia/storeBrrow.ts         | 47 ++++++++++---------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 675956f26..b0fb0fc32 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -55,6 +55,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "fullname",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "orgShortName",
@@ -64,6 +66,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "orgShortName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "posMasterNoPrefix",
@@ -73,6 +77,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "posMasterNoPrefix",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "posMasterNo",
@@ -82,6 +88,10 @@ const columns = ref<QTableProps["columns"]>([
     field: "posMasterNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "posMasterNoSuffix",
@@ -91,6 +101,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "posMasterNoSuffix",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "position",
@@ -100,6 +112,8 @@ const columns = ref<QTableProps["columns"]>([
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "posType",
@@ -120,6 +134,8 @@ const columns = ref<QTableProps["columns"]>([
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 
   {
@@ -133,19 +149,27 @@ const columns = ref<QTableProps["columns"]>([
     format(val, row) {
       return !val ? "-" : val;
     },
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "lastUpdatedAt",
     align: "left",
     label: "วันที่แก้ไข",
     field: "lastUpdatedAt",
+    sortable: true,
     format(val, row) {
       return date2Thai(val);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
 
 /**
  *  function เรียกข้อมูลประวัติตำแหน่ง
@@ -167,9 +191,7 @@ function fetchHistoryPos(id: string) {
     });
 }
 
-/**
- * ดูการเปลี่ยนแปลง  modal เมื่อเป็น true จะเรียกเรียกข้อมูลประวัติตำแหน่ง
- */
+/** ดูการเปลี่ยนแปลง  modal เมื่อเป็น true จะเรียกเรียกข้อมูลประวัติตำแหน่ง*/
 watch(
   () => modal.value,
   () => {
@@ -198,6 +220,7 @@ watch(
           :columns="columns"
           row-key="id"
           no-data-label="ไม่มีข้อมูล"
+          v-model:pagination="pagination"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
diff --git a/src/modules/07_insignia/storeBrrow.ts b/src/modules/07_insignia/storeBrrow.ts
index 49f188c95..03a02de09 100644
--- a/src/modules/07_insignia/storeBrrow.ts
+++ b/src/modules/07_insignia/storeBrrow.ts
@@ -69,31 +69,31 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
     rows.value = [];
     let list = await data.map((e: any) => ({
       id: e.id,
-      citizenId: e.citizenId,
-      prefix: e.prefix,
-      position: e.position,
-      status: status(e.status),
-      name: e.fullName,
+      citizenId: e.citizenId ? e.citizenId : "-",
+      prefix: e.prefix ? e.prefix : "",
+      position: e.position ? e.position : "-",
+      status: e.status ? status(e.status) : "-",
+      name: e.fullName ? e.fullName : "-",
       type: `${e.requestInsignia} (${
         type.value.find((item) => item.name === e.requestInsignia)?.shortName ||
-        ""
+        "-"
       })`,
-      requestInsigniaId: e.requestInsigniaId,
-      employeeType: profileType(e.profileType),
-      profileType: e.profileType,
-      dateReceive: date2Thai(e.dateReceive),
-      date: date2Thai(e.date),
-      volumeNo: e.volumeNo,
-      section: e.section,
-      page: e.page,
-      number: e.no,
-      vatnumber: e.number,
-      datepay: date2Thai(e.datePayment),
-      typepay: e.typePayment,
-      address: e.address,
-      borrowOrganization: e.borrowOrganization,
+      requestInsigniaId: e.requestInsigniaId ? e.requestInsigniaId : "-",
+      employeeType: e.profileType ? profileType(e.profileType) : "-",
+      profileType: e.profileType ? e.profileType : "-",
+      dateReceive: e.dateReceive ? date2Thai(e.dateReceive) : "-",
+      date: e.date ? date2Thai(e.date) : "-",
+      volumeNo: e.volumeNo ? e.volumeNo : "-",
+      section: e.section ? e.section : "-",
+      page: e.page ? e.page : "-",
+      number: e.no ? e.no : "-",
+      vatnumber: e.number ? e.number : "-",
+      datepay: e.datePayment ? date2Thai(e.datePayment) : "-",
+      typepay: e.typePayment ? e.typePayment : "-",
+      address: e.address ? e.address : "-",
+      borrowOrganization: e.borrowOrganization ? e.borrowOrganization : "-",
       borrowDate: e.borrowDate !== null ? date2Thai(e.borrowDate) : "-",
-      returnOrganization: e.returnOrganization,
+      returnOrganization: e.returnOrganization ? e.returnOrganization : "-",
       returnDate: e.returnDate !== null ? date2Thai(e.returnDate) : "-",
       returnReason: e.returnReason !== null ? e.returnReason : "-",
     }));
@@ -148,11 +148,14 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
    * @param val สถานภาพ
    */
   function profileType(val: string) {
-    switch (val) {
+    const newVal = val.toLocaleLowerCase();
+    switch (newVal) {
       case "officer":
         return "ข้าราชการ กทม.สามัญ";
       case "employee":
         return "ลูกจ้างประจำ";
+      default:
+        return "-";
     }
   }
   return {