7167-testToMaster_2414 #266

Merged
alexm merged 230 commits from 7167-testToMaster_2414 into master 2024-04-04 05:35:08 +00:00
4 changed files with 17 additions and 3 deletions
Showing only changes of commit b5edc98732 - Show all commits

View File

@ -706,11 +706,15 @@ export default {
code: 'Code',
pickingOrder: 'Picking order',
sector: 'Sector',
row: 'Row',
column: 'Column',
},
basicData: {
code: 'Code',
pickingOrder: 'Picking order',
sector: 'Sector',
row: 'Row',
column: 'Column',
},
},
invoiceIn: {

View File

@ -763,10 +763,14 @@ export default {
summary: {
code: 'Código',
pickingOrder: 'Orden de recogida',
row: 'Fila',
column: 'Columna',
},
basicData: {
code: 'Código',
pickingOrder: 'Orden de recogida',
row: 'Fila',
column: 'Columna',
},
},
invoiceIn: {

View File

@ -15,7 +15,7 @@ const parkingId = route.params?.id || null;
const sectors = ref([]);
const filter = {
fields: ['sectorFk', 'code', 'pickingOrder'],
fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
};
</script>
@ -28,7 +28,7 @@ const filter = {
auto-load
/>
<VnSubToolbar />
<FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
<FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
<template #form="{ data }">
<VnRow>
<VnInput v-model="data.code" :label="t('parking.basicData.code')" />
@ -37,6 +37,10 @@ const filter = {
:label="t('parking.basicData.pickingOrder')"
/>
</VnRow>
<VnRow>
<VnInput v-model="data.row" :label="t('parking.basicData.row')" />
<VnInput v-model="data.column" :label="t('parking.basicData.column')" />
</VnRow>
<VnRow>
<VnSelectFilter
v-model="data.sectorFk"

View File

@ -17,7 +17,7 @@ const { t } = useI18n();
const entityId = computed(() => $props.id || route.params.id);
const filter = {
fields: ['sectorFk', 'code', 'pickingOrder'],
fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
};
</script>
@ -43,6 +43,8 @@ const filter = {
:label="t('parking.summary.sector')"
:value="parking.sector?.description"
/>
<VnLv :label="t('parking.summary.row')" :value="parking.row" />
<VnLv :label="t('parking.summary.column')" :value="parking.column" />
</QCard>
</template>
</CardSummary>