diff --git a/apps/admin-web/src/lib/api.ts b/apps/admin-web/src/lib/api.ts index 9b3c91c..829be92 100644 --- a/apps/admin-web/src/lib/api.ts +++ b/apps/admin-web/src/lib/api.ts @@ -146,6 +146,8 @@ export type AdminOrderRow = { city?: { id: string; name: string; code: string }; fulfillmentWarehouseId?: string | null; fulfillmentWarehouse?: { id: string; name: string } | null; + fulfillmentHold?: boolean; + fulfillmentHoldReason?: string | null; user?: { id: string; userNo: string; phone: string | null; nickname: string | null }; delivery?: { provider: string; diff --git a/apps/admin-web/src/pages/OrdersPage.tsx b/apps/admin-web/src/pages/OrdersPage.tsx index fa88721..18edfb9 100644 --- a/apps/admin-web/src/pages/OrdersPage.tsx +++ b/apps/admin-web/src/pages/OrdersPage.tsx @@ -26,6 +26,7 @@ import { ORDER_STATUS_LABELS, fmtTime, } from '../lib/constants'; +import { FULFILLMENT_HOLD_REASON_LABELS } from '@dukang/shared-types'; type ShipDefaults = { provider: string; @@ -202,6 +203,7 @@ export default function OrdersPage() { if (values.status) qs.set('status', values.status); if (values.cityId) qs.set('cityId', values.cityId); if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone); + if (values.fulfillmentHold) qs.set('fulfillmentHold', 'true'); const res = await request>(`/admin/orders?${qs}`); setData(res); } finally { @@ -395,9 +397,12 @@ export default function OrdersPage() { { title: '状态', dataIndex: 'status', - width: 100, - render: (s) => ( - {ORDER_STATUS_LABELS[s] || s} + width: 140, + render: (s, row) => ( + + {ORDER_STATUS_LABELS[s] || s} + {row.fulfillmentHold ? 大单待确认 : null} + ), }, { @@ -477,6 +482,14 @@ export default function OrdersPage() { + +