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

8713-testToMaster #1539

Merged
alexm merged 118 commits from 8713-testToMaster into master 2025-03-04 06:57:15 +00:00
Conversation 0 Commits 118 Files Changed 363 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f33d396d82 - Show all commits

14
src/pages/Route/Agency/composables/getAgencies.js
View File

@ -8,7 +8,7 @@ export async function getAgencies(formData, client, _filter = {}) {
order: ['name ASC'], order: ['name ASC'],
}; };
let defaultAgency = null; let agency = null;
let params = { let params = {
filter: JSON.stringify(filter), filter: JSON.stringify(filter),
warehouseFk: formData.warehouseId, warehouseFk: formData.warehouseId,
@ -16,13 +16,15 @@ export async function getAgencies(formData, client, _filter = {}) {
landed: formData.landed, landed: formData.landed,
}; };
const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params }); const { data: options } = await axios.get('Agencies/getAgenciesWithWarehouse', {
params,
});
if (data && client) { if (options && client) {
defaultAgency = data.find( agency = options.find(
(agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk, ({ agencyModeFk }) => agencyModeFk === client.defaultAddress.agencyModeFk,
); );
} }
return { options: data, agency: defaultAgency }; return { options, agency };
} }

1
src/pages/Ticket/TicketList.vue
View File

@ -478,7 +478,6 @@ watch(
auto-load auto-load
/> />
<VnSection <VnSection
ref="sectionRef"
:data-key="dataKey" :data-key="dataKey"
:columns="columns" :columns="columns"
prefix="card" prefix="card"