CambiosSolicitadosEntries #201

Merged
alexm merged 17 commits from :CambiosSolicitadosEntries into dev 2024-03-14 06:39:45 +00:00
3 changed files with 11 additions and 12 deletions
Showing only changes of commit 740eedbe44 - Show all commits

View File

@ -59,6 +59,10 @@ const $props = defineProps({
type: Function, type: Function,
default: null, default: null,
}, },
clearStoreOnUnmount: {
type: Boolean,
default: true,
},
}); });
const emit = defineEmits(['onFetch', 'onDataSaved']); const emit = defineEmits(['onFetch', 'onDataSaved']);
@ -91,7 +95,12 @@ onMounted(async () => {
}); });
onUnmounted(() => { onUnmounted(() => {
state.unset($props.model); // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
if (hasChanges.value) {
state.set($props.model, originalData.value);
return;
}
if ($props.clearStoreDataOnUnmount) state.unset($props.model);
}); });
const isLoading = ref(false); const isLoading = ref(false);

View File

@ -61,6 +61,7 @@ const onFilterTravelSelected = (formData, id) => {
:url-update="`Entries/${route.params.id}`" :url-update="`Entries/${route.params.id}`"
model="entry" model="entry"
auto-load auto-load
:clear-store-on-unmount="false"
jsegarra marked this conversation as resolved
Review

Ya que tenemos que resolver conflictos, podemos poner el icono relleno con "font-variation-settings: 'FILL' 1;"

Ya que tenemos que resolver conflictos, podemos poner el icono relleno con "font-variation-settings: 'FILL' 1;"
Review

Añadido!

Commit: fe8e4a8342

Añadido! Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/fe8e4a834274ab1b85ba105c65605dddfdf3a8e8
> >
<template #form="{ data }"> <template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md"> <VnRow class="row q-gutter-md q-mb-md">

View File

@ -97,17 +97,6 @@ const getEntryRedirectionFilter = (entry) => {
}); });
}; };
const refetchEntryDescriptorData = async () => {
await entryDescriptorRef.value.getData();
};
watch(
() => route.name,
async (_, from) => {
if (from === 'EntryBasicData') await refetchEntryDescriptorData();
}
);
const showEntryReport = () => { const showEntryReport = () => {
openReport(`Entries/${route.params.id}/entry-order-pdf`); openReport(`Entries/${route.params.id}/entry-order-pdf`);
}; };