hrms-bangkok/hrms-mgt
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 2023-11-29 11:43:13 +07:00
commit 2edb18316e
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/09_leave/components/1_Work/DialogDetail.vue
View file

@ -167,7 +167,7 @@ watch(
</q-item-section>
</q-item>
</div>
<div class="col-2">
<div class="col-2" v-if="props.typeTab === 'time-record'">
<q-item>
<q-item-section>
<q-item-label class="text-grey-8"
@ -177,7 +177,7 @@ watch(
</q-item-section>
</q-item>
</div>
<div class="col-2">
<div class="col-2" v-if="props.typeTab === 'time-record'">
<q-item>
<q-item-section>
<q-item-label class="text-grey-8"

1
src/modules/09_leave/components/1_Work/TableList.vue
View file

@ -97,6 +97,7 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
dense
class="custom-header-table"
:visible-columns="workStore.visibleColumns"
:rows-per-page-options="[10, 25, 50, 100]"
v-model:pagination="pagination"
>
<template v-slot:header="props">