Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
commit
7d07256591
|
@ -302,6 +302,8 @@ defineExpose({ opts: myOptions, vnSelectRef });
|
||||||
|
|
||||||
function handleKeyDown(event) {
|
function handleKeyDown(event) {
|
||||||
if (event.key === 'Tab' && !event.shiftKey) {
|
if (event.key === 'Tab' && !event.shiftKey) {
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
const inputValue = vnSelectRef.value?.inputValue;
|
const inputValue = vnSelectRef.value?.inputValue;
|
||||||
|
|
||||||
if (inputValue) {
|
if (inputValue) {
|
||||||
|
|
|
@ -37,7 +37,6 @@ const expeditionStateTypes = ref([]);
|
||||||
|
|
||||||
const expeditionsFilter = computed(() => ({
|
const expeditionsFilter = computed(() => ({
|
||||||
where: { ticketFk: route.params.id },
|
where: { ticketFk: route.params.id },
|
||||||
order: ['created DESC'],
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const ticketArrayData = useArrayData('Ticket');
|
const ticketArrayData = useArrayData('Ticket');
|
||||||
|
@ -325,6 +324,7 @@ onMounted(async () => {
|
||||||
"
|
"
|
||||||
:redirect="false"
|
:redirect="false"
|
||||||
order="created DESC"
|
order="created DESC"
|
||||||
|
:filter="expeditionsFilter"
|
||||||
>
|
>
|
||||||
<template #column-freightItemName="{ row }">
|
<template #column-freightItemName="{ row }">
|
||||||
<span class="link" @click.stop>
|
<span class="link" @click.stop>
|
||||||
|
|
Loading…
Reference in New Issue