+
{
);
state.set('orderTotal', orderTotal);
- const rows = orderData.value.rows.push(...items) || [];
state.set('orderData', {
...orderData.value,
- rows,
+ items,
});
notify(t('globals.dataSaved'), 'positive');
emit('added', -totalQuantity(items));
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 8e3433a5b..550a0684e 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -15,7 +15,7 @@ const sectors = ref([]);
const sectorFilter = { fields: ['id', 'description'] };
const filter = {
- fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+ fields: ['sectorFk', 'code', 'pickingOrder'],
include: [{ relation: 'sector', scope: sectorFilter }],
};
@@ -33,10 +33,6 @@ const filter = {
-
-
-
-
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
@@ -7,7 +7,7 @@ import VnLv from 'components/ui/VnLv.vue';
import useCardDescription from 'composables/useCardDescription';
import { dashIfEmpty, toDate } from 'src/filters';
import RouteDescriptorMenu from 'pages/Route/Card/RouteDescriptorMenu.vue';
-
+import axios from 'axios';
const $props = defineProps({
id: {
type: Number,
@@ -18,10 +18,24 @@ const $props = defineProps({
const route = useRoute();
const { t } = useI18n();
-
+const zone = ref();
+const zoneId = ref();
const entityId = computed(() => {
return $props.id || route.params.id;
});
+const getZone = async () => {
+ const filter = {
+ where: { routeFk: $props.id ? $props.id : route.params.id },
+ };
+ const { data } = await axios.get('Tickets/findOne', {
+ params: {
+ filter: JSON.stringify(filter),
+ },
+ });
+ zoneId.value = data.zoneFk;
+ const { data: zoneData } = await axios.get(`Zones/${zoneId.value}`);
+ zone.value = zoneData.name;
+};
const filter = {
fields: [
@@ -38,7 +52,6 @@ const filter = {
'started',
'finished',
'cost',
- 'zoneFk',
'isOk',
],
include: [
@@ -47,7 +60,13 @@ const filter = {
relation: 'vehicle',
scope: { fields: ['id', 'm3'] },
},
- { relation: 'zone', scope: { fields: ['id', 'name'] } },
+ {
+ relation: 'ticket',
+ scope: {
+ fields: ['id', 'name', 'zoneFk'],
+ include: { relation: 'zone', scope: { fields: ['id', 'name'] } },
+ },
+ },
{
relation: 'worker',
scope: {
@@ -65,6 +84,9 @@ const filter = {
};
const data = ref(useCardDescription());
const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+onMounted(async () => {
+ getZone();
+});
@@ -81,11 +103,11 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
-
+
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 9bf0a2f4e..633ff44bc 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -43,7 +43,6 @@ const routeFilter = {
'started',
'finished',
'cost',
- 'zoneFk',
'isOk',
],
include: [
@@ -52,7 +51,13 @@ const routeFilter = {
relation: 'vehicle',
scope: { fields: ['id', 'm3'] },
},
- { relation: 'zone', scope: { fields: ['id', 'name'] } },
+ {
+ relation: 'ticket',
+ scope: {
+ fields: ['id', 'name', 'zoneFk'],
+ include: { relation: 'zone', scope: { fields: ['id', 'name'] } },
+ },
+ },
{
relation: 'worker',
scope: {