This commit is contained in:
yin 2026-06-25 18:20:37 +08:00
parent 84daac9220
commit ce6ff6d406
2 changed files with 16 additions and 8 deletions

View File

@ -261,7 +261,7 @@ function mapReceivingBindingRow(binding: EntryOrderReceivingBinding, index: numb
receiving_id: Number.isFinite(receivingId) && receivingId > 0 ? receivingId : undefined,
receiving_number: pickText(receiving, ['receiving_number'], `#${binding.receiving_id ?? index + 1}`),
status_label: formatReceivingOrderStatusLabel(status) || '—',
created_at: receiving.created_at ? formatDateTime(receiving.created_at) : '—',
created_at: receiving.created_at ? formatDateTime(String(receiving.created_at)) : '—',
}
}

View File

@ -391,8 +391,16 @@ export function formatReceivingBindingsSummary(bindings: unknown): string {
return `${numbers.slice(0, 2).join('、')} 等 ${numbers.length} 个`
}
export type EntryTableColumn = {
prop: string
label: string
width?: number | string
minWidth?: number | string
align?: 'left' | 'center' | 'right'
}
/** 货单绑定弹窗 — 收货单列表展示列 */
export const entryBindReceivingListColumns = [
export const entryBindReceivingListColumns: EntryTableColumn[] = [
{ prop: 'receiving_number', label: '收货单号', minWidth: 140 },
{ prop: 'created_at', label: '创建时间', width: 160 },
]
@ -412,14 +420,14 @@ export const entryBindCompareColumnHeaders = [
] as const
/** 绑定关系 — 主表已绑定收货单 */
export const entryReceivingBindingColumns = [
export const entryReceivingBindingColumns: EntryTableColumn[] = [
{ prop: 'receiving_number', label: '收货单号', minWidth: 150 },
{ prop: 'status_label', label: '状态', width: 100 },
{ prop: 'created_at', label: '创建时间', width: 160 },
] as const
]
/** 绑定关系 — 明细级 available_receiving_details */
export const entryItemBindingDetailColumns = [
export const entryItemBindingDetailColumns: EntryTableColumn[] = [
{ prop: 'warehouse_item_code', label: '商品编码', minWidth: 120 },
{ prop: 'warehouse_item_name', label: '商品名称', minWidth: 140 },
{ prop: 'entry_plan_qty', label: '计划数量', width: 90, align: 'right' },
@ -429,16 +437,16 @@ export const entryItemBindingDetailColumns = [
{ prop: 'receiving_allocated', label: '已分配', width: 90, align: 'right' },
{ prop: 'available_quantity', label: '可用量', width: 90, align: 'right' },
{ prop: 'binding_status_label', label: '绑定状态', width: 100 },
] as const
]
/** 绑定关系 — receivingCompare 对照预览 */
export const entryBindingCompareColumns = [
export const entryBindingCompareColumns: EntryTableColumn[] = [
{ prop: 'match_status_label', label: '匹配', width: 90, align: 'center' },
{ prop: 'item_name', label: '商品名称', minWidth: 140 },
{ prop: 'entry_plan_qty', label: '入库应收', width: 90, align: 'right' },
{ prop: 'receiving_qty', label: '收货数量', width: 90, align: 'right' },
{ prop: 'receiving_allocated', label: '已分配', width: 90, align: 'right' },
] as const
]
export function formatEntryBindingStatus(status: unknown): string {
if (status === null || status === undefined || status === '') return '—'