fixes: make proposals
This commit is contained in:
@@ -14,8 +14,6 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
console.log(props.proposal)
|
|
||||||
|
|
||||||
const companyStore = useCompanyStore();
|
const companyStore = useCompanyStore();
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
const loadsStore = useLoadsStore();
|
const loadsStore = useLoadsStore();
|
||||||
@@ -86,7 +84,7 @@
|
|||||||
<br>
|
<br>
|
||||||
<div class="box-proposal">
|
<div class="box-proposal">
|
||||||
<div class="">
|
<div class="">
|
||||||
<p v-if="proposal.vehicle"><span>{{ t('labels.codeId') }}:</span> {{proposal.vehicle.vehicle_code}}</p>
|
<p v-if="proposal.vehicle"><span>{{ t('labels.codeId') }}:</span> {{proposal.vehicle.vehicle_code?.toUpperCase()}}</p>
|
||||||
<p v-if="proposal.vehicle"><span>{{ t('global.segment') }}:</span> {{proposal.load.categories?.map((e) => e.name).join(', ')}}</p>
|
<p v-if="proposal.vehicle"><span>{{ t('global.segment') }}:</span> {{proposal.load.categories?.map((e) => e.name).join(', ')}}</p>
|
||||||
<p v-if="proposal.vehicle"><span>{{ t('directory.typeTruck') }}:</span> {{proposal.vehicle.truck_type}}</p>
|
<p v-if="proposal.vehicle"><span>{{ t('directory.typeTruck') }}:</span> {{proposal.vehicle.truck_type}}</p>
|
||||||
<p v-if="proposal.vehicle"><span>{{ t('labels.datePublished') }}:</span> {{ getDateMonthDay(proposal.vehicle.published_date) }}</p>
|
<p v-if="proposal.vehicle"><span>{{ t('labels.datePublished') }}:</span> {{ getDateMonthDay(proposal.vehicle.published_date) }}</p>
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
const vehiclesStore = useVehiclesStore();
|
const vehiclesStore = useVehiclesStore();
|
||||||
const msgError = ref('');
|
const msgError = ref('');
|
||||||
|
const vehiclesAvailable = ref([]);
|
||||||
|
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
vehicle: "",
|
vehicle: "",
|
||||||
@@ -63,11 +64,15 @@
|
|||||||
let filterQuery = [];
|
let filterQuery = [];
|
||||||
filterQuery.company = "company="+ authStore.user.company
|
filterQuery.company = "company="+ authStore.user.company
|
||||||
await vehiclesStore.fetchVehicles(filterQuery);
|
await vehiclesStore.fetchVehicles(filterQuery);
|
||||||
|
if(!props.proposal) {
|
||||||
|
vehiclesAvailable.value = vehiclesStore.vehicles.filter((vehicle) => vehicle.is_available);
|
||||||
|
} else {
|
||||||
|
vehiclesAvailable.value = vehiclesStore.vehicles.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)};
|
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)};;
|
destinationCoords.value = {lat: Number.parseFloat(props.load.destination.lat), lng: Number.parseFloat(props.load.destination.lng)};;
|
||||||
polylines.value = await getDirections(originCoords.value, destinationCoords.value);
|
polylines.value = await getDirections(originCoords.value, destinationCoords.value);
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
// console.log(props.proposal);
|
|
||||||
if(props.proposal) {
|
if(props.proposal) {
|
||||||
form.vehicle = props.proposal.vehicle._id;
|
form.vehicle = props.proposal.vehicle._id;
|
||||||
form.comments = props.proposal.comment;
|
form.comments = props.proposal.comment;
|
||||||
@@ -120,9 +125,8 @@
|
|||||||
comment: form.comments,
|
comment: form.comments,
|
||||||
vehicle : form.vehicle,
|
vehicle : form.vehicle,
|
||||||
}
|
}
|
||||||
const index = vehiclesStore.vehicles.findIndex((prop) => prop._id === form.vehicle);
|
const index = vehiclesAvailable.value.findIndex((prop) => prop._id === form.vehicle);
|
||||||
const vehicleSelected = vehiclesStore.vehicles[index];
|
const vehicleSelected = vehiclesAvailable.value[index];
|
||||||
// console.log(vehicleSelected);
|
|
||||||
const localData = {
|
const localData = {
|
||||||
vehicle: vehicleSelected,
|
vehicle: vehicleSelected,
|
||||||
load: props.load,
|
load: props.load,
|
||||||
@@ -184,7 +188,7 @@
|
|||||||
v-model="form.vehicle"
|
v-model="form.vehicle"
|
||||||
>
|
>
|
||||||
<option disabled value="">-- {{ t('proposals.selectVehicle') }} --</option>
|
<option disabled value="">-- {{ t('proposals.selectVehicle') }} --</option>
|
||||||
<option v-for="vehicle in vehiclesStore.vehicles" :value="vehicle._id">{{vehicle.vehicle_code}}</option>
|
<option v-for="vehicle in vehiclesAvailable" :value="vehicle._id">{{vehicle.vehicle_code?.toUpperCase()}} - {{ vehicle.truck_type }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="custom-selected-field">
|
<div class="custom-selected-field">
|
||||||
|
|||||||
@@ -15,13 +15,11 @@ import { watch } from 'vue';
|
|||||||
const { t, locale } = useI18n();
|
const { t, locale } = useI18n();
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
console.log('INIT popup');
|
|
||||||
lang.value = localStorage.getItem('lang') ?? 'es';
|
lang.value = localStorage.getItem('lang') ?? 'es';
|
||||||
locale.value = lang.value;
|
locale.value = lang.value;
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(lang, () => {
|
watch(lang, () => {
|
||||||
console.log('change lang')
|
|
||||||
locale.value = lang.value
|
locale.value = lang.value
|
||||||
localStorage.setItem('lang', lang.value)
|
localStorage.setItem('lang', lang.value)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ export const getDayMonthYear = (value) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const getDateMonthDay = (value) => {
|
export const getDateMonthDay = (value) => {
|
||||||
console.log(value)
|
|
||||||
// Crear una fecha a partir del valor proporcionado
|
// Crear una fecha a partir del valor proporcionado
|
||||||
const date = new Date(value);
|
const date = new Date(value);
|
||||||
// Ajustar la fecha a la zona horaria de México manualmente
|
// Ajustar la fecha a la zona horaria de México manualmente
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ export const useAuthStore = defineStore('auth', () => {
|
|||||||
user.value = resp.data.user;
|
user.value = resp.data.user;
|
||||||
sesion.value = resp.data.session_token;
|
sesion.value = resp.data.session_token;
|
||||||
token.value = resp.data.accessToken;
|
token.value = resp.data.accessToken;
|
||||||
console.log(resp.data.user)
|
|
||||||
localStorage.setItem('session', resp.data.session_token);
|
localStorage.setItem('session', resp.data.session_token);
|
||||||
localStorage.setItem('access', resp.data.accessToken);
|
localStorage.setItem('access', resp.data.accessToken);
|
||||||
localStorage.setItem('id', resp.data.user.company._id);
|
localStorage.setItem('id', resp.data.user.company._id);
|
||||||
@@ -72,7 +71,6 @@ export const useAuthStore = defineStore('auth', () => {
|
|||||||
|
|
||||||
const updateProfile = async(data) => {
|
const updateProfile = async(data) => {
|
||||||
const response = await updateMyUserProfile(data);
|
const response = await updateMyUserProfile(data);
|
||||||
// console.log(response);
|
|
||||||
if( response.msg === 'success') {
|
if( response.msg === 'success') {
|
||||||
user.value = response.data;
|
user.value = response.data;
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ export const useCompanyStore = defineStore('company', () => {
|
|||||||
|
|
||||||
const getCompanyData = async() => {
|
const getCompanyData = async() => {
|
||||||
const companyId = localStorage.getItem('id');
|
const companyId = localStorage.getItem('id');
|
||||||
console.log({companyId});
|
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
if(!company.value) {
|
if(!company.value) {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
@@ -39,7 +38,6 @@ export const useCompanyStore = defineStore('company', () => {
|
|||||||
|
|
||||||
const getUsersCompany = async(limit = 1, page = 0, reload = false) => {
|
const getUsersCompany = async(limit = 1, page = 0, reload = false) => {
|
||||||
const companyId = localStorage.getItem('id');
|
const companyId = localStorage.getItem('id');
|
||||||
console.log(companyId);
|
|
||||||
if(users.value.length <= 0 || reload === true) {
|
if(users.value.length <= 0 || reload === true) {
|
||||||
// const filter = `company=${companyId}`;
|
// const filter = `company=${companyId}`;
|
||||||
const filter = `company=${companyId}&elements=${limit}&page=${page}`;
|
const filter = `company=${companyId}&elements=${limit}&page=${page}`;
|
||||||
@@ -175,7 +173,6 @@ export const useCompanyStore = defineStore('company', () => {
|
|||||||
try {
|
try {
|
||||||
if(proposals.value.length <= 0 || reload) {
|
if(proposals.value.length <= 0 || reload) {
|
||||||
const endpoint = `/v1/proposals/find?carrier=${companyId}&${filter}&$sort%5BcreatedAt%5D=-1`;
|
const endpoint = `/v1/proposals/find?carrier=${companyId}&${filter}&$sort%5BcreatedAt%5D=-1`;
|
||||||
console.log(endpoint)
|
|
||||||
const {data} = await api.get(endpoint);
|
const {data} = await api.get(endpoint);
|
||||||
proposals.value = data.data;
|
proposals.value = data.data;
|
||||||
proposalsTotal.value = data.total;
|
proposalsTotal.value = data.total;
|
||||||
@@ -223,7 +220,6 @@ export const useCompanyStore = defineStore('company', () => {
|
|||||||
if(budgets.value.length <= 0 || reload === true) {
|
if(budgets.value.length <= 0 || reload === true) {
|
||||||
try {
|
try {
|
||||||
const data = await getBudgets(filterStr);
|
const data = await getBudgets(filterStr);
|
||||||
console.log(data.total);
|
|
||||||
if(data.total > 0) {
|
if(data.total > 0) {
|
||||||
budgets.value = data.data;
|
budgets.value = data.data;
|
||||||
budgetsTotal.value = data.total;
|
budgetsTotal.value = data.total;
|
||||||
|
|||||||
@@ -54,7 +54,6 @@
|
|||||||
openModal.value = false;
|
openModal.value = false;
|
||||||
openModalProposal.value = false;
|
openModalProposal.value = false;
|
||||||
proposalCurrent.value = null;
|
proposalCurrent.value = null;
|
||||||
// console.log('clear proposal');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -84,7 +84,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
const handleSetCurrentVehicle = (data) => {
|
const handleSetCurrentVehicle = (data) => {
|
||||||
console.log(data);
|
|
||||||
if(data.modal === 'form') {
|
if(data.modal === 'form') {
|
||||||
openModal.value = true;
|
openModal.value = true;
|
||||||
} else if (data.modal === 'driver') {
|
} else if (data.modal === 'driver') {
|
||||||
|
|||||||
Reference in New Issue
Block a user