From 56a46cd1306e7a6ccb34ace2268086116a0728ef Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 3 Jun 2024 11:52:19 +0200 Subject: [PATCH] 4560 --- src/components/FormPopup.vue | 2 +- src/pages/Route/Roadmap/RoadmapAddStopDialog.vue | 2 +- src/pages/Route/Roadmap/RoadmapStops.vue | 8 ++++---- src/pages/Route/Roadmap/RoadmapSummary.vue | 12 ++++++------ src/router/routes.js | 2 -- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue index e203a7c75..2da986006 100644 --- a/src/components/FormPopup.vue +++ b/src/components/FormPopup.vue @@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'; const emit = defineEmits(['onSubmit']); -const $props = defineProps({ +defineProps({ title: { type: String, default: '', diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue index 810ef42c8..f20619033 100644 --- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue +++ b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue @@ -34,7 +34,7 @@ const updateDefaultStop = (data) => { const onSave = async () => { isLoading.value = true; try { - await axios.post('ExpeditionTrucks', { ...roadmapStopForm }); + await axios.post('RoadmapStops', { ...roadmapStopForm }); emit('ok'); } finally { isLoading.value = false; diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue index 5c3bd51e7..9e6ac82f4 100644 --- a/src/pages/Route/Roadmap/RoadmapStops.vue +++ b/src/pages/Route/Roadmap/RoadmapStops.vue @@ -33,9 +33,9 @@ const updateDefaultStop = (data) => {
{ es: - Warehouse: Almacén + Address: Consignatario ETA date: Fecha ETA ETA hour: Hora ETA Description: Descripción diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue index 1fed6aa78..01246b647 100644 --- a/src/pages/Route/Roadmap/RoadmapSummary.vue +++ b/src/pages/Route/Roadmap/RoadmapSummary.vue @@ -35,9 +35,9 @@ onUnmounted(hideRightDrawer); const columns = ref([ { - name: 'warehouse', - label: t('Warehouse'), - field: (row) => dashIfEmpty(row?.warehouse?.name), + name: 'address', + label: t('Address'), + field: (row) => dashIfEmpty(row?.address?.nickname), sortable: true, align: 'left', }, @@ -54,8 +54,8 @@ const filter = { { relation: 'supplier' }, { relation: 'worker' }, { - relation: 'expeditionTruck', - scope: { include: [{ relation: 'warehouse' }] }, + relation: 'roadmapStop', + scope: { include: [{ relation: 'address' }] }, }, ], }; @@ -146,7 +146,7 @@ const openAddStopDialog = () => {