verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 78 Releases Wiki Activity

Merge pull request '#337062 - remove unused searchFn after each filter change' (!1757) from hotfix_filter_autoUpdate into master
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1757
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Javier Segarra 2025-04-29 13:15:10 +00:00
parent fd5a4c370e c6d398467b
commit 7de36bb8c7
5 changed files with 15 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/Ticket/Negative/TicketLackFilter.vue
View File

@ -130,8 +130,6 @@ const setUserParams = (params) => {
($event) => onCategoryChange($event, searchFn)
"
:options="categoriesOptions"
option-value="id"
option-label="name"
hide-selected
dense
filled
@ -145,10 +143,7 @@ const setUserParams = (params) => {
<VnSelect
:label="t('negative.type')"
v-model="params.typeFk"
@update:model-value="searchFn()"
:options="itemTypesOptions"
option-value="id"
option-label="name"
hide-selected
dense
filled

20
src/pages/Ticket/TicketAdvanceFilter.vue
View File

@ -65,7 +65,7 @@ onMounted(async () => await getItemPackingTypes());
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<template #body="{ params }">
<QItem class="q-my-sm">
<QItemSection>
<VnInputDate
@ -93,12 +93,10 @@ onMounted(async () => await getItemPackingTypes());
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
:use-like="false"
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -110,12 +108,10 @@ onMounted(async () => await getItemPackingTypes());
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
:use-like="false"
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -133,7 +129,7 @@ onMounted(async () => await getItemPackingTypes());
:label="t('params.isFullMovable')"
v-model="params.isFullMovable"
toggle-indeterminate
@update:model-value="searchFn()"
dense
/>
</QItemSection>
</QItem>
@ -155,13 +151,9 @@ onMounted(async () => await getItemPackingTypes());
:label="t('params.warehouseFk')"
v-model="params.warehouseFk"
:options="warehousesOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -170,7 +162,7 @@ onMounted(async () => await getItemPackingTypes());
toggle-indeterminate
label="only with destination"
v-model="params.onlyWithDestination"
@update:model-value="searchFn()"
dense
/>
</QItemSection>
</QItem>

17
src/pages/Ticket/TicketFilter.vue
View File

@ -49,7 +49,7 @@ const groupedStates = ref([]);
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<template #body="{ params }">
<QItem>
<QItemSection>
<VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
@ -97,10 +97,7 @@ const groupedStates = ref([]);
<VnSelect
:label="t('State')"
v-model="params.stateFk"
@update:model-value="searchFn()"
:options="states"
option-value="id"
option-label="name"
emit-value
map-options
use-input
@ -117,7 +114,6 @@ const groupedStates = ref([]);
<VnSelect
:label="t('params.groupedStates')"
v-model="params.groupedStates"
@update:model-value="searchFn()"
:options="groupedStates"
option-label="code"
emit-value
@ -152,7 +148,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.myTeam"
@update:model-value="searchFn()"
:label="t('My team')"
toggle-indeterminate
/>
@ -160,7 +155,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.pending"
@update:model-value="searchFn()"
:label="t('Pending')"
toggle-indeterminate
/>
@ -170,7 +164,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.hasInvoice"
@update:model-value="searchFn()"
:label="t('Invoiced')"
toggle-indeterminate
/>
@ -178,7 +171,6 @@ const groupedStates = ref([]);
<QItemSection>
<QCheckbox
v-model="params.hasRoute"
@update:model-value="searchFn()"
:label="t('Routed')"
toggle-indeterminate
/>
@ -192,10 +184,7 @@ const groupedStates = ref([]);
<VnSelect
:label="t('Province')"
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provinces"
option-value="id"
option-label="name"
emit-value
map-options
use-input
@ -212,7 +201,6 @@ const groupedStates = ref([]);
<VnSelect
:label="t('Agency')"
v-model="params.agencyModeFk"
@update:model-value="searchFn()"
:options="agencies"
emit-value
map-options
@ -230,10 +218,7 @@ const groupedStates = ref([]);
<VnSelect
:label="t('Warehouse')"
v-model="params.warehouseFk"
@update:model-value="searchFn()"
:options="warehouses"
option-value="id"
option-label="name"
emit-value
map-options
use-input

29
src/pages/Ticket/TicketFutureFilter.vue
View File

@ -67,7 +67,7 @@ onMounted(async () => {
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<template #body="{ params }">
<QItem class="q-my-sm">
<QItemSection>
<VnInputDate
@ -113,11 +113,9 @@ onMounted(async () => {
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -129,11 +127,9 @@ onMounted(async () => {
option-value="code"
option-label="description"
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -142,13 +138,9 @@ onMounted(async () => {
:label="t('params.state')"
v-model="params.state"
:options="stateOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
<QItem>
@ -157,13 +149,9 @@ onMounted(async () => {
:label="t('params.futureState')"
v-model="params.futureState"
:options="stateOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
@ -173,7 +161,6 @@ onMounted(async () => {
:label="t('params.problems')"
v-model="params.problems"
:toggle-indeterminate="false"
@update:model-value="searchFn()"
/>
</QItemSection>
</QItem>
@ -183,13 +170,9 @@ onMounted(async () => {
:label="t('params.warehouseFk')"
v-model="params.warehouseFk"
:options="warehousesOptions"
option-value="id"
option-label="name"
@update:model-value="searchFn()"
dense
filled
>
</VnSelect>
/>
</QItemSection>
</QItem>
</template>

4
test/cypress/integration/ticket/ticketList.spec.js
View File

@ -79,8 +79,8 @@ describe('TicketList', () => {
});
}).as('ticket');
cy.get('[data-cy="Warehouse_select"]').type('Warehouse Five');
cy.get('.q-menu .q-item').contains('Warehouse Five').click();
cy.selectOption('[data-cy="Warehouse_select"]', 'Warehouse Five');
cy.searchBtnFilterPanel();
cy.wait('@ticket').then((interception) => {
const data = interception.response.body[1];
expect(data.hasComponentLack).to.equal(1);