Merge branch 'develop' into warunee-dev

This commit is contained in:
Warunee Tamkoo 2023-07-25 14:34:26 +07:00
commit 879a4c0671

View file

@ -304,6 +304,77 @@
class="col-3"
/>
</div>
<div
:class="
$q.screen.lt.md
? ' row col-12 q-col-gutter-xs'
: 'no-wrap row col-12 q-col-gutter-xs'
"
>
<datepicker
class="col-2"
menu-class-name="modalfix"
:model-value="reportYear"
:locale="'th'"
autoApply
year-picker
:enableTimePicker="false"
@update:model-value="updateReportYear"
clearable
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
class="inputgreen cursor-pointer q-mb-sm"
hide-bottom-space
outlined
dense
lazy-rules
borderless
:model-value="
reportYear == null ? null : reportYear + 543
"
:label="`${'ปีงบประมาณ'}`"
clearable
@clear="clearReportDate"
>
<!-- <template v-slot:prepend>
<q-icon
name="event"
class="cursor-pointer"
style="color: var(--q-primary)"
>
</q-icon>
</template> -->
</q-input>
</template>
</datepicker>
<q-input
clearable
dense
outlined
lazy-rules
:model-value="reportNo"
hide-bottom-space
label="เลขที่คำสั่ง"
@update:model-value="updateReportNo"
class="col-3"
/>
<q-input
clearable
dense
outlined
lazy-rules
:model-value="reportType"
hide-bottom-space
label="ประเภทคำสั่ง"
@update:model-value="updateReportType"
class="col-3"
/>
</div>
<div class="col-12 row items-center">
<q-toggle
dense
@ -423,6 +494,9 @@ const props = defineProps({
employeePosition: String,
employeeLevel: String,
posNo: String,
reportYear: Number || null,
reportNo: String,
reportType: String,
isTab: {
type: Boolean,
default: true,
@ -460,6 +534,9 @@ const emit = defineEmits([
"update:employeePosition",
"update:employeeLevel",
"update:posNo",
"update:reportYear",
"update:reportNo",
"update:reportType",
]);
const updateInput = (value: string | number | null) => {
@ -508,6 +585,15 @@ const updateEmployeeLevel = (value: string | number | null) => {
const updatePosNo = (value: string | number | null) => {
emit("update:posNo", value);
};
const updateReportYear = (value: string | number | null) => {
emit("update:reportYear", value);
};
const updateReportNo = (value: string | number | null) => {
emit("update:reportNo", value);
};
const updateReportType = (value: string | number | null) => {
emit("update:reportType", value);
};
// const updateProfileType = (value: string | number | null) => {
// emit("update:profileType", value);
// };
@ -515,6 +601,9 @@ const updatePosNo = (value: string | number | null) => {
const clearDate = () => {
emit("update:retireYear", null);
};
const clearReportDate = () => {
emit("update:reportYear", null);
};
const clickSearchPanel = () => {
emit("update:retireYear", null);