diff --git a/CHANGELOG.md b/CHANGELOG.md index 02a1d49..4076aa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ Ajouter dans le fichier .env du frontend * [#273] Créer une nouvelle expédition (étape 3) * [#256] Créer une nouvelle réception (étape 3 - bovin) * [#314] Création d'une page d'administration : listing des utilisateurs +* [#276] Lister les expéditions terminées ### Changed diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue index 52d3da7..6a06e55 100644 --- a/frontend/pages/index.vue +++ b/frontend/pages/index.vue @@ -9,7 +9,7 @@ - + diff --git a/frontend/pages/shipment/finish-shipment.vue b/frontend/pages/shipment/finish-shipment.vue new file mode 100644 index 0000000..59c340b --- /dev/null +++ b/frontend/pages/shipment/finish-shipment.vue @@ -0,0 +1,81 @@ + + + + listes des expéditions finie + + + + + + Numéro + Date + Client + Adresse + Type d'expéditon + Poids + + + {{ shipment.identificationNumber }} + {{ shipment.shipmentDate }} + {{ shipment.customer?.label }} + {{ shipment.address?.fullAddress }} + + + + {{ line }} + + + + {{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }} + + + + + + diff --git a/frontend/services/dto/shipment-data.ts b/frontend/services/dto/shipment-data.ts index a78016a..8a5dbfd 100644 --- a/frontend/services/dto/shipment-data.ts +++ b/frontend/services/dto/shipment-data.ts @@ -1,6 +1,7 @@ import type {CarrierData} from '~/services/dto/carrier-data' import type {TruckData} from '~/services/dto/truck-data' import type {CustomerData} from '~/services/dto/customer-data' +import type {AddressData} from "~/services/dto/address-data"; export interface ShipmentTypeData { id: number @@ -21,6 +22,7 @@ export type ShipmentData = { shipmentDate: string currentStep: number isValid: boolean + address?: AddressData | null carrier?: CarrierData | null truck?: TruckData | null customer?: CustomerData | null