Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

* 'develop' of github.com:Frappet/bma-ehr-frontend:
  ทะเบียนประวัติ: แก้paging ประวัติแก้ไขข้อมูลส่วนตัว

# Conflicts:
#	src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue

src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue

@@ -41,6 +41,11 @@ const id = ref<string>("");
 const age = ref<string | null>("");
 const formData = reactive<RequestObject>(store.defaultProfile);
 
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 10,
+});
+
 const dataLabel = {
   citizenId: "เลขบัตรประจำตัวประชาชน",
   name: "ชื่อ - สกุล",
@@ -828,6 +833,7 @@ onMounted(async () => {
                 style="min-width: 150px"
               />
             </div>
+
             <d-table
               ref="table"
               flat
@@ -835,7 +841,8 @@ onMounted(async () => {
               dense
               :columns="columnsHistory"
               :rows="rowsHistory"
-              :paging="true"
+              class="custom-header-table"
+              v-model:pagination="pagination"
               :rows-per-page-options="[10, 25, 50, 100]"
               :visible-columns="visibleColumnsHistory"
               :filter="filterHistory"
@@ -861,18 +868,6 @@ onMounted(async () => {
                   </q-td>
                 </q-tr>
               </template>
-
-              <template v-slot:pagination="scope">
-                <q-pagination
-                  v-model="currentPage"
-                  active-color="primary"
-                  color="dark"
-                  :max="Number(maxPage)"
-                  size="sm"
-                  boundary-links
-                  direction-links
-                ></q-pagination>
-              </template>
             </d-table>
           </q-page>
         </q-page-container>