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

# Conflicts:
#	src/modules/03_recruiting/components/Address.vue
#	src/modules/03_recruiting/views/03_editor/index.vue
#	src/modules/04_registryPerson/components/Dialog/02_Address.vue
#	src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
#	src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
#	src/modules/05_placement/components/PersonalDetail/Information/Address.vue
This commit is contained in:
Warunee Tamkoo 2024-11-27 18:18:21 +07:00
commit 563f3e1b16
95 changed files with 580 additions and 489 deletions

View file

@ -10,6 +10,7 @@
dense
:pagination-label="paginationLabel"
v-model:pagination="pagination"
:rows-per-page-options="[10, 25, 50, 100]"
>
<template v-slot:pagination="scope">
งหมด {{ attrs.rows.length }} รายการ