Merge branch 'develop'
This commit is contained in:
commit
5fa1bd8024
25 changed files with 25 additions and 25 deletions
|
|
@ -323,7 +323,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="
|
@keydown.enter.prevent="
|
||||||
store.onSearchData(filterKeyword, columns)
|
store.onSearchData(filterKeyword, columns)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="
|
@keydown.enter.prevent="
|
||||||
store.onSearchData(filterKeyword, TABLE_COLUMNS)
|
store.onSearchData(filterKeyword, TABLE_COLUMNS)
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -201,7 +201,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -260,7 +260,7 @@ onMounted(async () => {
|
||||||
dense
|
dense
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
label="ค้นหา"
|
label="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ onMounted(async () => {
|
||||||
dense
|
dense
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
label="ค้นหา"
|
label="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -346,7 +346,7 @@ onMounted(async () => {
|
||||||
lazy-rules
|
lazy-rules
|
||||||
label="คำค้น"
|
label="คำค้น"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
@keydown.enter="fetchData()"
|
@keydown.enter.prevent="fetchData()"
|
||||||
style="min-width: 300px"
|
style="min-width: 300px"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
|
|
|
||||||
|
|
@ -264,7 +264,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -315,7 +315,7 @@ onMounted(() => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filter"
|
v-model="filter"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -237,7 +237,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -295,7 +295,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -227,7 +227,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filterKeyword"
|
v-model="filterKeyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="store.onSearchData(filterKeyword, columns)"
|
@keydown.enter.prevent="store.onSearchData(filterKeyword, columns)"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@ watch(
|
||||||
dense
|
dense
|
||||||
v-model="keyword"
|
v-model="keyword"
|
||||||
label="ค้นหา"
|
label="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ onMounted(() => {
|
||||||
outlined
|
outlined
|
||||||
v-model="keyword"
|
v-model="keyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -590,7 +590,7 @@ onMounted(async () => {
|
||||||
dense
|
dense
|
||||||
v-model="inputSearch"
|
v-model="inputSearch"
|
||||||
ref="filterRef"
|
ref="filterRef"
|
||||||
@keydown.enter.pervent="
|
@keydown.enter.prevent="
|
||||||
storeData.fetchLog({
|
storeData.fetchLog({
|
||||||
rootId: qureyBody.rootId ?? undefined,
|
rootId: qureyBody.rootId ?? undefined,
|
||||||
size: size ?? undefined,
|
size: size ?? undefined,
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filter"
|
v-model="filter"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -332,7 +332,7 @@ onMounted(async () => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filter"
|
v-model="filter"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -312,7 +312,7 @@ onMounted(() => {
|
||||||
outlined
|
outlined
|
||||||
v-model="filter"
|
v-model="filter"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter="(pagination.page = 1), fetchSalaryList()"
|
@keydown.enter.prevent="(pagination.page = 1), fetchSalaryList()"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ onMounted(() => {
|
||||||
outlined
|
outlined
|
||||||
v-model="keyword"
|
v-model="keyword"
|
||||||
placeholder="ค้นหา"
|
placeholder="ค้นหา"
|
||||||
@keydown.enter.pervent="serchDataTable"
|
@keydown.enter.prevent="serchDataTable"
|
||||||
>
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon name="search" />
|
<q-icon name="search" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue