diff --git a/src/components/CardProposal.vue b/src/components/CardProposal.vue
index f85fbb9..95dc795 100644
--- a/src/components/CardProposal.vue
+++ b/src/components/CardProposal.vue
@@ -1,6 +1,8 @@
@@ -22,7 +78,7 @@
Tipo de transporte: {{proposal.vehicle.truck_type}}
Fecha de publicación: {{ getDateMonthDay(proposal.vehicle.published_date) }}
Fecha dispobible: {{ getDateMonthDay(proposal.vehicle.available_date) }}
- Disponible en: {{proposal.vehicle.city}}, {{proposal.vehicle.state}}
+ Disponible en: {{proposal.vehicle.city}}, {{proposal.vehicle.state}}
Destino: {{proposal.vehicle.destino}}
Placas remolque 1: {{proposal.vehicle.trailer_plate_1}}
Placas remolque 2: {{proposal.vehicle.trailer_plate_2}}
@@ -40,19 +96,27 @@
-
+ >
Retirar -->
+
+
+ Retirado
+
+
-
@@ -91,6 +155,15 @@
height: 150px;
}
+ .indicator-cancel {
+ width: 120px;
+ padding: 10px 12px;
+ background: #FFF;
+ /* border: 1px solid red; */
+ border-radius: 50px;
+ color: red;
+ }
+
.tracking-icon svg:hover{
height: 33px;
}
diff --git a/src/components/CreateVehicleModal.vue b/src/components/CreateVehicleModal.vue
index b85d3e7..1072abc 100644
--- a/src/components/CreateVehicleModal.vue
+++ b/src/components/CreateVehicleModal.vue
@@ -61,7 +61,7 @@
vehicleForm.trailer_plate_2 = props.vehicle.trailer_plate_2;
vehicleForm.circulation_serial_number = props.vehicle.circulation_serial_number;
vehicleForm.notes = props.vehicle.notes;
- vehicleForm.destino = {city_name: props.vehicle.destino};
+ vehicleForm.destino = props.vehicle.destino;
}
})
@@ -86,7 +86,7 @@
notes: vehicleForm.notes,
company: authStore.user.company,
categories: vehicleForm.categories.length <= 0 ? null : vehicleForm.categories?.map((e) => e._id),
- destino: vehicleForm.destino?.city_name,
+ destino: vehicleForm.destino,
available_date: new Date()
};
let localData = {};
@@ -130,7 +130,7 @@
vehicle_number: (!vehicleForm.vehicle_number) ? 'Campo es requerido' : null,
state: (!vehicleForm.state) ? 'Seleccione estado' : null,
city: (!vehicleForm.city) ? 'Seleccione municipio' : null,
- destino: (!vehicleForm.destino) ? 'Seleccione municipio destino' : null,
+ destino: (!vehicleForm.destino) ? 'Ingrese destino' : null,
};
}
@@ -222,11 +222,14 @@
-
-
- {{ errors.destino }}
diff --git a/src/components/MakeProposalModal.vue b/src/components/MakeProposalModal.vue
index 1850bc7..4c4abae 100644
--- a/src/components/MakeProposalModal.vue
+++ b/src/components/MakeProposalModal.vue
@@ -120,6 +120,7 @@
console.log(vehicleSelected);
const localData = {
vehicle: vehicleSelected,
+ load: props.load,
_driver: vehicleSelected?.driver.first_name + ' ' + vehicleSelected?.driver.last_name
}
loadingSubmit.value = true;
diff --git a/src/components/StatusVehicleModal.vue b/src/components/StatusVehicleModal.vue
index 4ee0789..c3fb433 100644
--- a/src/components/StatusVehicleModal.vue
+++ b/src/components/StatusVehicleModal.vue
@@ -21,7 +21,7 @@
onMounted(() => {
statusSelected.value = props.vehicle.is_available === true ? 'Availiable' : 'Booked'
formAvailiable.state = {state_name: props.vehicle.state};
- formAvailiable.destino = {city_name: props.vehicle.destino};
+ formAvailiable.destino = props.vehicle.destino;
formAvailiable.city = {city_name: props.vehicle.city};
formAvailiable.available_date = props.vehicle.available_date?.substring(0, 10);
});
@@ -50,7 +50,7 @@
if(errors.value.city || errors.value.state || errors.value.destino ) return;
vehicleData = {
available_date : formAvailiable.available_date,
- destino: formAvailiable.destino.city_name,
+ destino: formAvailiable.destino,
city : formAvailiable.city.city_name,
state : formAvailiable.state.state_name,
is_available : true
@@ -86,7 +86,7 @@
errors.value = {
state: (!formAvailiable.state) ? 'Seleccione estado' : null,
city: (!formAvailiable.city) ? 'Seleccione municipio' : null,
- destino: (!formAvailiable.destino) ? 'Seleccione municipio destino' : null,
+ destino: (!formAvailiable.destino) ? 'Ingrese destino' : null,
};
}
@@ -150,13 +150,14 @@
/>
{{ errors.city }}
-
-
-
- {{ errors.destino }}
-
+