Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/01_metadataNew/views/personal.vue
This commit is contained in:
setthawutttty 2024-02-02 11:23:14 +07:00
commit 7b943de397

View file

@ -28,7 +28,7 @@ onMounted(() => {
อมลเกยวกบบคคล
</div>
<q-card flat bordered class="q-pa-md">
<q-card flat bordered>
<div class="text-subtitle1 text-grey-9">
<q-tabs
dense
@ -49,12 +49,15 @@ onMounted(() => {
/>
</q-tabs>
<q-separator size="2px" />
<ListPrefix v-if="currentTab == 'list_prefix'" />
<ListRank v-if="currentTab == 'list_rank'" />
<ListBloodGroup v-if="currentTab == 'list_bloodGroup'" />
<ListGender v-if="currentTab == 'list_gender'" />
<ListReligion v-if="currentTab == 'list_religion'" />
<ListRelationship v-if="currentTab == 'list_relationship'" />
<!-- person -->
<div class="q-pa-md">
<ListPrefix v-if="currentTab == 'list_prefix'" />
<ListRank v-if="currentTab == 'list_rank'" />
<ListBloodGroup v-if="currentTab == 'list_bloodGroup'" />
<ListGender v-if="currentTab == 'list_gender'" />
<ListReligion v-if="currentTab == 'list_religion'" />
<ListRelationship v-if="currentTab == 'list_relationship'" />
</div>
</div>
</q-card>
</template>