Merge branch 'nice' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-26 11:13:01 +07:00
commit 1d650c9bf0

View file

@ -134,12 +134,16 @@ watch(
<div class="col-12"><q-separator /></div>
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img :src="profile.avatar" v-if="profile.avatar !== ''" />
<q-img src="@/assets/avatar_user.jpg" v-else />
<div class="col-xs-12 col-sm-1 row">
<q-img
:src="profile.avatar"
v-if="profile.avatar !== ''"
style="height: 140px"
/>
<q-img src="@/assets/avatar_user.jpg" v-else style="height: 140px" />
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-12 q-pl-md">
<div class="col-xs-12 col-sm-3 row">
<div class="col-12">
<div class="col-12 text-top">
{{ props.type == "employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน" }}
</div>
@ -148,7 +152,7 @@ watch(
</div>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-12 col-sm-3 row">
<div class="col-12">
<div class="col-12 text-top">
{{
@ -162,7 +166,7 @@ watch(
</div>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-12 col-sm-5 row">
<div class="col-12">
<div class="col-12 text-top">งก</div>
<div class="col-12 text-detail text-html">