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

8627-devToTest #1421

Merged
alexm merged 768 commits from 8627-devToTest into test 2025-02-18 12:37:37 +00:00
Conversation 0 Commits 768 Files Changed 335 +9 -4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f5aed2cbe - Show all commits

13
src/pages/Route/Vehicle/VehicleList.vue
View File

@ -30,7 +30,7 @@ const columns = computed(() => [
{ {
name: 'companyFk', name: 'companyFk',
label: t('globals.company'), label: t('globals.company'),
format: (row, dashIfEmpty) => dashIfEmpty(row.company?.code), format: (row, dashIfEmpty) => dashIfEmpty(row.company),
columnFilter: { columnFilter: {
component: 'select', component: 'select',
name: 'companyFk', name: 'companyFk',
@ -51,7 +51,7 @@ const columns = computed(() => [
{ {
name: 'warehouseFk', name: 'warehouseFk',
label: t('globals.warehouse'), label: t('globals.warehouse'),
format: (row, dashIfEmpty) => dashIfEmpty(row.warehouse?.name), format: (row, dashIfEmpty) => dashIfEmpty(row.warehouse),
columnFilter: { columnFilter: {
component: 'select', component: 'select',
name: 'warehouseFk', name: 'warehouseFk',
@ -86,9 +86,14 @@ const columns = computed(() => [
{ {
name: 'vehicleStateFk', name: 'vehicleStateFk',
label: t('globals.state'), label: t('globals.state'),
columnFilter: false, columnFilter: {
component: 'select',
name: 'vehicleStateFk',
optionLabel: 'state',
options: vehicleStates.value,
},
sortable: false, sortable: false,
format: (row, dashIfEmpty) => dashIfEmpty(row.event?.state?.state), format: (row, dashIfEmpty) => dashIfEmpty(row.state),
}, },
{ {
align: 'right', align: 'right',