Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-12-04 09:45:27 +07:00
commit 7ab17d378f
35 changed files with 297 additions and 148 deletions

View file

@ -87,7 +87,6 @@ function filterFn() {
outlined
v-model="keyword"
label="ค้นหา"
debounce="300"
@keydown.enter.prevent="filterFn"
>
<template v-slot:append>
@ -109,7 +108,6 @@ function filterFn() {
map-options
:options="workStore.columns"
option-value="name"
/>
</div>
</div>

View file

@ -257,7 +257,11 @@ async function fetchData() {
await http
.get(
config.API.specialTime() +
`?year=${year.value}&month=${month.value}&page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&keyword=${filterKeyword.value.trim()}`
`?year=${year.value}&month=${month.value}&page=${
pagination.value.page
}&pageSize=${
pagination.value.rowsPerPage
}&keyword=${filterKeyword.value.trim()}`
)
.then(async (res) => {
let data = res.data.result.data;
@ -371,7 +375,6 @@ onMounted(async () => {
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหาชื่อ-นามสกุล"
@keydown.enter.prevent="getSearch()"
>