Merge branch 'warunee-dev' into develop

This commit is contained in:
Warunee Tamkoo 2024-01-09 16:46:45 +07:00
commit ac013be53f

View file

@ -177,12 +177,28 @@ watch(modal, (newValue) => {
}
});
</script>
<template>
<q-dialog v-model="modal" position="right">
<q-card style="width: 420px">
<q-card-section>
<div class="text-h6 text-center">รายละเอยดแบบยอย</div>
</q-card-section>
<q-dialog v-model="modal" position="right" :maximized="true">
<q-card style="width: 420px; overflow: visible;">
<q-toolbar>
<q-toolbar-title class="text-subtitle1 text-bold"
>ทะเบยนประว</q-toolbar-title
>
<q-btn
icon="close"
unelevated
round
dense
@click="emit('update:modal', false)"
style="color: red; background-color: #ffdede"
/>
</q-toolbar>
<!-- <q-card-section>
<div class="text-bold text-h6 text-center">อมลทะเบยนประว</div>
<q-space />
</q-card-section> -->
<q-card-section class="col q-pt-none bg-grey-12">
<div class="q-gutter-md">
@ -204,12 +220,15 @@ watch(modal, (newValue) => {
</q-avatar>
</div>
<div
class="q-mt-md text-weight-bolder text-center"
class="q-mt-md text-subtitle2 text-bold"
style="font-size: 18px"
>
{{ avatar.fullname }}
</div>
<div class="q-mb-xs text-center text-grey">
<div
v-if="avatar.position != '-'"
class="q-mb-xs text-center text-grey"
>
{{ avatar.position }}
</div>
<div class="q-mt-md">
@ -224,7 +243,7 @@ watch(modal, (newValue) => {
</div>
</q-card>
<q-scroll-area style="height: 500px; max-width: 100%">
<q-scroll-area style="height: 65vh; max-width: 100%">
<div class="q-gutter-md q-pa-sm">
<q-card bordered style="border: 1px solid #d6dee1">
<div class="q-pa-md">