feat(consignment): 寄售仓库在库列表增加通过审核入库时间并在手动匹配中补全时间展示

- 寄售仓库 (ConsignmentInventoryPanel):表格中增加「通过审核入库时间」列并格式化展示,详情弹窗规范化展示入库时间、出库时间与提报时间
- 手动匹配弹窗 (ConsignmentManualMatchModal):候选订单列表展示工单创建时间,顶部横幅与已选概要展示现货入库时间及订单创建时间;从订单匹配现货时展示现货入库时间
- 内部匹配接口与工单拦截:后端 listInventoryMatchableOrders 返回工单创建时间及平台单号;发布拦截弹窗中增加展示现货入库时间
- 验证方式:运行前后端单元测试全部通过,前端 build 校验通过
This commit is contained in:
yml2213
2026-10-08 15:41:23 +08:00
parent 5978e92370
commit 893388b37f
8 changed files with 162 additions and 8 deletions
@@ -502,6 +502,24 @@ export default function ConsignmentInventoryPanel() {
)
},
},
{
title: '通过审核入库时间',
key: 'inboundAt',
width: 160,
render: (_, record) => {
const timeStr = formatDateTime(record.inboundAt || record.createdAt)
return (
<div>
<Text style={{ fontSize: 12 }}>{timeStr}</Text>
{record.consumedAt ? (
<div style={{ fontSize: 11, color: '#8c8c8c', marginTop: 2 }}>
出库: {formatDateTime(record.consumedAt)}
</div>
) : null}
</div>
)
},
},
{
title: '允许匹配',
key: 'allowMatching',
@@ -1032,7 +1050,19 @@ export default function ConsignmentInventoryPanel() {
<Descriptions.Item label="收购批次">
{viewingItem.inboundBatch || '-'}
</Descriptions.Item>
<Descriptions.Item label="入库时间">{viewingItem.inboundAt || '-'}</Descriptions.Item>
<Descriptions.Item label="通过审核入库时间">
{formatDateTime(viewingItem.inboundAt || viewingItem.createdAt)}
</Descriptions.Item>
{viewingItem.consumedAt ? (
<Descriptions.Item label="履约出库时间">
{formatDateTime(viewingItem.consumedAt)}
</Descriptions.Item>
) : null}
{viewingItem.sourceType === 'worker_portal' && viewingItem.createdAt ? (
<Descriptions.Item label="打手提报时间">
{formatDateTime(viewingItem.createdAt)}
</Descriptions.Item>
) : null}
<Descriptions.Item label="卖家微信号">
<Text copyable>{viewingItem.sellerContact || '-'}</Text>
</Descriptions.Item>
@@ -1225,6 +1255,7 @@ export default function ConsignmentInventoryPanel() {
? {
inventoryId: manualMatchItem.id,
label: manualMatchItem.itemName,
inboundAt: manualMatchItem.inboundAt || manualMatchItem.createdAt,
}
: null
}
@@ -327,8 +327,17 @@ export default function ConsignmentSubmissionsPanel() {
{
title: '提报时间',
dataIndex: 'createdAt',
width: 150,
render: (v) => <Text style={{ fontSize: 12 }}>{v}</Text>,
width: 160,
render: (v, record) => (
<div>
<Text style={{ fontSize: 12 }}>{formatDateTime(v)}</Text>
{record.reviewedAt ? (
<div style={{ fontSize: 11, color: '#8c8c8c', marginTop: 2 }}>
审核: {formatDateTime(record.reviewedAt)}
</div>
) : null}
</div>
),
},
{
title: '操作',
@@ -921,6 +930,11 @@ export default function ConsignmentSubmissionsPanel() {
<Descriptions.Item label="审核人">
{viewingSubmission.reviewerName || '-'}
</Descriptions.Item>
{viewingSubmission.reviewedAt ? (
<Descriptions.Item label="审核时间">
{formatDateTime(viewingSubmission.reviewedAt)}
</Descriptions.Item>
) : null}
<Descriptions.Item label="审核备注" span={2}>
{viewingSubmission.reviewNote || '-'}
</Descriptions.Item>
@@ -3426,6 +3426,7 @@ export default function WorkOrdersPanel() {
) : null}
{inv.shopName ? <span>店铺: {inv.shopName}</span> : null}
{inv.inboundBatch ? <span>批次: {inv.inboundBatch}</span> : null}
<span>入库时间: {formatAdminDateTime(inv.inboundAt || inv.createdAt)}</span>
</Space>
</div>
@@ -3489,6 +3490,7 @@ export default function WorkOrdersPanel() {
? {
workOrderId: manualMatchOrder.workOrderId,
label: `#${manualMatchOrder.workOrderId} ${manualMatchOrder.productName || ''}`,
createdAt: manualMatchOrder.createdAt,
}
: null
}