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

Merge branch 'warunee-dev' into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2024-01-03 14:45:15 +07:00
commit a22b6b3439
3 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/09_leave/components/2_Leave/DetailLeave.vue
View file

@ -600,11 +600,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
<div class="col-xs-12 col-sm-7 row">
<div class="row col-12 q-gutter-md">
<div class="col row">
<q-card
bordered
class="col-12 items-center row q-px-md q-py-sm"
>
<div
v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
class="col-3"
>
<q-card bordered class="items-center row col-12 q-pa-md">
<div class="text-h6 text-weight-bold text-blue-10">
{{ formData.leaveLimit }}
</div>
@ -613,11 +613,8 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
</q-card>
</div>
<div class="col">
<q-card
bordered
class="col-12 items-center row q-px-md q-py-sm"
>
<div class="col-3">
<q-card bordered class="items-center row col-12 q-pa-md">
<div class="text-h6 text-weight-bold text-light-blue-6">
{{ formData.leaveSummary }}
</div>
@ -626,11 +623,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
</q-card>
</div>
<div class="col">
<q-card
bordered
class="col-12 items-center row q-px-md q-py-sm"
>
<div
v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
class="col-3"
>
<q-card bordered class="items-center row col-12 q-pa-md">
<div class="text-h6 text-weight-bold text-indigo-7">
{{ formData.leaveRemain }}
</div>

27
src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
View file

@ -593,11 +593,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
<div class="col-xs-12 col-sm-7 row">
<div class="row col-12 q-gutter-md">
<div class="col row">
<q-card
bordered
class="col-12 items-center row q-px-md q-py-sm"
>
<div
v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
class="col-3"
>
<q-card bordered class="items-center row col-12 q-pa-md">
<div class="text-h6 text-weight-bold text-blue-10">
{{ formData.leaveLimit }}
</div>
@ -606,11 +606,8 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
</q-card>
</div>
<div class="col">
<q-card
bordered
class="col-12 items-center row q-px-md q-py-sm"
>
<div class="col-3">
<q-card bordered class="items-center row col-12 q-pa-md">
<div class="text-h6 text-weight-bold text-light-blue-6">
{{ formData.leaveSummary }}
</div>
@ -619,11 +616,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
</div>
</q-card>
</div>
<div class="col">
<q-card
bordered
class="col-12 items-center row q-px-md q-py-sm"
>
<div
v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
class="col-3"
>
<q-card bordered class="items-center row col-12 q-pa-md">
<div class="text-h6 text-weight-bold text-indigo-7">
{{ formData.leaveRemain }}
</div>

2
src/modules/12_evaluatePersonal/views/MainPage.vue
View file

@ -182,7 +182,7 @@ onMounted(async () => {
class="custom-header-table"
:visible-columns="store.visibleColumns"
v-model:pagination="initialPagination"
:rows-per-page-options="[2, 25, 50, 100]"
:rows-per-page-options="[10, 25, 50, 100]"
@update:pagination="updatePagination"
>
<template v-slot:pagination="scope">