This commit is contained in:
Андрей Дувакин 2024-10-07 23:32:13 +05:00
parent 3f43b5d1c9
commit e4ce32df2a

View File

@ -44,7 +44,7 @@ const DeliveryOrderDetails = () => {
const deliveryOrderDetails = await getDeliveryOrderDetails(
deliveryOrderId
);
setTotalCost(Math.round(deliveryOrderDetails.price)); // Округление стоимости до целого
setTotalCost(Math.round(deliveryOrderDetails.price));
setTruckCount(deliveryOrderDetails.count_trucks);
setTruckName(deliveryOrderDetails.truck_name);
@ -114,10 +114,11 @@ const DeliveryOrderDetails = () => {
<div className="delivery-order-details">
{loading ? (
<div className="spinner-border" role="status">
<span className="visually-hidden">Загрузка</span>
<span className="visually-hidden"></span>
</div>
) : (
<div className="content-container">
<h2 style={{ textAlign: "center" }}>Общая информация</h2>
<table className="table table-bordered mb-5">
<thead>
<tr>
@ -135,8 +136,9 @@ const DeliveryOrderDetails = () => {
</tbody>
</table>
<h3 className="mb-3">Маршрут</h3>
<table className="table table-bordered">
<h2 style={{ textAlign: "center" }}>Маршрут</h2>
<table className="table table-bordered mb-5">
<thead>
<tr>
<th scope="col">Город</th>
@ -146,24 +148,17 @@ const DeliveryOrderDetails = () => {
</tr>
</thead>
<tbody>
{deliveryAccessories.map((accessory, index) => {
const coord = coordinates.find(
(c) => c.city === accessory.city_name
);
return (
<tr key={index}>
<td>{accessory.city_name}</td>
<td>{accessory.accessory_name}</td>
<td>{accessory.count}</td>
<td>{accessory.volume}</td>
</tr>
);
})}
{deliveryAccessories.map((accessory) => (
<tr key={accessory.id}>
<td>{accessory.city_name}</td>
<td>{accessory.accessory_name}</td>
<td>{accessory.count}</td>
<td>{accessory.volume}</td>
</tr>
))}
<tr>
<td>{DELIVERY_CITY.name}</td>
<td>Конечный пункт</td>
<td>-</td>
<td>-</td>
<td colSpan="3">Конечный пункт</td>
</tr>
</tbody>
</table>