fix: elements to showm in make proposals
This commit is contained in:
@@ -65,12 +65,13 @@
|
||||
let filterQuery = [];
|
||||
// filterQuery.company = "company="+ authStore.user.company._id
|
||||
filterQuery.company = "company="+companyId
|
||||
await vehiclesStore.fetchVehicles(filterQuery);
|
||||
filterQuery.elements = "elements="+200
|
||||
await vehiclesStore.fetchVehiclesToProposals(filterQuery);
|
||||
if(!props.proposal) {
|
||||
vehiclesAvailable.value = vehiclesStore.vehicles;
|
||||
vehiclesAvailable.value = vehiclesStore.vehiclesToProposals;
|
||||
} else {
|
||||
// vehiclesAvailable.value = vehiclesStore.vehicles.filter((vehicle) => vehicle._id === props.proposal.vehicle._id);
|
||||
vehiclesAvailable.value = vehiclesStore.vehicles.filter((vehicle) => vehicle.is_available || vehicle._id === props.proposal.vehicle._id);
|
||||
vehiclesAvailable.value = vehiclesStore.vehiclesToProposals.filter((vehicle) => vehicle.is_available || vehicle._id === props.proposal.vehicle._id);
|
||||
}
|
||||
originCoords.value = {lat: Number.parseFloat(props.load.origin.lat), lng: Number.parseFloat(props.load.origin.lng)};
|
||||
destinationCoords.value = {lat: Number.parseFloat(props.load.destination.lat), lng: Number.parseFloat(props.load.destination.lng)};;
|
||||
@@ -194,7 +195,11 @@
|
||||
v-model="form.vehicle"
|
||||
>
|
||||
<option disabled value="">-- {{ t('proposals.selectVehicle') }} --</option>
|
||||
<option v-for="vehicle in vehiclesAvailable" :value="vehicle._id">{{vehicle.vehicle_code?.toUpperCase()}} - {{ vehicle.truck_type }}</option>
|
||||
<option v-for="vehicle in vehiclesAvailable" :value="vehicle._id">
|
||||
{{vehicle.vehicle_code?.toUpperCase()}} - {{ vehicle.truck_type }}
|
||||
<span v-if="vehicle?.driver">- {{ vehicle?.driver?.first_name + ' ' + vehicle?.driver?.last_name }}</span>
|
||||
<span v-else>- Sin conductor</span>
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="custom-selected-field">
|
||||
|
||||
@@ -5,6 +5,7 @@ import { useI18n } from "vue-i18n";
|
||||
export const useVehiclesStore = defineStore('vehicles', () => {
|
||||
|
||||
const vehicles = ref([]);
|
||||
const vehiclesToProposals = ref([]);
|
||||
const vehiclesTotal = ref(0);
|
||||
const vehiclesCurrentPage = ref(0)
|
||||
const { t } = useI18n()
|
||||
@@ -26,6 +27,21 @@ export const useVehiclesStore = defineStore('vehicles', () => {
|
||||
}
|
||||
}
|
||||
|
||||
const fetchVehiclesToProposals = async(filterQuery) => {
|
||||
let filterArr = Object.values(filterQuery);
|
||||
|
||||
let cleanfilterArr = filterArr.filter(n=>n);
|
||||
var filterStr = "";
|
||||
if(cleanfilterArr.length > 0){
|
||||
filterStr ="?"+cleanfilterArr.join("&");
|
||||
}
|
||||
|
||||
const resp = await getVehicles(filterStr + '&$sort%5BcreatedAt%5D=-1');
|
||||
if(resp !== null) {
|
||||
vehiclesToProposals.value = resp.data;
|
||||
}
|
||||
}
|
||||
|
||||
const createVehicleCompany = async(formData, localData = {}) => {
|
||||
const data = await createVehicle(formData);
|
||||
if(data) {
|
||||
@@ -77,7 +93,9 @@ export const useVehiclesStore = defineStore('vehicles', () => {
|
||||
vehicles,
|
||||
vehiclesTotal,
|
||||
vehiclesCurrentPage,
|
||||
vehiclesToProposals,
|
||||
fetchVehicles,
|
||||
fetchVehiclesToProposals,
|
||||
createVehicleCompany,
|
||||
updateVehicleCompany,
|
||||
deleteVehicleCompany,
|
||||
|
||||
Reference in New Issue
Block a user