diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f682537f6..51de81bcc 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -59,11 +59,25 @@ const zoneWhere = computed(() => {
});
async function getLanded(params) {
- getDate(`Agencies/getLanded`, params);
+ const data = await getDate(`Agencies/getLanded`, params);
+ formData.value.landed = data.landed;
+ const shippedDate = new Date(params.shipped);
+ const landedDate = new Date(data.hour);
+ shippedDate.setHours(
+ landedDate.getHours(),
+ landedDate.getMinutes(),
+ landedDate.getSeconds(),
+ );
+ formData.value.shipped = shippedDate.toISOString();
}
async function getShipped(params) {
- getDate(`Agencies/getShipped`, params);
+ const data = await getDate(`Agencies/getShipped`, params);
+ formData.value.landed = params.landed;
+ const [hours, minutes, seconds] = data.hour.split(':').map(Number);
+ let shippedDate = new Date(data.shipped);
+ shippedDate.setHours(hours, minutes, seconds);
+ formData.value.shipped = shippedDate.toISOString();
}
async function getDate(query, params) {
@@ -75,15 +89,8 @@ async function getDate(query, params) {
if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
formData.value.zoneFk = data.zoneFk;
- formData.value.landed = data.landed;
- const shippedDate = new Date(params.shipped);
- const landedDate = new Date(data.hour);
- shippedDate.setHours(
- landedDate.getHours(),
- landedDate.getMinutes(),
- landedDate.getSeconds(),
- );
- formData.value.shipped = shippedDate.toISOString();
+
+ return data;
}
const onChangeZone = async (zoneId) => {
@@ -422,14 +429,6 @@ async function getZone(options) {
:rules="validate('ticketList.shipped')"
@update:model-value="setShipped"
/>
-