verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 71 Releases Wiki Activity

Merge branch 'dev' into Fix-ticketDescriptorWidth
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Javier Segarra 2025-01-28 10:50:34 +00:00
parent 9991c4a462 c67baccaea
commit fa5bdfc5f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Travel/Card/TravelThermographs.vue
View File

@ -132,7 +132,7 @@ const redirectToThermographForm = (action, id) => {
}; };
if (action === 'edit' && id) { if (action === 'edit' && id) {
routeDetails.query = { travelThermographFk: id }; routeDetails.query = { id };
} else if (action === 'create') { } else if (action === 'create') {
routeDetails.query = { agencyModeFk: travel.value?.agencyModeFk }; routeDetails.query = { agencyModeFk: travel.value?.agencyModeFk };
} }

6
src/pages/Travel/Card/TravelThermographsForm.vue
View File

@ -83,7 +83,7 @@ const setEditDefaultParams = async () => {
const filterObj = { include: { relation: 'dms' } }; const filterObj = { include: { relation: 'dms' } };
const filter = encodeURIComponent(JSON.stringify(filterObj)); const filter = encodeURIComponent(JSON.stringify(filterObj));
const { data } = await axios.get( const { data } = await axios.get(
`TravelThermographs/${route.query.travelThermographFk}?filter=${filter}` `TravelThermographs/${route.query.id}?filter=${filter}`,
); );
if (data) { if (data) {
@ -170,7 +170,6 @@ const onThermographCreated = async (data) => {
<QPage class="column items-center full-width"> <QPage class="column items-center full-width">
<QForm <QForm
model="travel"
:form-initial-data="thermographForm" :form-initial-data="thermographForm"
:observe-form-changes="viewAction === 'create'" :observe-form-changes="viewAction === 'create'"
:default-actions="true" :default-actions="true"
@ -210,10 +209,11 @@ const onThermographCreated = async (data) => {
}" }"
sort-by="thermographFk ASC" sort-by="thermographFk ASC"
option-label="thermographFk" option-label="thermographFk"
option-filter-value="thermographFk" option-filter-value="id"
:disable="viewAction === 'edit'" :disable="viewAction === 'edit'"
:tooltip="t('New thermograph')" :tooltip="t('New thermograph')"
:roles-allowed-to-create="['logistic']" :roles-allowed-to-create="['logistic']"
data-key="travelThermographSelect"
> >
<template #form> <template #form>
<CreateThermographForm <CreateThermographForm