diff --git a/src/components/Table.vue b/src/components/Table.vue
index 9434aae28..26a346b6b 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -13,7 +13,7 @@
     :rows-per-page-options="[10, 25, 50, 100]"
   >
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ attrs.rows.length }} รายการ
+      ทั้งหมด {{ attrs.rows.length.toLocaleString() }} รายการ
       <q-pagination
         v-model="pagination.page"
         active-color="primary"
diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 166f9348d..fb56e2611 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -926,7 +926,7 @@ watch(
         </q-tr>
       </template>
       <template v-slot:pagination="scope">
-        ทั้งหมด {{ totalData }} รายการ
+        ทั้งหมด {{ totalData.toLocaleString() }} รายการ
         <q-pagination
           v-model="reqMaster.page"
           active-color="primary"
diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index eb6b24851..01ad53316 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -538,7 +538,7 @@ onMounted(() => {
       </div>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ props.total }} รายการ
+      ทั้งหมด {{ props.total.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
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 7fb80f998..d1267fcb7 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -843,7 +843,7 @@ onMounted(async () => {
             @update:pagination="updatePaginationIdp"
           >
             <template v-slot:pagination="scope">
-              ทั้งหมด {{ totalIdp }} รายการ
+              ทั้งหมด {{ totalIdp.toLocaleString() }} รายการ
               <q-pagination
                 v-model="paginationIdp.page"
                 active-color="primary"
diff --git a/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue b/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue
index ebd41c777..e2012b4ba 100644
--- a/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue
@@ -303,7 +303,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ rowsTotal }} รายการ
+          ทั้งหมด {{ rowsTotal.toLocaleString() }} รายการ
           <q-pagination
             v-model="page"
             active-color="primary"
diff --git a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
index b9e87fb87..d69d4d60d 100644
--- a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
@@ -420,7 +420,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ rowsTotal }} รายการ
+          ทั้งหมด {{ rowsTotal.toLocaleString() }} รายการ
           <q-pagination
             v-model="page"
             active-color="primary"
diff --git a/src/modules/04_registryPerson/views/edit/list.vue b/src/modules/04_registryPerson/views/edit/list.vue
index 4bb2f2b2d..4b1ab8e33 100644
--- a/src/modules/04_registryPerson/views/edit/list.vue
+++ b/src/modules/04_registryPerson/views/edit/list.vue
@@ -491,7 +491,7 @@ onMounted(async () => {
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ total }} รายการ
+          ทั้งหมด {{ total.toLocaleString() }} รายการ
           <q-pagination
             v-model="filter.page"
             active-color="primary"
diff --git a/src/modules/05_placement/components/PersonalList/TableView.vue b/src/modules/05_placement/components/PersonalList/TableView.vue
index 568e9c2f4..a9245d0ea 100644
--- a/src/modules/05_placement/components/PersonalList/TableView.vue
+++ b/src/modules/05_placement/components/PersonalList/TableView.vue
@@ -332,7 +332,7 @@ function filterSelector(val: string, update: Function) {
       v-model:pagination="pagination"
     >
       <template v-slot:pagination="scope">
-        ทั้งหมด {{ attrs.rows.length }} รายการ
+        ทั้งหมด {{ attrs.rows.length.toLocaleString() }} รายการ
         <q-pagination
           v-model="pagination.page"
           active-color="primary"
diff --git a/src/modules/05_placement/components/probation/DialogOrder.vue b/src/modules/05_placement/components/probation/DialogOrder.vue
index c9939f2b7..f376b37e2 100644
--- a/src/modules/05_placement/components/probation/DialogOrder.vue
+++ b/src/modules/05_placement/components/probation/DialogOrder.vue
@@ -392,7 +392,7 @@ watch(
                 </q-tr>
               </template>
               <template v-slot:pagination="scope">
-                ทั้งหมด {{ total }} รายการ
+                ทั้งหมด {{ total.toLocaleString() }} รายการ
                 <q-pagination
                   v-model="pagination.page"
                   active-color="primary"
diff --git a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
index 26a177290..b938bbf8a 100644
--- a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
+++ b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
@@ -725,7 +725,7 @@ onMounted(async () => {
                 @update:pagination="updatePagination"
               >
                 <template v-slot:pagination="scope">
-                  ทั้งหมด {{ total }} รายการ
+                  ทั้งหมด {{ total.toLocaleString() }} รายการ
                   <q-pagination
                     v-model="pagination.page"
                     active-color="primary"
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
index 4ace8f0cb..64791591d 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
@@ -259,7 +259,7 @@ watch(modal, (val) => {
                 </q-tr>
               </template>
               <template v-slot:pagination="scope">
-                ทั้งหมด {{ total }} รายการ
+                ทั้งหมด {{ total.toLocaleString() }} รายการ
                 <q-pagination
                   v-model="page"
                   active-color="primary"
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 3e1ef70dc..5127dc95a 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -637,7 +637,7 @@ onMounted(() => {
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            ทั้งหมด {{ total }} รายการ
+            ทั้งหมด {{ total.toLocaleString() }} รายการ
             <q-pagination
               v-model="pagination.page"
               active-color="primary"
@@ -803,7 +803,7 @@ onMounted(() => {
                 </q-tr>
               </template>
               <template v-slot:pagination="scope">
-                ทั้งหมด {{ rows2.length }} รายการ
+                ทั้งหมด {{ rows2.length.toLocaleString() }} รายการ
                 <q-pagination
                   v-model="formProbation.page"
                   active-color="primary"
diff --git a/src/modules/05_placement/components/probation/MainSurvey.vue b/src/modules/05_placement/components/probation/MainSurvey.vue
index d87412ebf..752a541eb 100644
--- a/src/modules/05_placement/components/probation/MainSurvey.vue
+++ b/src/modules/05_placement/components/probation/MainSurvey.vue
@@ -232,7 +232,7 @@ onMounted(async () => {
           @update:pagination="updatePagination"
         >
           <template v-slot:pagination="scope">
-            ทั้งหมด {{ total }} รายการ
+            ทั้งหมด {{ total.toLocaleString() }} รายการ
             <q-pagination
               v-model="pagination.page"
               active-color="primary"
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 245098a8c..cb72e5e57 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -1485,7 +1485,7 @@ onMounted(async () => {
                   </q-tr>
                 </template>
                 <template v-slot:pagination="scope">
-                  ทั้งหมด {{ total }} รายการ
+                  ทั้งหมด {{ total.toLocaleString() }} รายการ
                   <q-pagination
                     v-model="formFilter.page"
                     active-color="primary"
diff --git a/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue b/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue
index 95b5d6ed0..a611f252a 100644
--- a/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue
+++ b/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue
@@ -472,7 +472,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ totalList }} รายการ
+      ทั้งหมด {{ totalList.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
diff --git a/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue b/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue
index 801c49ae5..d6ef43154 100644
--- a/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue
+++ b/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue
@@ -440,7 +440,7 @@ onMounted(() => {
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ totalList }} รายการ
+      ทั้งหมด {{ totalList.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
index 22ace0b36..c0258c8c7 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
@@ -518,7 +518,7 @@ watch(
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ props.total }} รายการ
+      ทั้งหมด {{ props?.total?.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index 153ec2db1..62d0c10a1 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -552,7 +552,7 @@ function onClickViewInfo(type: string, id: string) {
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ props.total }} รายการ
+      ทั้งหมด {{ props?.total?.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index 74fe96c70..6026f3d12 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -527,7 +527,7 @@ watch(
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ props.total }} รายการ
+      ทั้งหมด {{ props?.total?.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index 3612e107c..56e46f822 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -568,7 +568,7 @@ watch(
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ props.total }} รายการ
+      ทั้งหมด {{ props.total?.toLocaleString() }} รายการ
       <q-pagination
         v-model="formFilter.page"
         active-color="primary"
diff --git a/src/modules/13_salary/views/01_salaryMain.vue b/src/modules/13_salary/views/01_salaryMain.vue
index efe688621..94db2813a 100644
--- a/src/modules/13_salary/views/01_salaryMain.vue
+++ b/src/modules/13_salary/views/01_salaryMain.vue
@@ -473,7 +473,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ total }} รายการ
+          ทั้งหมด {{ total?.toLocaleString() }} รายการ
           <q-pagination
             v-model="formQuery.page"
             active-color="primary"
diff --git a/src/modules/13_salary/views/03_salaryRound.vue b/src/modules/13_salary/views/03_salaryRound.vue
index 9d0df2222..1a6ecf35b 100644
--- a/src/modules/13_salary/views/03_salaryRound.vue
+++ b/src/modules/13_salary/views/03_salaryRound.vue
@@ -357,7 +357,7 @@ onMounted(async () => {
         @update:pagination="updatePageSize"
       >
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ totalList }} รายการ
+          ทั้งหมด {{ totalList?.toLocaleString() }} รายการ
           <q-pagination
             v-model="currentPage"
             active-color="primary"
diff --git a/src/modules/13_salary/views/page01_salaryRate.vue b/src/modules/13_salary/views/page01_salaryRate.vue
index 29cf649df..f9ddae054 100644
--- a/src/modules/13_salary/views/page01_salaryRate.vue
+++ b/src/modules/13_salary/views/page01_salaryRate.vue
@@ -395,7 +395,7 @@ onMounted(async () => {
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ totalRow }} รายการ
+          ทั้งหมด {{ totalRow?.toLocaleString() }} รายการ
           <q-pagination
             v-model="formQuery.page"
             active-color="primary"
diff --git a/src/modules/13_salary/views/page02_salaryEmployeeRate.vue b/src/modules/13_salary/views/page02_salaryEmployeeRate.vue
index 43bf30ea1..776b28914 100644
--- a/src/modules/13_salary/views/page02_salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/page02_salaryEmployeeRate.vue
@@ -325,7 +325,7 @@ onMounted(async () => {
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
-          ทั้งหมด {{ totalList }} รายการ
+          ทั้งหมด {{ totalList?.toLocaleString() }} รายการ
           <q-pagination
             v-model="formFilter.page"
             active-color="primary"
diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index d69ab568c..d494839b6 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -533,7 +533,7 @@ watch(
               @update:pagination="updatePagination"
             >
               <template v-slot:pagination="scope">
-                ทั้งหมด {{ total }} รายการ
+                ทั้งหมด {{ total.toLocaleString() }} รายการ
                 <q-pagination
                   v-model="pagination.page"
                   active-color="primary"
diff --git a/src/modules/18_command/components/Main/TableMain.vue b/src/modules/18_command/components/Main/TableMain.vue
index acd35ab6b..019e2097f 100644
--- a/src/modules/18_command/components/Main/TableMain.vue
+++ b/src/modules/18_command/components/Main/TableMain.vue
@@ -324,7 +324,7 @@ onMounted(() => {
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
-      ทั้งหมด {{ store.total }} รายการ
+      ทั้งหมด {{ store.total.toLocaleString() }} รายการ
       <q-pagination
         v-model="page"
         active-color="primary"
diff --git a/src/modules/18_command/components/Step/View0_Digital.vue b/src/modules/18_command/components/Step/View0_Digital.vue
index 2ae8b4ed8..851867b5d 100644
--- a/src/modules/18_command/components/Step/View0_Digital.vue
+++ b/src/modules/18_command/components/Step/View0_Digital.vue
@@ -797,7 +797,7 @@ onMounted(async () => {
                 </q-tr>
               </template>
               <template v-slot:pagination="scope">
-                ทั้งหมด {{ total }} รายการ
+                ทั้งหมด {{ total.toLocaleString() }} รายการ
                 <q-pagination
                   v-model="page"
                   active-color="primary"
diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
index 8b775355e..7d9f442bb 100644
--- a/src/modules/19_condition/view/Main.vue
+++ b/src/modules/19_condition/view/Main.vue
@@ -548,7 +548,7 @@ onMounted(async () => {
                 </q-tr>
               </template>
               <template v-slot:pagination="scope">
-                ทั้งหมด {{ totalRow }} รายการ
+                ทั้งหมด {{ totalRow.toLocaleString() }} รายการ
                 <q-pagination
                   v-model="page"
                   active-color="primary"
diff --git a/src/modules/20_positionTemp/components/TableMain.vue b/src/modules/20_positionTemp/components/TableMain.vue
index 0efb06799..046678f42 100644
--- a/src/modules/20_positionTemp/components/TableMain.vue
+++ b/src/modules/20_positionTemp/components/TableMain.vue
@@ -649,7 +649,10 @@ watch(
                 icon="info"
                 color="info"
                 round
-                @click="(modalPerson = true), (personalId = props.row.current_holderId)"
+                @click="
+                  (modalPerson = true),
+                    (personalId = props.row.current_holderId)
+                "
               >
                 <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
               </q-btn>
@@ -661,7 +664,7 @@ watch(
         </q-tr>
       </template>
       <template v-slot:pagination="scope">
-        ทั้งหมด {{ totalData }} รายการ
+        ทั้งหมด {{ totalData.toLocaleString() }} รายการ
         <q-pagination
           v-model="reqMaster.page"
           active-color="primary"