Merge branch 'dev' into 6896_Order_End

src/pages/Travel/Card/TravelDescriptor.vue

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

src/pages/Travel/TravelList.vue

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