diff --git a/src/components/logistics/LogisticsReadinessBoard.jsx b/src/components/logistics/LogisticsReadinessBoard.jsx index 081fe67..cb834c5 100644 --- a/src/components/logistics/LogisticsReadinessBoard.jsx +++ b/src/components/logistics/LogisticsReadinessBoard.jsx @@ -10,7 +10,7 @@ import { Badge } from "../UI/Badge"; import { Panel } from "../UI/Panel"; import { SkeletonPage } from "../UI/Loading"; import { OrderFilters } from "../orders/OrderFilters"; -import { formatDateTime } from "../../utils/formatters"; +import { formatDate, formatDateTime } from "../../utils/formatters"; export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusOptions = ORDER_GROUP_DISPLAY_STATUS_OPTIONS, isLoading = false }) => { const [filters, setFilters] = React.useState({ query: "", displayStatus: "all", city: "" }); @@ -60,17 +60,17 @@ export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusO const totalGroups = filteredGroups.length; + const COLS = "grid-cols-[minmax(140px,2fr)_minmax(80px,1fr)_minmax(100px,1.2fr)_minmax(80px,1fr)_minmax(100px,1fr)_minmax(120px,1fr)]"; + const TableHeader = () => ( - - - Клиент - Город - Дата доставки - Водитель - Статус - Обновлён - - +
+
Клиент
+
Город
+
Дата доставки
+
Водитель
+
Статус
+
Обновлён
+
); if (isLoading) { @@ -146,42 +146,38 @@ export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusO {!isCollapsed && (
- - - - {groups.map((group) => ( - { if (onSelectSet) onSelectSet(group.id); }} - > - - - - - - - - ))} - -
-
{group.displayTitle || group.customerName || group.groupKey}
-
{group.customerPhone || "—"}
-
{group.deliveryDate || "—"}
-
- {group.city || group.customerAddress || "—"} - - {group.deliveryDate - ? {group.deliveryDate}{group.deliveryTime ? · {group.deliveryTime} : ""} - : - } - - {group.assignedDriverName || } - - {getOrderGroupDisplayStatusLabel(group)} - - {formatDateTime(group.updatedAt)} -
+ + {groups.map((group) => ( + + ))}
)} diff --git a/src/components/orders/OrdersTable.jsx b/src/components/orders/OrdersTable.jsx index 7551d00..7b6436e 100644 --- a/src/components/orders/OrdersTable.jsx +++ b/src/components/orders/OrdersTable.jsx @@ -141,57 +141,51 @@ export const OrdersTable = ({ Группы не найдены. Попробуйте изменить поиск или статус. ) : ( - - - - - - - - - - - - +
+
+
Группа / Клиент
+
Счёта
+
Статус
+
Водитель
+
Дата доставки
+
Обновлён
+
{orderGroups.map((group) => ( -
onOpenOrder(group.id)} > - - - - - - - + + ))} - -
Группа / КлиентСчётаСтатусВодительДата доставкиОбновлён
+
{group.displayTitle || group.customerName || group.groupKey}
{[group.customerName, group.customerPhone].filter(Boolean).join(" · ")}
{group.groupKey}
-
+ +
{renderOrderNumbers(group)} -
+ +
{getOrderGroupDisplayStatusLabel(group)} -
+ +
{group.assignedDriverName || } -
+ +
{group.deliveryDate ? ( {fmtDate(group.deliveryDate)}{group.deliveryTime ? · {group.deliveryTime} : ""} ) : ( )} -
+ +
{formatDateTime(group.updatedAt)} -
+ )}