Merge branch 'nice_dev' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-04-30 10:59:32 +07:00
commit 8be154ece9
111 changed files with 2002 additions and 1866 deletions

View file

@ -289,7 +289,6 @@ onMounted(() => {
<template #trigger>
<q-input
dense
lazy-rules
outlined
class="inputgreen"
hide-bottom-space

View file

@ -175,10 +175,10 @@ async function deleteData(idData: string) {
);
}
function clearFilter(){
nodeData.keyword = ''
fetchActive()
fetchRoundOption()
function clearFilter() {
nodeData.keyword = "";
fetchActive();
fetchRoundOption();
}
onMounted(() => {
fetchActive();
@ -280,7 +280,6 @@ onMounted(() => {
<q-input
class="inputgreen"
dense
lazy-rules
outlined
:model-value="year === 0 ? 'ทั้งหมด' : Number(year) + 543"
:label="`${'ปีงบประมาณ'}`"

View file

@ -294,7 +294,6 @@ onMounted(async () => {
<template #trigger>
<q-input
dense
lazy-rules
outlined
class="inputgreen"
:model-value="

View file

@ -203,7 +203,6 @@ onMounted(async () => {
<template #trigger>
<q-input
dense
lazy-rules
outlined
class="inputgreen"
hide-bottom-space

View file

@ -380,7 +380,6 @@ onMounted(() => {
<template #trigger>
<q-input
dense
lazy-rules
outlined
:model-value="
formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543