wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 6899_InvoiceOut_End

This commit is contained in:
Jon Elias 2024-07-05 12:03:25 +00:00
parent 5112ae7e1a 53a75954d1
commit 6a4eb9f3b8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/Travel/Card/TravelDescriptor.vue
View File

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

6
src/pages/Travel/TravelList.vue
View File

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