diff --git a/CHANGELOG.md b/CHANGELOG.md index f1f911d62..778d04638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto - (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa +- (Route) => Ahora se muestran todos los cmrs ## [2418.01] diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 8ccdf640f..a0a72ed54 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -962,7 +962,7 @@ roadmap: route: pageTitles: routes: Routes - cmrsList: External CMRs list + cmrsList: CMRs list RouteList: List routeCreate: New route basicData: Basic Data diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 452421343..7815f3c45 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -950,7 +950,7 @@ roadmap: route: pageTitles: routes: Rutas - cmrsList: Listado de CMRs externos + cmrsList: Listado de CMRs RouteList: Listado routeCreate: Nueva ruta basicData: Datos básicos diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue index 553f19431..32040ddd6 100644 --- a/src/pages/Route/Cmr/CmrFilter.vue +++ b/src/pages/Route/Cmr/CmrFilter.vue @@ -1,11 +1,11 @@ - - en: params: diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue index 154e49977..cbfc3751a 100644 --- a/src/pages/Route/Cmr/CmrList.vue +++ b/src/pages/Route/Cmr/CmrList.vue @@ -14,6 +14,7 @@ const { t } = useI18n(); const { getTokenMultimedia } = useSession(); const token = getTokenMultimedia(); const selected = ref([]); +const warehouses = ref([]); const columns = computed(() => [ { @@ -63,6 +64,13 @@ const columns = computed(() => [ sortable: true, headerStyle: 'padding-left: 33px', }, + { + name: 'warehouseFk', + label: t('globals.warehouse'), + field: ({ warehouseFk }) => warehouseFk, + align: 'center', + sortable: true, + }, { name: 'icons', align: 'center', @@ -99,7 +107,7 @@ function downloadPdfs() {
+