7837-testToMaster_2432 #592

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

View File

@ -65,7 +65,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
:subtitle="data.subtitle"
:filter="filter"
data-key="travelData"
:summary="$attrs"
@on-fetch="setData"
>
<template #menu="{ entity }">

View File

@ -71,6 +71,7 @@ const columns = computed(() => [
url: 'agencyModes',
fields: ['id', 'name'],
},
format: (row) => row.agencyModeName,
columnField: {
component: null,
},
@ -112,7 +113,10 @@ const columns = computed(() => [
attrs: {
url: 'warehouses',
fields: ['id', 'name'],
optionLabel: 'name',
optionValue: 'id',
},
format: (row) => row.warehouseInName,
columnField: {
component: null,
},
@ -129,6 +133,7 @@ const columns = computed(() => [
url: 'warehouses',
fields: ['id', 'name'],
},
format: (row) => row.warehouseOutName,
columnField: {
component: null,
},
@ -196,7 +201,6 @@ const columns = computed(() => [
default-mode="table"
auto-load
redirect="travel"
:right-search="false"
:is-editable="false"
:use-model="true"
/>