diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 1487b0d76..40e2c14c1 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -119,9 +119,10 @@ onMounted(async () => { // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla state.set(modelValue, $props.formInitialData); - if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch(); - else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data); - + if (!$props.formInitialData) { + if ($props.autoLoad && $props.url) await fetch(); + else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch'); + } if ($props.observeFormChanges) { watch( () => formData.value, diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 5ef3a5472..b3a85eefa 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -421,6 +421,7 @@ entry: buyingValue: Buying value freightValue: Freight value comissionValue: Commission value + description: Description packageValue: Package value isIgnored: Is ignored price2: Grouping diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index cfadd57b3..d03ee9d5c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -419,6 +419,7 @@ entry: buyingValue: Coste freightValue: Porte comissionValue: Comisión + description: Descripción packageValue: Embalaje isIgnored: Ignorado price2: Grouping diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index 807ccdae4..3c925ead6 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -135,14 +135,19 @@ watch; + +
+ + + {{ t('globals.collapseMenu') }} + + +
+
- - - diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue index cbfc3751a..7db088860 100644 --- a/src/pages/Route/Cmr/CmrList.vue +++ b/src/pages/Route/Cmr/CmrList.vue @@ -1,7 +1,8 @@ diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue index c7501b1d4..975beb9ab 100644 --- a/src/pages/Travel/Card/TravelDescriptor.vue +++ b/src/pages/Travel/Card/TravelDescriptor.vue @@ -52,23 +52,15 @@ const filter = { const entityId = computed(() => { return $props.id || route.params.id; }); - -const data = ref(useCardDescription()); - -const setData = (entity) => { - data.value = useCardDescription(entity.ref, entity.id); -};