diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 843935736..1d8ebd1db 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -275,7 +275,7 @@ defineExpose({ /> [ cardVisible: true, }, { + align: 'left', label: t('route.cmr.list.ticketFk'), name: 'ticketFk', }, { + align: 'left', label: t('route.cmr.list.routeFk'), name: 'routeFk', }, { + align: 'left', label: t('route.cmr.list.clientFk'), name: 'clientFk', }, { - align: 'left', + align: 'right', label: t('route.cmr.list.country'), name: 'countryFk', cardVisible: true, - component: 'select', attrs: { url: 'countries', fields: ['id', 'name'], @@ -62,30 +64,35 @@ const columns = computed(() => [ }, columnFilter: { inWhere: true, + component: 'select', }, - }, - { - align: 'center', - label: t('route.cmr.list.shipped'), - name: 'shipped', - cardVisible: true, - component: 'date', - columnFilter: { - inWhere: true, - }, - format: ({ date }) => toDate(date), - }, - { - align: 'center', - name: 'warehouseFk', - label: t('globals.warehouse'), - component: 'select', - attrs: { - options: warehouses.value, - }, + format: ({ countryName }) => countryName, }, { align: 'right', + label: t('route.cmr.list.shipped'), + name: 'shipped', + cardVisible: true, + columnFilter: { + component: 'date', + inWhere: true, + }, + format: ({ shipped }) => toDateHourMin(shipped), + }, + { + align: 'right', + name: 'warehouseFk', + label: t('globals.warehouse'), + columnFilter: { + component: 'select', + }, + attrs: { + options: warehouses.value, + }, + format: ({ warehouseName }) => warehouseName, + }, + { + align: 'center', name: 'tableActions', actions: [ { @@ -166,14 +173,5 @@ function downloadPdfs() { - - -