fix: กด item เเล้วไม่ปิด
This commit is contained in:
parent
9a7bbe601c
commit
41e896b98f
4 changed files with 43 additions and 11 deletions
|
|
@ -1293,8 +1293,8 @@ watch(locale, () => {
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<template v-slot:action>
|
<template v-slot:action>
|
||||||
<q-menu class="bordered">
|
<q-menu class="bordered" >
|
||||||
<q-list v-close-popup>
|
<q-list>
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-view`"
|
:id="`view-detail-btn-${props.row.name}-view`"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
|
|
@ -1313,6 +1313,7 @@ watch(locale, () => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -1333,6 +1334,7 @@ watch(locale, () => {
|
||||||
|
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-edit`"
|
:id="`view-detail-btn-${props.row.name}-edit`"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -1371,6 +1373,7 @@ watch(locale, () => {
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-delete`"
|
:id="`view-detail-btn-${props.row.name}-delete`"
|
||||||
dense
|
dense
|
||||||
|
v-close-popup
|
||||||
:clickable="props.row.status === 'CREATED'"
|
:clickable="props.row.status === 'CREATED'"
|
||||||
class="row"
|
class="row"
|
||||||
:class="{
|
:class="{
|
||||||
|
|
|
||||||
|
|
@ -942,7 +942,8 @@ watch(inputSearch, async () => await fetchUserList());
|
||||||
})
|
})
|
||||||
"
|
"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
card-container-class="q-col-gutter-md full-width "
|
class="full-width"
|
||||||
|
card-container-class="q-gutter-md "
|
||||||
row-key="name"
|
row-key="name"
|
||||||
:rows-per-page-options="[0]"
|
:rows-per-page-options="[0]"
|
||||||
hide-pagination
|
hide-pagination
|
||||||
|
|
@ -1090,6 +1091,7 @@ watch(inputSearch, async () => await fetchUserList());
|
||||||
openDialog('INFO', props.row.id);
|
openDialog('INFO', props.row.id);
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -1108,6 +1110,7 @@ watch(inputSearch, async () => await fetchUserList());
|
||||||
|
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-edit`"
|
:id="`view-detail-btn-${props.row.name}-edit`"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -1131,6 +1134,8 @@ watch(inputSearch, async () => await fetchUserList());
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-delete`"
|
:id="`view-detail-btn-${props.row.name}-delete`"
|
||||||
dense
|
dense
|
||||||
|
v-close-popup
|
||||||
|
|
||||||
:clickable="props.row.status === 'CREATED'"
|
:clickable="props.row.status === 'CREATED'"
|
||||||
class="row"
|
class="row"
|
||||||
:class="{
|
:class="{
|
||||||
|
|
@ -1627,6 +1632,10 @@ watch(inputSearch, async () => await fetchUserList());
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.status-active {
|
.status-active {
|
||||||
--_branch-status-color: var(--green-6-hsl);
|
--_branch-status-color: var(--green-6-hsl);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1773,9 +1773,11 @@ watch([inputSearch, currentStatus], async () => {
|
||||||
<div class="column q-pa-md" style="gap: var(--size-1)">
|
<div class="column q-pa-md" style="gap: var(--size-1)">
|
||||||
<template v-if="selectorLabel === 'EMPLOYER'">
|
<template v-if="selectorLabel === 'EMPLOYER'">
|
||||||
<q-item
|
<q-item
|
||||||
|
v-close-popup
|
||||||
|
clickable
|
||||||
v-for="v in fieldCustomer"
|
v-for="v in fieldCustomer"
|
||||||
:key="v"
|
:key="v"
|
||||||
clickable
|
|
||||||
dense
|
dense
|
||||||
class="no-padding flex items-center rounded"
|
class="no-padding flex items-center rounded"
|
||||||
active-class="employer-active"
|
active-class="employer-active"
|
||||||
|
|
@ -1791,9 +1793,11 @@ watch([inputSearch, currentStatus], async () => {
|
||||||
<q-item
|
<q-item
|
||||||
active
|
active
|
||||||
dense
|
dense
|
||||||
clickable
|
|
||||||
active-class="employer-active"
|
active-class="employer-active"
|
||||||
class="no-padding flex items-center rounded"
|
class="no-padding flex items-center rounded"
|
||||||
|
v-close-popup
|
||||||
|
clickable
|
||||||
>
|
>
|
||||||
<span class="q-px-md">
|
<span class="q-px-md">
|
||||||
{{ $t('totalEmployee') }}
|
{{ $t('totalEmployee') }}
|
||||||
|
|
@ -1984,6 +1988,7 @@ watch([inputSearch, currentStatus], async () => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -2004,6 +2009,7 @@ watch([inputSearch, currentStatus], async () => {
|
||||||
|
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-edit`"
|
:id="`view-detail-btn-${props.row.name}-edit`"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -2044,6 +2050,8 @@ watch([inputSearch, currentStatus], async () => {
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-delete`"
|
:id="`view-detail-btn-${props.row.name}-delete`"
|
||||||
dense
|
dense
|
||||||
|
v-close-popup
|
||||||
|
|
||||||
:clickable="props.row.status === 'CREATED'"
|
:clickable="props.row.status === 'CREATED'"
|
||||||
class="row"
|
class="row"
|
||||||
:class="{
|
:class="{
|
||||||
|
|
|
||||||
|
|
@ -1621,6 +1621,8 @@ watch(inputSearchProductAndService, async () => {
|
||||||
<q-menu class="bordered">
|
<q-menu class="bordered">
|
||||||
<q-list v-close-popup>
|
<q-list v-close-popup>
|
||||||
<q-item
|
<q-item
|
||||||
|
v-close-popup
|
||||||
|
clickable
|
||||||
:id="`view-detail-btn-${props.row.name}-view`"
|
:id="`view-detail-btn-${props.row.name}-view`"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
() => {
|
() => {
|
||||||
|
|
@ -1644,7 +1646,7 @@ watch(inputSearchProductAndService, async () => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
clickable
|
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
style="white-space: nowrap"
|
style="white-space: nowrap"
|
||||||
|
|
@ -1661,7 +1663,9 @@ watch(inputSearchProductAndService, async () => {
|
||||||
</q-item>
|
</q-item>
|
||||||
|
|
||||||
<q-item
|
<q-item
|
||||||
|
|
||||||
:id="`view-detail-btn-${props.row.name}-edit`"
|
:id="`view-detail-btn-${props.row.name}-edit`"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -1697,6 +1701,8 @@ watch(inputSearchProductAndService, async () => {
|
||||||
</span>
|
</span>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-item
|
<q-item
|
||||||
|
v-close-popup
|
||||||
|
|
||||||
:id="`view-detail-btn-${props.row.name}-delete`"
|
:id="`view-detail-btn-${props.row.name}-delete`"
|
||||||
dense
|
dense
|
||||||
:clickable="props.row.status === 'CREATED'"
|
:clickable="props.row.status === 'CREATED'"
|
||||||
|
|
@ -2047,6 +2053,7 @@ watch(inputSearchProductAndService, async () => {
|
||||||
<q-menu class="bordered">
|
<q-menu class="bordered">
|
||||||
<q-list v-close-popup dense>
|
<q-list v-close-popup dense>
|
||||||
<q-item
|
<q-item
|
||||||
|
|
||||||
clickable
|
clickable
|
||||||
class="flex items-center"
|
class="flex items-center"
|
||||||
@click="
|
@click="
|
||||||
|
|
@ -2454,6 +2461,7 @@ watch(inputSearchProductAndService, async () => {
|
||||||
<q-menu class="bordered">
|
<q-menu class="bordered">
|
||||||
<q-list v-close-popup>
|
<q-list v-close-popup>
|
||||||
<q-item
|
<q-item
|
||||||
|
|
||||||
:id="`view-detail-btn-${props.row.name}-view`"
|
:id="`view-detail-btn-${props.row.name}-view`"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
async () => {
|
async () => {
|
||||||
|
|
@ -2471,6 +2479,7 @@ watch(inputSearchProductAndService, async () => {
|
||||||
await fetchListOfOptionBranch();
|
await fetchListOfOptionBranch();
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -2489,6 +2498,7 @@ watch(inputSearchProductAndService, async () => {
|
||||||
|
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-edit`"
|
:id="`view-detail-btn-${props.row.name}-edit`"
|
||||||
|
v-close-popup
|
||||||
clickable
|
clickable
|
||||||
dense
|
dense
|
||||||
class="row q-py-sm"
|
class="row q-py-sm"
|
||||||
|
|
@ -2525,6 +2535,8 @@ watch(inputSearchProductAndService, async () => {
|
||||||
<q-item
|
<q-item
|
||||||
:id="`view-detail-btn-${props.row.name}-delete`"
|
:id="`view-detail-btn-${props.row.name}-delete`"
|
||||||
dense
|
dense
|
||||||
|
v-close-popup
|
||||||
|
|
||||||
:clickable="props.row.status === 'CREATED'"
|
:clickable="props.row.status === 'CREATED'"
|
||||||
class="row"
|
class="row"
|
||||||
:class="{
|
:class="{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue