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

add: services warehouse & fix modal carrierInfo

Browse Source
This commit is contained in:
Alexandro Uc Santos
2025-04-09 19:51:45 -06:00
parent 9bb69c112f
commit 9480aab9d7
12 changed files with 191 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/main.css
View File

@@ -52,6 +52,10 @@ body {
cursor: pointer;
}
.pointer {
cursor: pointer
}
.btn-lg-block{
width: 100%;
}

18
src/components/CardLoad.vue
View File

@@ -90,6 +90,11 @@
loadsStore.openProposalsModal = true;
}
const openCarrierInfoModal = () => {
loadsStore.currentLoad = props.load
loadsStore.openCarrierInfoModal = true;
}
const handleTracking = () => {
let code = props.load._id;
window.open('/publico/tracking/' + code, '_blank');
@@ -142,7 +147,18 @@
{{ load.company?.company_name }}
</p>
<div v-if="!readOnly">
<p><span>{{t('loads.postStatus')}}:</span> <span class="simple">{{ getStatusPublished(load) }}</span></p>
<p>
<span>{{t('loads.postStatus')}}: </span>
<span class="simple"> {{ getStatusPublished(load) }}</span>
<i
v-if="load.status !== 'Draft' && load.status !== 'Published'"
class="fa-solid fa-truck me-1 ms-1 pointer"
data-toggle="modal"
data-target="#carrierInfoModal"
@click="openCarrierInfoModal()"
style="color: green; font-size: 20px;"
></i>
</p>
<p :style="{color: getStatusLoad(load).color}"><span>{{t('loads.loadStatus')}}:</span> <span class="simple">{{ getStatusLoad(load).status }}</span></p>
</div>
</div>

109
src/components/CarrierInfoModal.vue Normal file
View File

@@ -0,0 +1,109 @@
<script setup>
import { getDateMonthDay } from '../helpers/date_formats';
import { useLoadsStore } from '../stores/loads';
import VehicleInfo from './VehicleInfo.vue';
import { useI18n } from 'vue-i18n';
const props = defineProps({
load: {
type: Object,
required: true
}
});
const { t } = useI18n();
const loadsStore = useLoadsStore();
const clearModal = () => {
loadsStore.currentLoad = null;
loadsStore.openCarrierInfoModal = false;
}
</script>
<template>
<div class="modal fade" id="carrierInfoModal" tabindex="-1" role="dialog" aria-labelledby="editcompany" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="title mt-2 mb-3">Información del transportista</h2>
<button
id="btnCloseCarrierInfoModal"
type="button"
@click="clearModal()"
class="close bg-white" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body view-proposals">
<div>
<div class="row">
<div class="col-lg-6 col-md-12">
<p>{{ t('global.company') }}: <span>{{ load?.carrier?.company_name }}</span></p>
<p>{{ t('proposals.bidder') }}: <span>{{ load?.bidder?.first_name }} {{ load?.bidder?.last_name }}</span></p>
<p>{{ t('proposals.numCarrier') }}: <span>{{load?.carrier?.company_code}}</span></p>
</div>
<div class="col-lg-6 col-md-12">
<p>{{ t('labels.date') }}: <span>{{ getDateMonthDay(load?.carrier?.createdAt) }}</span></p>
<p>RFC: <span v-if="load.vehicle">{{load?.carrier?.rfc}}</span></p>
</div>
</div>
<VehicleInfo
v-if="load.vehicle"
:vehicle="load.vehicle"
:driver="load.driver"
/>
</div>
</div>
<div class="modal-footer">
<button
type="button"
class="btn btn-dark"
@click="clearModal()"
data-dismiss="modal">{{ t('buttons.close') }}</button>
</div>
</div>
</div>
</div>
</template>
<style scoped>
.view-proposals {
width: 100%;
}
.card-proposal {
flex-direction: column;
width: 100% !important;
}
p {
font-size: 1rem;
font-weight: 400;
color: #323032;
font-weight: 700;
}
p span {
color: #323032;
font-weight: normal;
}
.indicator-check {
width: 120px;
padding: 10px 12px;
background: #FFF;
border: 1px solid green;
border-radius: 50px;
color: green;
}
.box-note {
padding: 12px 16px;
background-color: aqua;
border-radius: 13px;
}
</style>

14
src/components/ProposalsModal.vue
View File

@@ -22,6 +22,7 @@
const getProposalsData = async() => {
isLoading.value = true;
await loadsStore.getProposalsOfLoads(loadsStore.currentLoad._id);
console.log(loadsStore.proposalsOfLoads)
isLoading.value = false;
}
@@ -185,18 +186,21 @@
<div class="col-lg-6 col-md-12">
<p>{{ t('global.company') }}: <span>{{ proposal.carrier.company_name }}</span></p>
<p>{{ t('proposals.bidder') }}: <span>{{ proposal.bidder.first_name }} {{ proposal.bidder.last_name }}</span></p>
<p>{{ t('proposals.numCarrier') }}: <span v-if="proposal.vehicle">{{proposal.vehicle.vehicle_code}}</span></p>
<p>{{ t('proposals.numCarrier') }}: <span>{{proposal.carrier.company_code}}</span></p>
</div>
<div class="col-lg-6 col-md-12">
<p>{{ t('labels.date') }}: <span>{{ getDateMonthDay(proposal.createdAt) }}</span></p>
<p>{{ t('directory.typeTruck') }}: <span v-if="proposal.vehicle">{{proposal.vehicle.truck_type}}</span></p>
<p>{{ t('global.carrier') }}: <span v-if="proposal._driver">{{proposal._driver}}</span></p>
<p>{{ t('labels.date') }}: <span>{{ getDateMonthDay(proposal.carrier.createdAt) }}</span></p>
<p>RFC: <span>{{proposal.carrier.rfc}}</span></p>
</div>
</div>
<div v-if="proposal.comment" class="box-note">
{{ proposal.comment }}
</div>
<VehicleInfo v-if="proposal.vehicle" :vehicle="proposal.vehicle"/>
<VehicleInfo
v-if="proposal.vehicle"
:vehicle="proposal.vehicle"
:driver="proposal.driver"
/>
<Spiner v-if="isLoadingActions"/>
<div class="d-flex justify-content-end gap-3" v-else>
<div v-if="proposal.is_accepted" class="indicator-check">

19
src/components/VehicleInfo.vue
View File

@@ -1,11 +1,16 @@
<script setup>
import { computed } from 'vue';
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
defineProps({
const props = defineProps({
vehicle: {
type: Object,
required: true
},
driver: {
type: Object,
required: false
}
})
@@ -16,6 +21,16 @@ import { useI18n } from 'vue-i18n';
const toogle = () => {
isShow.value = !isShow.value;
}
const driver = computed(() => {
console.log(props.driver);
if(props?.driver) {
return !props?.driver ? 'No definido'
: props?.driver.first_name + ' ' + props?.driver.last_name
} else {
return props.vehicle.driver.first_name + ' ' + props.vehicle.driver.last_name;
}
});
</script>
<template>
@@ -31,7 +46,7 @@ import { useI18n } from 'vue-i18n';
<div class="col-lg-6">
<p>{{ t('labels.codeId') }}: <span>{{ vehicle.vehicle_code.toUpperCase() }}</span></p>
<p>{{ t('directory.typeTruck') }}: <span>{{ vehicle.truck_type }}</span></p>
<p>{{ t('vehicles.assignedDriver') }}: <span>{{ vehicle.driver.first_name + ' ' + vehicle.driver.last_name }}</span></p>
<p>{{ t('vehicles.assignedDriver') }}: <span>{{ driver }}</span></p>
<p>{{ t('global.segment') }}: <span>{{ vehicle._categories }}</span></p>
</div>
<div class="col-lg-6">

146
src/data/store-dumies.json
View File

@@ -1,146 +0,0 @@
[
{
"status": "Loading",
"date": "2025-01-08T03:24:18.821Z",
"shipment_code": "ETA1010",
"product": "Maiz",
"truck_type": "Torton",
"truck_plates": "YUC9101",
"driver_name": "Alexandro Uc",
"note": "Comentario de prueba",
"weigth_load": 2000,
"company": "ALTOS"
},
{
"status": "Loading",
"date": "2025-02-08T03:24:18.821Z",
"shipment_code": "ETA1010",
"product": "Maiz",
"truck_type": "Torton",
"truck_plates": "YUC9102",
"driver_name": "Jose Santos",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "ALTOS"
},
{
"status": "Loading",
"date": "2025-02-08T01:00:57.627Z",
"shipment_code": "ETA1007",
"product": "Maiz",
"truck_type": "Full",
"truck_plates": "YUC9102",
"driver_name": "Raul Torres",
"note": "Comentario de prueba",
"weigth_load": 3000,
"company": "SOPAA"
},
{
"status": "Loading",
"date": "2025-02-09T19:36:13.562Z",
"shipment_code": "ETA1014",
"product": "Maiz",
"truck_type": "Torton",
"truck_plates": "YUC9123",
"driver_name": "Manuel Yuc",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "USIOA"
},
{
"status": "Loading",
"date": "2025-02-08T00:29:10.471Z",
"shipment_code": "ETA1021",
"product": "Maiz",
"truck_type": "Torton",
"truck_plates": "YUC9101",
"driver_name": "Alexandro Uc",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "ALTOS"
},
{
"status": "Loading",
"date": "2025-02-08T02:47:28.823Z",
"shipment_code": "ETA1013",
"product": "Maiz",
"truck_type": "Torton",
"truck_plates": "YUC9120",
"driver_name": "Ramiro Alcocer",
"note": "Comentario de prueba",
"weigth_load": 3992,
"company": "JSKA"
},
{
"status": "Loading",
"date": "2025-02-09T02:47:28.823Z",
"shipment_code": "ETA1023",
"product": "Maiz",
"truck_type": "Full Trailer",
"truck_plates": "YUC9101",
"driver_name": "Alexandro Uc",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "ALTOS"
},
{
"status": "Transit",
"date": "2025-02-08T02:47:28.823Z",
"shipment_code": "ETA1024",
"product": "Frijol",
"truck_type": "Torton",
"truck_plates": "DKS9101",
"driver_name": "Sergio Martinez",
"note": "Comentario de prueba",
"weigth_load": 233.20,
"company": "SILA"
},
{
"status": "Loading",
"date": "2025-02-08T02:47:28.823Z",
"shipment_code": "ETA1025",
"product": "Maiz",
"truck_type": "Torton",
"truck_plates": "YUC9101",
"driver_name": "Alexandro Uc",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "ALTOS"
},
{
"status": "Loading",
"date": "2025-02-09T02:31:45.679Z",
"shipment_code": "ETA1006",
"product": "Cebada",
"truck_type": "Torton",
"truck_plates": "DLS9101",
"driver_name": "Juan Perez",
"note": "Comentario de prueba",
"weigth_load": 233.200,
"company": "SOA"
},
{
"status": "Loading",
"date": "2025-02-08T00:42:43.588Z",
"shipment_code": "ETA1022",
"product": "Cacahuate",
"truck_type": "Torton",
"truck_plates": "YUC9101",
"driver_name": "Alexandro Uc",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "ALTOS"
},
{
"status": "Loading",
"date": "2025-02-09T00:57:26.432Z",
"shipment_code": "ETA1016",
"product": "Maiz",
"truck_type": "Caja Seca",
"truck_plates": "DSA9101",
"driver_name": "Alexandro Uc",
"note": "Comentario de prueba",
"weigth_load": 233.2,
"company": "ALTOS"
}
]

5
src/router/index.js
View File

@@ -94,7 +94,10 @@ const router = createRouter({
{
path: 'profile',
name: 'profile',
meta: { permissions: ['role_shipper', 'role_carrier'] },
meta: {
permissions: ['role_shipper', 'role_carrier'],
roles: ['manager', 'staff', 'owner', 'warehouse']
},
component: () => import('../views/EditProfileView.vue'),
},
{

6
src/stores/loads.js
View File

@@ -15,6 +15,7 @@ export const useLoadsStore = defineStore('load', () => {
const openModalEdit = ref(false);
const openAttachmentsModal = ref(false);
const openProposalsModal = ref(false);
const openCarrierInfoModal = ref(false);
const getLoadsAll = async(reload = false) => {
const companyid = localStorage.getItem('id');
@@ -72,7 +73,8 @@ export const useLoadsStore = defineStore('load', () => {
}
if(loadsWarehouse.value.length <= 0 || reload) {
try {
const {data} = await getCalendar(filterStr);
const endpoint = `/v1/loads/find?${filterStr}`;
const {data} = await api.get(endpoint);
loadsWarehouse.value = data.data;
} catch (error) {
loadsWarehouse.value = [];
@@ -159,6 +161,7 @@ export const useLoadsStore = defineStore('load', () => {
loadsTotal.value = 0;
loadsCurrentPage.value = 0;
proposalsOfLoads.value = [];
loadsWarehouse.value = [];
openModalEdit.value = false;
openAttachmentsModal.value = false;
openProposalsModal.value = false;
@@ -170,6 +173,7 @@ export const useLoadsStore = defineStore('load', () => {
openModalEdit,
openProposalsModal,
openAttachmentsModal,
openCarrierInfoModal,
getProposalsOfLoads,
getCompanyLoads,
getLoadsAll,

2
src/views/EditProfileView.vue
View File

@@ -61,7 +61,7 @@
const result = await auth.updateProfile(userData)
loading.value = false;
if(result.msg === 'success') {
msgSuccess.value = t('errors.msgUpdateUser');
msgSuccess.value = t('profile.msgUpdateUser');
clearMessages();
} else {
msgError.value = t('errors.generic');

2
src/views/LoadsPublishedView.vue
View File

@@ -9,6 +9,7 @@
import CardEmpty from '../components/CardEmpty.vue';
import Pagination from '../components/Pagination.vue';
import { useI18n } from 'vue-i18n';
import CarrierInfoModal from '../components/CarrierInfoModal.vue';
const loadStore = useLoadsStore();
const loading = ref(false);
@@ -94,6 +95,7 @@
<AttachmentsModal v-if="loadStore.openAttachmentsModal"/>
<FormLoadModal v-if="loadStore.openModalEdit"/>
<ProposalsModal v-if="loadStore.openProposalsModal"/>
<CarrierInfoModal :load="loadStore.currentLoad" v-if="loadStore.openCarrierInfoModal"/>
<div>
<h2 class="title mb-5">{{ t('loads.title') }}</h2>
<div>

39
src/views/store/StoreView.vue
View File

@@ -1,13 +1,11 @@
<script setup>
import { ref } from 'vue';
import { getDateTime } from '../../helpers/date_formats';
import { onMounted } from 'vue';
// import loads from '../../data/store-dumies.json';
import { useI18n } from 'vue-i18n';
import LoadStoreCard from './components/LoadStoreCard.vue';
import { useLoadsStore } from '../../stores/loads';
import { useAuthStore } from '../../stores/auth';
import Spiner from '../../components/ui/Spiner.vue';
import Spiner from '../../components/ui/Spiner.vue';
const authStore = useAuthStore();
const loadStore = useLoadsStore();
@@ -21,27 +19,20 @@ import Spiner from '../../components/ui/Spiner.vue';
onMounted(async() => {
date.value = (new Date()).toISOString().substring(0, 10);
// date.value = new Date();
await getDataLoads(false);
})
const getDataLoads = async (reload) => {
filterQuery.value.branch = 'shipper_warehouse=' + authStore.user.branch;
// filterQuery.value.status = "status[$ne]="+"Closed";
loading.value = true;
const dateSelected = new Date(date.value);
const startDate = dateSelected.toISOString();
const endDateSpeac = new Date(dateSelected).setDate(dateSelected.getDate() + 1);
const endDate = (new Date(endDateSpeac)).toISOString();
// filterQuery.value.company = 'company=' + authStore.user.company._id;
filterQuery.value.start = 'date[gte]=' + startDate.substring(0, 10).replaceAll('-', '/');
filterQuery.value.end = 'date[lte]=' + endDate.substring(0, 10).replaceAll('-', '/');
filterQuery.value.global = "global=" + 0;
console.log(filterQuery.value);
filterQuery.value.branch = 'shipper_warehouse=' + authStore.user.branch;
filterQuery.value.start = 'est_loading_date[gte]=' + startDate.substring(0, 10).replaceAll('-', '/');
filterQuery.value.end = 'est_loading_date[lte]=' + endDate.substring(0, 10).replaceAll('-', '/');
await loadStore.getLoadsWarehouse(filterQuery.value, reload);
// https://api.etaviaporte.com/api/v1/loads/calendar?$sort[createdAt]=-1&elements=1000&shipper_warehouse=66c13c74a7f46dc835c82116&company=66bd6a53b59eff03cc868900&date[gte]=2025/03/01&date[lte]=2025/03/02&global=0
console.log(loadStore.loadsWarehouse);
loadsFilters.value = loadStore.loads;
loadsFilters.value = loadStore.loadsWarehouse;
loading.value = false;
}
@@ -51,22 +42,22 @@ import Spiner from '../../components/ui/Spiner.vue';
loadsFilters.value = loadStore.loads;
}
if(query.value.length >= 1){
loadsFilters.value = loadStore.loads.filter(
loadsFilters.value = loadStore.loadsWarehouse.filter(
load => load.shipment_code.toLowerCase().includes(query.value.toLowerCase())
|| load.company.toLowerCase().includes(query.value.toLowerCase())
|| load.product.toLowerCase().includes(query.value.toLowerCase())
|| load['truck_plates'].toLowerCase().includes(query.value.toLowerCase())
|| load['driver_name'].toLowerCase().includes(query.value.toLowerCase())
|| load['truck_type'].toLowerCase().includes(query.value.toLowerCase())
|| load?.carrier?.company_name.toLowerCase().includes(query.value.toLowerCase())
|| load?.product?.name.toLowerCase().includes(query.value.toLowerCase())
|| load?.vehicle?.truck_type.toLowerCase().includes(query.value.toLowerCase())
|| load?.vehicle?.circulation_serial_number.toLowerCase().includes(query.value.toLowerCase())
|| load?.vehicle?.trailer_plate_1.toLowerCase().includes(query.value.toLowerCase())
|| load?.vehicle?.trailer_plate_2.toLowerCase().includes(query.value.toLowerCase())
|| load?.driver?.first_name.toLowerCase().includes(query.value.toLowerCase())
);
} else {
loadsFilters.value = loadStore.loads;
loadsFilters.value = loadStore.loadsWarehouse;
}
}
const handleDate = async () => {
// date.value = new Date(date.value);
console.log(date.value);
await getDataLoads(true);
}

10
src/views/store/components/LoadStoreCard.vue
View File

@@ -2,6 +2,7 @@
import { useI18n } from 'vue-i18n';
import { getDateTime } from '../../../helpers/date_formats';
import { eventStatusLoad } from '../../../helpers/status';
import { computed } from 'vue';
const props = defineProps({
load: {
@@ -13,6 +14,11 @@
const { t, locale } = useI18n()
const status = eventStatusLoad(props.load.load_status, locale.value);
const driver = computed(() => {
return !props.load?.driver ? 'No definido'
: props.load?.driver.first_name + ' ' + props.load?.driver.last_name
});
</script>
<template>
@@ -30,7 +36,7 @@
</div>
<div class="flex-direction-column">
<p> <div class="indicator" :style="{backgroundColor: status.color}"></div> <strong :style="{color: status.color}">{{ status.status }}</strong></p>
<p> <span class="font-bold">{{ t('directory.typeTruck') }}: </span> {{ load?.vehicle?.truck_typ ?? 'No definido' }}</p>
<p> <span class="font-bold">{{ t('directory.typeTruck') }}: </span> {{ load?.vehicle?.truck_type ?? 'No definido' }}</p>
<p> <span class="font-bold">{{ t('vehicles.truckPlates') }}: </span> {{ load?.vehicle?.circulation_serial_number ?? 'No definido' }}</p>
<p v-if="load?.vehicle?.trailer_plate_1">
<span class="font-bold">{{ t('vehicles.trailerPlates') }} 1: </span> {{ load?.vehicle?.trailer_plate_1 }}
@@ -38,7 +44,7 @@
<p v-if="load?.vehicle?.trailer_plate_2">
<span class="font-bold">{{ t('vehicles.trailerPlates') }} 2: </span> {{ load?.vehicle?.trailer_plate_2 }}
</p>
<p> <span class="font-bold">{{ t('labels.driver') }}: </span> {{ load?.vehicle?.driver ?? 'No asignado' }}</p>
<p> <span class="font-bold">{{ t('labels.driver') }}: </span> {{ driver }}</p>
</div>
</div>
<div class="box-note" v-if="load.notes">