Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me
# Conflicts: # src/modules/04_registry/components/Profile.vue
This commit is contained in:
commit
380c628099
11 changed files with 328 additions and 440 deletions
|
|
@ -18,7 +18,7 @@
|
|||
{{ title.fullname }}
|
||||
</div>
|
||||
<q-space />
|
||||
<q-btn
|
||||
<!-- <q-btn
|
||||
outline
|
||||
color="blue"
|
||||
dense
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
class="q-px-sm"
|
||||
label="ดูข้อมูลทะเบียนประวัติ"
|
||||
@click="router.push(`/registry/${paramsId}`)"
|
||||
/>
|
||||
/> -->
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row col-12 q-pa-md">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue