hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-08-08 21:58:49 +07:00
commit 7cdff8d853
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/05_leave/components/Calendar.vue
View file

@ -267,7 +267,18 @@ onMounted(async () => {
<div class="row">
<div class="col-xs-12 col-md-3 q-mt-sm q-pr-sm row">
<q-card class="col-12" flat bordered>
<q-skeleton height="100%" square v-if="isLoading" />
<q-card-section v-if="isLoading">
<q-item>
<q-item-section avatar>
<q-skeleton type="QToggle" height="20px" width="25px" />
</q-item-section>
<q-item-section>
<q-skeleton type="text" class="text-subtitle1" />
</q-item-section>
</q-item>
</q-card-section>
<q-scroll-area style="height: 38vw" v-else>
<div class="q-gutter-sm col-12">
<q-list class="rounded-borders q-pt-sm" dense>

21
src/modules/05_leave/components/DialogDetail.vue
View file

@ -441,11 +441,14 @@ watch(
/>
<q-separator />
<q-card-section v-if="isLoading">
<div v-for="i in 10" :key="i">
<q-skeleton type="text" class="text-subtitle1" />
</div>
</q-card-section>
<q-card-section class="scroll" style="max-height: 60vh">
<q-skeleton height="400px" square v-if="isLoading" />
<div class="row" v-else>
<q-card-section v-else class="scroll" style="max-height: 60vh">
<div class="row">
<div
flat
:class="
@ -584,9 +587,13 @@ watch(
/>
<q-separator />
<q-card-section class="q-p-md row q-gutter-y-md">
<q-skeleton height="400px" width="100%" square v-if="isLoading" />
<div flat class="col-12" v-else>
<q-card-section v-if="isLoading">
<div v-for="i in 10" :key="i">
<q-skeleton type="text" class="text-subtitle1" />
</div>
</q-card-section>
<q-card-section class="q-p-md row q-gutter-y-md" v-else>
<div flat class="col-12">
<div class="col-12 q-col-gutter-sm row items-center"></div>
<FormCancel :data="formDataCancle" />
</div>