ETA/WebETA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes: vehicles & offers

Browse Source
This commit is contained in:
Alexandro Uc Santos
2024-07-29 13:39:57 -06:00
parent d9a0cd626f
commit 0870d96f73
9 changed files with 101 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/AttachmentsModal.vue
View File

@@ -9,7 +9,6 @@
const { getAttachmentLoad, loading, attachments } = useAttachments();
onMounted(() => {
console.log('se ejcyta attach');
getAttachmentLoad();
})
const { t } = useI18n();

7
src/components/CardLoad.vue
View File

@@ -120,8 +120,8 @@
</div>
<div class="col-lg-6 col-sm-12" v-if="authStore.user?.permissions === 'role_shipper'">
<p><span>{{t('loads.postStatus')}}:</span> <span>{{ getStatusPublished(load) }}</span></p>
<p :style="{color: getStatusLoad(load).color}"><span>{{t('loads.loadStatus')}}:</span> <span>{{ getStatusLoad(load).status }}</span></p>
<p><span>{{t('loads.postStatus')}}:</span> <span class="simple">{{ getStatusPublished(load) }}</span></p>
<p :style="{color: getStatusLoad(load).color}"><span>{{t('loads.loadStatus')}}:</span> <spa class="simple">{{ getStatusLoad(load).status }}</spa></p>
</div>
</div>
<div class="divider"></div>
@@ -231,7 +231,7 @@
height: 33px;
}
p {
p .simple {
font-size: 1rem;
font-weight: 400;
color: #323032;
@@ -242,6 +242,7 @@
font-weight: 700;
}
.btn-row {
margin-top: 2rem;
display: flex;

26
src/components/CardProposal.vue
View File

@@ -4,6 +4,7 @@
import { getStatusLoad } from '../helpers/status';
import { useCompanyStore } from '../stores/company';
import { useAuthStore } from '../stores/auth';
import { useLoadsStore } from '../stores/loads';
import { useI18n } from 'vue-i18n';
const props = defineProps({
@@ -17,6 +18,7 @@
const companyStore = useCompanyStore();
const authStore = useAuthStore();
const loadsStore = useLoadsStore();
const { t, locale } = useI18n();
const handleWithdrawnProposal = async() => {
@@ -72,6 +74,11 @@
}
defineEmits(['set-proposal']);
const openAttachmentsModal = () => {
loadsStore.currentLoad = props.proposal.load;
loadsStore.openAttachmentsModal = true;
}
</script>
<template>
@@ -86,26 +93,33 @@
<p v-if="proposal.vehicle"><span>{{ t('labels.dateAvailable') }}:</span> {{ getDateMonthDay(proposal.vehicle.available_date) }}</p>
<p v-if="proposal.vehicle"><span>{{ t('vehicles.availableIn') }}:</span> {{proposal.vehicle.city}}<template v-if="proposal.vehicle.state">, {{proposal.vehicle.state}}</template></p>
<p v-if="proposal.vehicle"><span>{{ t('loads.destination') }}:</span> {{proposal.vehicle.destino}}</p>
<p><span>{{ t('vehicles.truckPlates') }}:</span> {{ proposal.vehicle.circulation_serial_number }}</p>
<p v-if="proposal.vehicle"><span>{{ t('vehicles.trailerPlates') }} 1:</span> {{proposal.vehicle.trailer_plate_1}}</p>
<p v-if="proposal.vehicle"><span>{{ t('vehicles.trailerPlates') }} 2:</span> {{proposal.vehicle.trailer_plate_2}}</p>
<p v-if="proposal.vehicle" :style="{color: getStatusLoad(proposal.load, locale).color}"><span>{{ t('loads.loadStatus') }}:</span> {{ getStatusLoad(proposal.load, locale).status}}</p>
</div>
<div class="">
<p v-if="proposal.load"> {{ t('loads.loadCode') }}:
<p v-if="proposal.load"> <span>{{ t('loads.loadCode') }}: </span>
<span
class="code-enruta"
@click="$emit('set-proposal', {proposal: proposal, modal: 'detail'})"
data-toggle="modal" data-target="#loadDetailModal"
>{{proposal.load.shipment_code}}</span></p>
<p v-if="proposal.vehicle" :style="{color: getStatusLoad(proposal.load, locale).color}"><span>{{ t('loads.loadStatus') }}:</span> {{ getStatusLoad(proposal.load, locale).status}}</p>
<p v-if="proposal._driver">{{ t('labels.operator') }}: {{proposal._driver}}</p>
</div>
</div>
<div class="btn-row">
<!-- <button
class="btn-primary-sm"
data-toggle="modal" data-target="#editcompanymodal"
><i class="fa-solid fa-ban"></i> Retirar</button> -->
<button
type="button"
data-toggle="modal" data-target="#attachmentModal"
class="btn-primary-sm"
@click="openAttachmentsModal"
>
<i class="fa-solid fa-image"></i>
{{ t('evidence.evidence') }}
</button>
<div v-if="proposal.is_withdrawn" class="indicator-cancel">
<i class="fa-solid fa-ban"></i>
{{ t('proposals.retired') }}

11
src/components/CardVehicle.vue
View File

@@ -4,6 +4,7 @@
import { useVehiclesStore } from '../stores/vehicles';
import { useAuthStore } from '../stores/auth';
import { useI18n } from 'vue-i18n';
import { getStatusLoad } from '../helpers/status';
const props = defineProps({
vehicle: {
@@ -14,7 +15,7 @@
console.log(props.vehicle);
defineEmits(['set-vehicle']);
const { t } = useI18n()
const { t, locale } = useI18n()
const vehicleStore = useVehiclesStore();
const authStore = useAuthStore();
@@ -81,13 +82,13 @@
</i>
</span>
</p>
<p v-if="vehicle.is_available">{{ t('vehicles.availableIn') }}: <span>{{ vehicle.destino }}</span></p>
</div>
<div class="col-lg-6">
<p>{{ t('vehicles.truckPlates') }}: <span>{{ vehicle.circulation_serial_number }}</span></p>
<p>{{ t('vehicles.trailerPlates') }} 1: <span>{{ vehicle.trailer_plate_1 }}</span></p>
</div>
<div class="col-lg-6">
<p>{{ t('vehicles.trailerPlates') }} 2: <span>{{ vehicle.trailer_plate_2 }}</span></p>
<p>{{ t('vehicles.chargingBase') }}: <span>{{ vehicle.city }}, {{ vehicle.state }}</span></p>
<p v-if="vehicle.is_available">{{ t('vehicles.availableIn') }}: <span>{{ vehicle.destino }}</span></p>
<p>Status:
<span>{{ vehicle.is_available ? t('vehicles.available') : t('vehicles.reserved')}}
<i
@@ -99,6 +100,8 @@
</span>
</p>
<p v-if="vehicle.is_available">{{ t('vehicles.availableDate') }}: <span>{{ getDateMonthDayEs(vehicle.available_date, false) }}</span></p>
<p v-if="vehicle.active_load">{{ t('loads.loadCode') }}: <span>{{ vehicle.active_load.shipment_code}}</span></p>
<p v-if="vehicle.active_load">{{ t('loads.loadStatus') }}: <span>{{ getStatusLoad(vehicle.active_load, locale).status}}</span></p>
</div>
</div>
<p v-if="vehicle.notes">{{ t('vehicles.additionalInfoVehicle') }}:</p>