Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixUI
gitea/salix-front/pipeline/pr-master This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-09-20 13:22:30 +02:00
commit 6216eedd88
1 changed files with 8 additions and 23 deletions

View File

@ -28,18 +28,8 @@ const route = useRoute();
const router = useRouter(); const router = useRouter();
const state = useState(); const state = useState();
const { notify } = useNotify(); const { notify } = useNotify();
const thermographFilter = {
fields: ['thermographFk'],
where: {
travelFk: null,
},
order: 'thermographFk ASC',
};
const fetchTravelThermographsRef = ref(null);
const allowedContentTypes = ref(''); const allowedContentTypes = ref('');
const user = state.getUser(); const user = state.getUser();
const thermographsOptions = ref([]);
const dmsTypesOptions = ref([]); const dmsTypesOptions = ref([]);
const companiesOptions = ref([]); const companiesOptions = ref([]);
const warehousesOptions = ref([]); const warehousesOptions = ref([]);
@ -168,24 +158,15 @@ const updateThermograph = async () => {
}; };
const onThermographCreated = async (data) => { const onThermographCreated = async (data) => {
await fetchTravelThermographsRef.value.fetch(); thermographForm.thermographId = data.id;
thermographForm.thermographId = data.thermographId;
}; };
</script> </script>
<template> <template>
<FetchData <FetchData
url="DmsContainers/allowedContentTypes" url="DmsContainers/allowedContentTypes"
@on-fetch="(data) => (allowedContentTypes = data.join(', '))" @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
auto-load auto-load
/> />
<FetchData
ref="fetchTravelThermographsRef"
url="TravelThermographs"
@on-fetch="(data) => (thermographsOptions = data)"
:filter="thermographFilter"
auto-load
/>
<FetchData <FetchData
url="DmsTypes" url="DmsTypes"
:filter="{ order: 'name' }" :filter="{ order: 'name' }"
@ -239,15 +220,20 @@ const onThermographCreated = async (data) => {
<VnSelectDialog <VnSelectDialog
:label="t('travel.thermographs.thermograph')" :label="t('travel.thermographs.thermograph')"
v-model="thermographForm.thermographId" v-model="thermographForm.thermographId"
:options="thermographsOptions" url="TravelThermographs"
option-value="thermographFk" option-value="thermographFk"
option-label="thermographFk" option-label="thermographFk"
:fields="['thermographFk']"
:where="{ travelFk: null }"
sort-by="thermographFk ASC"
:disable="viewAction === 'edit'" :disable="viewAction === 'edit'"
:tooltip="t('New thermograph')" :tooltip="t('New thermograph')"
> >
<template #form> <template #form>
<CreateThermographForm <CreateThermographForm
@on-data-saved="onThermographCreated($event, data)" @on-data-saved="
(data) => (thermographForm.thermographId = data.id)
"
/> />
</template> </template>
</VnSelectDialog> </VnSelectDialog>
@ -323,7 +309,6 @@ const onThermographCreated = async (data) => {
</QForm> </QForm>
</QPage> </QPage>
</template> </template>
<i18n> <i18n>
es: es:
Select files: Selecciona ficheros Select files: Selecciona ficheros