Merge branch 'dev' into 8612-shelvinge2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
PAU ROVIRA ROSALENY 2025-03-04 07:54:08 +00:00
commit e51d304dd3
4 changed files with 4 additions and 8 deletions

View File

@ -78,12 +78,7 @@ defineProps({ row: { type: Object, required: true } });
> >
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
v-if="row?.isTaxDataChecked !== 0"
name="vn:no036"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs"> <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">

View File

@ -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) {

View File

@ -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>

View File

@ -6,7 +6,6 @@ describe('TicketSale', () => {
cy.login('developer'); cy.login('developer');
cy.viewport(1920, 1080); cy.viewport(1920, 1080);
cy.visit('/#/ticket/31/sale'); cy.visit('/#/ticket/31/sale');
cy.domContentLoad();
}); });
const firstRow = 'tbody > :nth-child(1)'; const firstRow = 'tbody > :nth-child(1)';