fix report
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
parent
3ec21e4865
commit
24666e438f
3 changed files with 550 additions and 143 deletions
|
|
@ -289,6 +289,7 @@ onMounted(() => {
|
|||
|
||||
<q-space />
|
||||
<q-btn
|
||||
:disable="!isReport || !nodeId || !employeeClass"
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
|
|
@ -360,7 +361,7 @@ onMounted(() => {
|
|||
<div class="row col-12">
|
||||
<q-card bordered class="col-12 filter-card q-pa-sm">
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-3">
|
||||
<div class="col-md-3 col-xs-12">
|
||||
<q-select
|
||||
class="bg-white"
|
||||
hide-bottom-space
|
||||
|
|
@ -379,8 +380,11 @@ onMounted(() => {
|
|||
/>
|
||||
</div>
|
||||
|
||||
<div class="col-9 row q-col-gutter-sm" v-if="typeReport">
|
||||
<div>
|
||||
<div
|
||||
class="row col-md-9 col-xs-12 q-col-gutter-sm"
|
||||
v-if="typeReport"
|
||||
>
|
||||
<div class="col-md-3 col-xs-12">
|
||||
<q-select
|
||||
class="bg-white"
|
||||
outlined
|
||||
|
|
@ -399,107 +403,115 @@ onMounted(() => {
|
|||
</q-select>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm" v-if="yearType !== 'MONTH'">
|
||||
<datepicker
|
||||
v-model="year"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
year-picker
|
||||
:enableTimePicker="false"
|
||||
@update:model-value="updateLeaveday"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
class="bg-white"
|
||||
dense
|
||||
outlined
|
||||
:model-value="Number(year) + 543"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateStart"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
readonly
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
class="bg-white"
|
||||
outlined
|
||||
dense
|
||||
borderless
|
||||
:model-value="dateStart ? date2Thai(dateStart) : null"
|
||||
:label="`${'ตั้งเเต่วันที่'}`"
|
||||
readonly
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateEnd"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
readonly
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
class="bg-white"
|
||||
outlined
|
||||
dense
|
||||
borderless
|
||||
:model-value="dateEnd ? date2Thai(dateEnd) : null"
|
||||
:label="`${'ถึงวันที่'}`"
|
||||
readonly
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
<div
|
||||
class="col-md-9 col-xs-12 row q-col-gutter-sm"
|
||||
v-if="yearType !== 'MONTH'"
|
||||
>
|
||||
<div class="col-md-4">
|
||||
<datepicker
|
||||
v-model="year"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
year-picker
|
||||
:enableTimePicker="false"
|
||||
@update:model-value="updateLeaveday"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
class="bg-white"
|
||||
dense
|
||||
outlined
|
||||
:model-value="Number(year) + 543"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateStart"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
readonly
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
class="bg-white"
|
||||
outlined
|
||||
dense
|
||||
borderless
|
||||
:model-value="dateStart ? date2Thai(dateStart) : null"
|
||||
:label="`${'ตั้งเเต่วันที่'}`"
|
||||
readonly
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateEnd"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
readonly
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
class="bg-white"
|
||||
outlined
|
||||
dense
|
||||
borderless
|
||||
:model-value="dateEnd ? date2Thai(dateEnd) : null"
|
||||
:label="`${'ถึงวันที่'}`"
|
||||
readonly
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" v-else>
|
||||
|
|
|
|||
|
|
@ -287,7 +287,6 @@ onMounted(() => {
|
|||
option-label="name"
|
||||
option-value="id"
|
||||
@update:model-value="updateFilterType(filterType)"
|
||||
style="width: 230px"
|
||||
>
|
||||
</q-select>
|
||||
</div>
|
||||
|
|
@ -318,7 +317,7 @@ onMounted(() => {
|
|||
<div class="col-12 row">
|
||||
<q-card bordered class="col-12 filter-card q-pa-sm">
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="q-pr-xs col-2">
|
||||
<div class="col-lg-2 col-md-4 col-xs-12">
|
||||
<q-select
|
||||
class="bg-white"
|
||||
hide-bottom-space
|
||||
|
|
@ -337,7 +336,7 @@ onMounted(() => {
|
|||
/>
|
||||
</div>
|
||||
|
||||
<div class="q-pr-xs col-2" v-if="typeReport">
|
||||
<div class="col-lg-2 col-md-4 col-xs-12" v-if="typeReport">
|
||||
<q-select
|
||||
class="bg-white"
|
||||
outlined
|
||||
|
|
@ -363,7 +362,7 @@ onMounted(() => {
|
|||
</div>
|
||||
|
||||
<div
|
||||
class="q-pr-xs col-3"
|
||||
class="col-lg-2 col-md-4 col-xs-12"
|
||||
v-if="filterType === 'DAY' && typeReport"
|
||||
>
|
||||
<datepicker
|
||||
|
|
@ -402,7 +401,7 @@ onMounted(() => {
|
|||
</div>
|
||||
|
||||
<div
|
||||
class="q-pr-xs col-3"
|
||||
class="col-lg-2 col-md-4 col-xs-12"
|
||||
v-if="filterType === 'WEEKLY' && typeReport"
|
||||
>
|
||||
<datepicker
|
||||
|
|
@ -439,7 +438,7 @@ onMounted(() => {
|
|||
</div>
|
||||
|
||||
<div
|
||||
class="q-pr-xs col-3"
|
||||
class="col-lg-2 col-md-4 col-xs-12"
|
||||
v-if="filterType === 'MONTH' && typeReport"
|
||||
>
|
||||
<datepicker
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue