diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx index af19b83..d53b15d 100644 --- a/src/pages/DeliveryOrderDetails.jsx +++ b/src/pages/DeliveryOrderDetails.jsx @@ -34,6 +34,7 @@ const DeliveryOrderDetails = () => { const [totalCost, setTotalCost] = useState(0); const [truckCount, setTruckCount] = useState(0); const [truckName, setTruckName] = useState(""); + const [truckCapacity, setTruckCapacity] = useState(""); const [totalOrder, setTotalOrder] = useState(null); const [deliveryOrder, setDeliveryOrder] = useState(null); const navigate = useNavigate(); @@ -73,6 +74,7 @@ const DeliveryOrderDetails = () => { setTotalCost(Math.round(deliveryOrderDetails.price)); setTruckCount(deliveryOrderDetails.count_trucks); setTruckName(deliveryOrderDetails.truck_name); + setTruckCapacity(deliveryOrderDetails.truck_capacity); const accessories = await getDeliveryAccessories(deliveryOrderId); setDeliveryAccessories(accessories); @@ -164,7 +166,11 @@ const DeliveryOrderDetails = () => { {totalCost} руб. - {truckName} + + {truckName} +
+ Грузоподъемность: {truckCapacity}кг + {truckCount} @@ -177,8 +183,8 @@ const DeliveryOrderDetails = () => { Город Комплектующее - Количество - Объем + Количество, шт. + Объем, м^3 @@ -186,8 +192,12 @@ const DeliveryOrderDetails = () => { {accessory.city_name} {accessory.accessory_name} - {(accessory.count)} - {accessory.volume} + {accessory.count} + + {Math.round( + (accessory.accessory_volume * accessory.count) / 100 + )} + ))} diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 17181c6..fa4b810 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -126,8 +126,7 @@ const Home = () => { Количество роботов: {order.count_robots}

- Количество этапов:{" "} - {deliveryOrdersCount || 0} + Количество этапов: {deliveryOrdersCount || 0}

{ />
- +