7837-testToMaster_2432 #592

Merged
alexm merged 165 commits from 7837-testToMaster_2432 into master 2024-08-06 05:54:11 +00:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit 7432396cea - Show all commits

View File

@ -65,7 +65,7 @@ const ticketData = computed(() => ticketStore.data);
const refetchExpeditions = async () => { const refetchExpeditions = async () => {
await expeditionsArrayData.applyFilter({ await expeditionsArrayData.applyFilter({
params: { filter: JSON.stringify(expeditionsFilter.value) }, filter: expeditionsFilter.value,
}); });
}; };
@ -81,7 +81,7 @@ const applyColumnFilter = async (col) => {
try { try {
const paramKey = col.columnFilter?.filterParamKey || col.field; const paramKey = col.columnFilter?.filterParamKey || col.field;
params[paramKey] = col.columnFilter.filterValue; params[paramKey] = col.columnFilter.filterValue;
await expeditionsArrayData.addFilter({ params }); await expeditionsArrayData.addFilter({ filter: expeditionsFilter.value, params });
} catch (err) { } catch (err) {
console.error('Error applying column filter', err); console.error('Error applying column filter', err);
} }