#7648 - HOTFIX: myEntries filters #566

Merged
jsegarra merged 7 commits from hotfix_myEntries into master 2024-07-26 05:50:36 +00:00
3 changed files with 59 additions and 10 deletions
Showing only changes of commit aef83b7e9a - Show all commits

View File

@ -17,30 +17,68 @@ const columns = computed(() => [
columnFilter: false, columnFilter: false,
}, },
{ {
visible: false,
align: 'right',
label: t('shipped'),
name: 'shipped',
cardVisible: false,
columnFilter: {
name: 'fromShipped',
label: t('fromShipped'),
component: 'date',
},
format: ({ shipped }) => toDate(shipped),
},
{
visible: false,
align: 'left', align: 'left',
label: t('shipped'), label: t('shipped'),
name: 'shipped', name: 'shipped',
columnFilter: { columnFilter: {
name: 'toShipped',
label: t('toShipped'),
component: 'date', component: 'date',
}, },
format: ({ shipped }) => toDate(shipped), format: ({ shipped }) => toDate(shipped),
cardVisible: true, cardVisible: true,
}, },
{ {
align: 'left', align: 'right',
label: t('landed'), label: t('shipped'),
name: 'from', name: 'shipped',
cardVisible: false, cardVisible: false,
columnFilter: { columnFilter: false,
Review

Por defecto ja ees cardVisible: false

Por defecto ja ees `cardVisible: false`
component: 'date', format: ({ shipped }) => toDate(shipped),
},
format: ({ landed }) => toDate(landed),
}, },
{ {
align: 'left', align: 'right',
label: t('landed'),
name: 'landed',
cardVisible: false,
columnFilter: false,
format: ({ landed }) => toDate(landed),
},
{
align: 'right',
label: t('globals.wareHouseIn'), label: t('globals.wareHouseIn'),
name: 'warehouseInName', name: 'warehouseInFk',
format: (row) => row.warehouseInName,
cardVisible: true, cardVisible: true,
columnField: {
jsegarra marked this conversation as resolved Outdated
Outdated
Review

Realmente no hace falta si el filter ya se ha puesto aparte

Realmente no hace falta si el filter ya se ha puesto aparte
component: null,
},
columnFilter: {
component: 'select',
attrs: {
url: 'warehouses',
fields: ['id', 'name'],
optionLabel: 'name',
optionValue: 'id',
},
alias: 't',
inWhere: true,
},
}, },
{ {
align: 'left', align: 'left',
@ -77,7 +115,14 @@ const printBuys = (rowId) => {
:label="t('Search entries')" :label="t('Search entries')"
:info="t('You can search by entry reference')" :info="t('You can search by entry reference')"
/> />
<VnTable data-key="myEntriesList" url="Entries/filter" :columns="columns" auto-load /> <VnTable
data-key="myEntriesList"
url="Entries/filter"
:columns="columns"
default-mode="table"
order="shipped DESC"
auto-load
/>
</template> </template>
<i18n> <i18n>

View File

@ -8,4 +8,6 @@ entryFilter:
reference: Reference reference: Reference
landed: Landed landed: Landed
shipped: Shipped shipped: Shipped
fromShipped: Shipped(from)
toShipped: Shipped(to)
printBuys: Print buys printBuys: Print buys

View File

@ -12,4 +12,6 @@ entryFilter:
landed: F. llegada landed: F. llegada
shipped: F. salida shipped: F. salida
fromShipped: F. salida(desde)
toShipped: F. salida(hasta)
Print buys: Imprimir etiquetas Print buys: Imprimir etiquetas