diff --git a/src/components/driver/DriverDeliveryPlanner.jsx b/src/components/driver/DriverDeliveryPlanner.jsx index 3435289..a8b0963 100644 --- a/src/components/driver/DriverDeliveryPlanner.jsx +++ b/src/components/driver/DriverDeliveryPlanner.jsx @@ -505,65 +505,61 @@ export const DriverDeliveryPlanner = ({ orderGroups = [], onOpenOrder, currentUs {label} {items.length} {pluralGroups(items.length)} -
- {items.map((item) => { + {/* Table layout — № | Фамилия | Телефон | Город | Часть дня */} +
+
+
+
№ счёта
+
Клиент
+
Телефон
+
Город
+
Часть дня
+
+ {items.map((item) => { const hasProblem = item.hasDeliveryProblem || item.has_delivery_problem; const phoneTel = normalizePhoneForTel(item.customerPhone); const halfDayLabel = getOrderGroupDeliveryHalfDay(item); + const city = normalizeCity(item.deliveryAddress || item.delivery_address); + const orderNum = (Array.isArray(item.orderNumbers) && item.orderNumbers.length > 0) + ? item.orderNumbers.join(", ") + : (item.groupKey || "—"); return ( -
- -
- {item.deliveryAddress || item.delivery_address || "Адрес не указан"} -
- +
+ {city} +
+
+ {halfDayLabel || "—"} +
+ ); - })} + })} +
))}