This commit is contained in:
yin 2026-07-28 18:18:54 +08:00
parent 05137c2e3f
commit 690737c1b4
10 changed files with 134 additions and 182 deletions

View File

@ -684,13 +684,16 @@ export function containerList(
/** storage.entry.queryEntryLogs 参数 */
export type QueryEntryLogsParams = {
id?: number | string
/** 入库单 ID(必填) */
id: number | string
page?: number
pageSize?: number
}
/** 查询入库单操作日志 */
export function queryEntryLogs(data: QueryEntryLogsParams = {}): Promise<any> {
export function queryEntryLogs(data: QueryEntryLogsParams = {
id: ''
}): Promise<any> {
return request({
url: '/system',
method: 'post',

View File

@ -98,3 +98,50 @@ export function exportReceivingTaskProgress(data: ReceivingExportTaskProgressPar
isSystemApi: true
} as any)
}
/** storage.receiving.storeExport 查询参数(货主维度收货单导出,以当前平台激活的货主 store_id 为维度) */
export type StoreReceivingExportParams = {
where?: Record<string, any>
sort?: {
sortField?: string
sort_field?: string
sortOrder?: string
sort_order?: string
}
}
/** storage.receiving.storeExport:提交货主侧收货单导出任务(货主维度,异步) */
export function storeExportReceiving(data: StoreReceivingExportParams): Promise<any> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.receiving.storeExport',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
/** storage.receiving.storeExportTaskProgress 查询参数 */
export type StoreReceivingExportTaskProgressParams = {
task_id?: string
taskId?: string
}
/** storage.receiving.storeExportTaskProgress:查询货主侧收货单导出任务进度 */
export function storeExportReceivingTaskProgress(data: StoreReceivingExportTaskProgressParams): Promise<any> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.receiving.storeExportTaskProgress',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -950,10 +950,10 @@ export const orderItemCompactColumns: OrderItemColumnConfig[] = [
{ prop: 'item_name', label: '商品名称', minWidth: 180, showOverflowTooltip: true },
{ prop: 'order_line_no', label: '行号', width: 80, align: 'center' },
{ prop: 'plan_qty', label: '计划数量', width: 100, align: 'center' },
{ prop: 'actual_price', label: '实付单价', width: 120, align: 'right', amount: true },
{ prop: 'retail_price', label: '零售单价', width: 120, align: 'right', amount: true },
{ prop: 'inventory_type', label: '库存类型', width: 100, align: 'center' },
{ prop: 'stock_id', label: 'SKU', width: 100, align: 'center' }
{ prop: 'sku_property', label: '规格', width: 120, showOverflowTooltip: true },
{ prop: 'stock_unit', label: '单位', width: 80, align: 'center' },
{ prop: 'stock_id', label: 'SKU', width: 100, align: 'center' },
{ prop: 'store_id', label: '货主ID', width: 100, align: 'center' },
]
/** 商品明细显示全部:对齐 data.json items 返回字段 */
@ -964,26 +964,16 @@ export const orderItemFullColumns: OrderItemColumnConfig[] = [
{ prop: 'order_line_no', label: '行号', width: 80, align: 'center' },
{ prop: 'item_code', label: '商品编码', minWidth: 140, showOverflowTooltip: true },
{ prop: 'item_name', label: '商品名称', minWidth: 180, showOverflowTooltip: true },
{ prop: 'item_id', label: '商品ID', width: 100, align: 'center' },
{ prop: 'stock_id', label: 'SKU', width: 100, align: 'center' },
{ prop: 'plan_qty', label: '计划数量', width: 100, align: 'center' },
{ prop: 'actual_price', label: '实付单价', width: 120, align: 'right', amount: true },
{ prop: 'retail_price', label: '零售单价', width: 120, align: 'right', amount: true },
{ prop: 'ext_code', label: '规格编码', minWidth: 120, showOverflowTooltip: true },
{ prop: 'inventory_type', label: '库存类型', width: 100, align: 'center' },
{ prop: 'owner_code', label: '货主编码', minWidth: 120, showOverflowTooltip: true },
{ prop: 'source_order_code', label: '平台单号', minWidth: 140, showOverflowTooltip: true },
{ prop: 'sub_source_order_code', label: '子平台单号', minWidth: 140, showOverflowTooltip: true },
{ prop: 'extend_props', label: '扩展属性', minWidth: 160, showOverflowTooltip: true },
{ prop: 'item_snapshot.barcode', label: '条码', minWidth: 140, showOverflowTooltip: true },
{ prop: 'item_snapshot.sku_property', label: '规格', minWidth: 140, showOverflowTooltip: true },
{ prop: 'item_snapshot.category_name', label: '分类', minWidth: 120, showOverflowTooltip: true },
{ prop: 'item_snapshot.stock_unit', label: '单位', width: 80, align: 'center' },
{ prop: 'item_snapshot.goods_code', label: '货品编码', minWidth: 120, showOverflowTooltip: true },
{ prop: 'item_snapshot.brand_name', label: '品牌', minWidth: 100, showOverflowTooltip: true },
{ prop: 'item_snapshot.item_type', label: '商品类型', width: 100, align: 'center' },
{ prop: 'created_at', label: '创建时间', minWidth: 160, time: true },
{ prop: 'updated_at', label: '更新时间', minWidth: 160, time: true }
{ prop: 'quantity', label: '库存数量', width: 100, align: 'right' },
{ prop: 'locked_quantity', label: '锁定数量', width: 100, align: 'right' },
{ prop: 'sku_property', label: '规格', minWidth: 140, showOverflowTooltip: true },
{ prop: 'stock_unit', label: '单位', width: 80, align: 'center' },
{ prop: 'is_batch_mgmt', label: '批次管理', width: 100, align: 'center' },
{ prop: 'is_shelf_life_mgmt', label: '效期管理', width: 100, align: 'center' },
{ prop: 'packing_requirements', label: '包装要求', minWidth: 120, showOverflowTooltip: true },
{ prop: 'store_id', label: '货主ID', width: 100, align: 'center' },
]

View File

@ -92,7 +92,7 @@
<el-tabs v-model="activeTab" class="detail-tab">
<el-tab-pane label="订单明细" name="detail" />
<el-tab-pane label="商品明细" name="items" />
<el-tab-pane label="收货信息" name="receiver" />
<!-- <el-tab-pane label="收货信息" name="receiver" /> -->
<el-tab-pane label="订单日志" name="logs" />
<!-- <el-tab-pane label="订单审核" name="review" /> -->
</el-tabs>

View File

@ -271,6 +271,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) || '—',
storage_status_label: formatReceivingOrderStatusLabel(receiving.storage_status) || '—',
created_at: receiving.created_at ? formatDateTime(String(receiving.created_at)) : '—',
}
}

View File

@ -23,9 +23,10 @@
<el-descriptions-item label="收货单状态">
<el-tag size="small" :type="getReceivingStatusTag(item.status)">{{ item.statusLabel }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="货主">{{ item.storeName || '—' }}</el-descriptions-item>
<el-descriptions-item label="商品数">{{ item.totalItems }}</el-descriptions-item>
<el-descriptions-item label="总数量">{{ item.totalQuantity }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ item.createdAt }}</el-descriptions-item>
<el-descriptions-item label="供应商">{{ item.supplierName || '—' }}</el-descriptions-item>
<el-descriptions-item label="运单号">{{ item.expressCode || '—' }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ item.remark || '—' }}</el-descriptions-item>
</el-descriptions>
</div>
@ -46,10 +47,10 @@
>
<el-table-column prop="product_code" label="商品编码" width="140" show-overflow-tooltip />
<el-table-column prop="product_name" label="商品名称" min-width="160" show-overflow-tooltip />
<el-table-column prop="sku_property" label="规格" width="120" show-overflow-tooltip />
<el-table-column prop="planned_quantity" label="计划数量" width="90" align="right" />
<el-table-column prop="actual_quantity" label="实收数量" width="90" align="right" />
<el-table-column prop="unit" label="单位" width="70" align="center" />
<el-table-column prop="box_quantity" label="箱数" width="70" align="right" />
<el-table-column prop="stored_quantity" label="已入库" width="90" align="right" />
<el-table-column prop="space_name" label="库位" width="130" show-overflow-tooltip />
<el-table-column prop="batch_number" label="批次号" width="130" show-overflow-tooltip />
<el-table-column prop="production_date" label="生产日期" width="110" align="center">
<template #default="{ row }">
@ -91,8 +92,9 @@ interface ReceivingDetailItem {
status: string
statusLabel: string
createdAt: string
supplierName: string
expressCode: string
storeName: string
totalItems: number
totalQuantity: number
remark: string
details: Record<string, unknown>[]
}
@ -131,14 +133,29 @@ function getReceivingStatusTag(status: string): string {
return map[status?.toUpperCase()] || 'info'
}
const detailStatusOptions: Record<string, string> = {
pending: '待收货',
received: '已收货',
partial: '部分入库',
all: '全部入库',
waiting: '待入库',
none: '未入库',
}
function getDetailStatusLabel(status: string): string {
return detailStatusOptions[status?.toLowerCase()] || status || '—'
}
function getDetailStatusTag(status: string): string {
const map: Record<string, string> = {
PENDING: 'info',
RECEIVED: 'success',
PARTIAL: 'warning',
CANCELLED: 'danger',
pending: 'info',
received: 'success',
partial: 'warning',
all: 'success',
waiting: 'info',
none: 'info',
}
return map[status?.toUpperCase()] || 'info'
return map[status?.toLowerCase()] || 'info'
}
function formatDateCell(value: unknown): string {
@ -154,17 +171,17 @@ function normalizeDetailRow(raw: Record<string, unknown>): Record<string, unknow
// barcode / product_name / actual_quantity / batch_number / production_date / expiry_date / storage_status 等
return {
id: raw.id,
product_code: raw.barcode ?? raw.product_code ?? raw.item_code ?? '—',
product_name: raw.product_name ?? raw.item_name ?? '—',
sku_property: raw.sku_property ?? raw.spec ?? '',
planned_quantity: raw.planned_quantity ?? raw.plan_quantity ?? raw.quantity ?? 0,
actual_quantity: raw.actual_quantity ?? raw.received_quantity ?? 0,
unit: raw.unit ?? raw.stock_unit ?? '',
product_code: raw.barcode ?? '—',
product_name: raw.product_name ?? '—',
actual_quantity: raw.actual_quantity ?? 0,
box_quantity: raw.box_quantity ?? 0,
stored_quantity: raw.stored_quantity ?? 0,
space_name: raw.space_name ?? raw.custom_space_name ?? '—',
batch_number: raw.batch_number ?? '',
production_date: raw.production_date ?? '',
expiry_date: raw.expiry_date ?? '',
status: raw.status ?? raw.storage_status ?? raw.detail_status ?? '',
statusLabel: raw.status_label ?? '',
status: raw.receiving_status ?? raw.storage_status ?? raw.status ?? '',
statusLabel: getDetailStatusLabel(String(raw.receiving_status ?? raw.storage_status ?? '')),
}
}
@ -202,8 +219,9 @@ async function fetchReceivingDetail(binding: Record<string, unknown>): Promise<R
createdAt: receivingData.created_at
? formatDateTime(String(receivingData.created_at))
: '—',
supplierName: String(receivingData.supplier_name ?? ''),
expressCode: String(receivingData.express_code ?? receivingData.waybill_code ?? ''),
storeName: String(receivingData.store_name ?? ''),
totalItems: Number(receivingData.total_items ?? 0),
totalQuantity: Number(receivingData.total_quantity ?? 0),
remark: String(receivingData.remark ?? ''),
details: rawDetails.map(normalizeDetailRow),
}

View File

@ -22,9 +22,9 @@
</div>
<div class="right-actions">
<el-tag v-if="canBatchImport" size="small" type="success">可导入/PDA 入库</el-tag>
<span v-if="directSummary.total_direct_inbound !== undefined" class="summary-text">
<!-- <span v-if="directSummary.total_direct_inbound !== undefined" class="summary-text">
已导入 {{ directSummary.total_direct_inbound ?? 0 }} / 计划 {{ directSummary.total_planned ?? '—' }}
</span>
</span> -->
</div>
</div>
@ -233,23 +233,22 @@ async function loadEntryDetail() {
barcode: b.barcode,
}))
const imageUrls: string[] = Array.isArray(stock.image_url) ? stock.image_url : []
const primaryBarcode = barcodes.length > 0 ? (barcodes[0]?.barcode ?? '') : ''
return {
id: item.id,
stock_id: item.stock_id ?? stock.id,
external_item_code: item.external_item_code ?? '',
external_item_id: item.external_item_id,
warehouse_item_code: stock.item_code || '',
warehouse_item_name: stock.item_name || '',
warehouse_item_spec: stock.sku_property || '',
barcode: primaryBarcode || '',
stock_unit: stock.stock_unit || '',
count: item.planned ?? item.count ?? 0,
received_quantity: item.completed ?? item.received_quantity ?? 0,
confirm_quantity: item.confirm_quantity ?? 0,
warehouse_quantity: stock.quantity ?? null,
warehouse_locked_quantity: stock.locked_quantity ?? null,
warehouse_is_batch_mgmt: stock.is_batch_mgmt ?? null,
warehouse_is_shelf_life_mgmt: stock.is_shelf_life_mgmt ?? null,
is_batch_mgmt: stock.is_batch_mgmt === 'Y' ? '是' : '否',
is_shelf_life_mgmt: stock.is_shelf_life_mgmt === 'Y' ? '是' : '否',
warehouse_image_url: imageUrls.length > 0 ? imageUrls[0] : '',
warehouse_is_images: stock.is_images ?? null,
barcodes,
direct_inbound_quantity: item.direct_inbound_quantity ?? 0,
remaining_quantity: item.remaining_quantity ?? ((item.planned ?? item.count ?? 0) - (item.completed ?? item.received_quantity ?? 0)),
@ -257,7 +256,6 @@ async function loadEntryDetail() {
bindings: item.bindings || [],
direct_logs: item.direct_logs || [],
entry_order_code: entryOrder.entry_order_code || '',
purchase_order_code: entryOrder.purchase_order_code || '',
store_name: entryOrder.store_remask || entryOrder.store_name || '',
}
})

View File

@ -329,20 +329,18 @@ export const quickInboundPreviewColumns = [
export const entrydetail = [
{ prop: 'entry_order_code', label: '入库单号', width: '180', fixed: 'left' },
{ prop: 'purchase_order_code', label: '单据编号', width: '160' },
{ prop: 'store_name', label: '货主', width: '140' },
{ prop: 'order_line_no', label: '行号', width: '80', align: 'center' },
{ prop: 'warehouse_item_code', label: '商品编码', width: '160' },
{ prop: 'warehouse_item_name', label: '商品名称', minWidth: '200' },
{ prop: 'stock_id', label: 'SKU', width: '100' },
{ prop: 'barcode', label: '条码', width: '150' },
{ prop: 'warehouse_item_spec', label: '规格', width: '140' },
{ prop: 'stock_unit', label: '单位', width: '80' },
{ prop: 'count', label: '应收数量', width: '100', align: 'right' },
{ prop: 'received_quantity', label: '实收数量', width: '100', align: 'right' },
{ prop: 'warehouse_item_spec', label: '规格', width: '140' },
{ prop: 'external_item_code', label: '外部商品编码', width: '160' },
{ prop: 'confirm_quantity', label: '确认数量', width: '100', align: 'right' },
{ prop: 'inventory_type', label: '库存类型', width: '100', align: 'center', formatter: formatEntryInventoryType },
{ prop: 'out_biz_code', label: '外部业务编码', width: '160' },
{ prop: 'warehouse_quantity', label: '库存数量', width: '100', align: 'right' },
{ prop: 'is_batch_mgmt', label: '批次管理', width: '100', align: 'center' },
{ prop: 'is_shelf_life_mgmt', label: '效期管理', width: '100', align: 'center' },
]
export const detailpanel = [
@ -460,7 +458,7 @@ export function formatReceivingBindingsSummary(bindings: unknown): string {
return number ? String(number) : ''
})
.filter(Boolean)
if (!numbers.length) return `${bindings.length} 个`
if (!numbers.length) return '—'
if (numbers.length <= 2) return numbers.join('、')
return `${numbers.slice(0, 2).join('、')} 等 ${numbers.length} 个`
}
@ -632,6 +630,7 @@ export const entryBindCompareColumnHeaders = [
export const entryReceivingBindingColumns: EntryTableColumn[] = [
{ prop: 'receiving_number', label: '收货单号', minWidth: 150 },
{ prop: 'status_label', label: '状态', width: 100 },
{ prop: 'storage_status_label', label: '入库状态', width: 100 },
{ prop: 'created_at', label: '创建时间', width: 160 },
]

View File

@ -194,7 +194,7 @@
<!-- <el-tab-pane label="收货对照" name="operate" /> -->
<el-tab-pane label="入库明细" name="details" />
<el-tab-pane label="绑定关系" name="bindingRelations" />
<el-tab-pane label="入库记录" name="directInboundLogs" />
<!-- <el-tab-pane label="入库记录" name="directInboundLogs" /> -->
<el-tab-pane label="操作日志" name="logs" />
</el-tabs>
</div>
@ -838,119 +838,14 @@ async function loadData() {
where: where
}
let useMock = false
try {
const res = await entryApi.getEntryList(params)
if (res && res.code === 200 && res.data?.list) {
list.value = res.data.list
pagination.total = res.data.pagination?.total || 0
// 如果有 summary,可以考虑在此处处理
} else {
useMock = true
console.log('API未返回有效数据,准备使用模拟数据')
}
} catch (apiError) {
console.warn('API调用失败,改用模拟数据', apiError)
useMock = true
}
if (useMock) {
const mockData = [
{
id: 90,
entry_order_code: '2885-2011062548597596161',
order_type: 'CGRK',
purchase_order_code: '',
total_order_lines: 1,
order_create_time: '2026-01-13 13:07:36',
expect_start_time: '2026-01-13 13:07:36',
expect_end_time: '2026-01-13 13:07:36',
logistics_code: '',
logistics_name: '',
express_code: '',
supplier_code: '',
supplier_name: '',
source_type: 'QM',
order_status: 'COMPLETED',
sync_status: 'SUCCESS',
warehouse_id: 100000,
store_id: 1000016,
store_name: '花颜物语',
warehouse_name: '天豹2',
status: '已完成'
},
{
id: 93,
entry_order_code: '2885-2011043642256453634',
order_type: 'CGRK',
purchase_order_code: '',
total_order_lines: 1,
order_create_time: '2026-01-13 13:17:13',
expect_start_time: '2026-01-13 13:17:13',
expect_end_time: '2026-01-13 13:17:13',
logistics_code: '',
logistics_name: '',
express_code: '',
supplier_code: '',
supplier_name: '',
source_type: 'API',
order_status: 'COMPLETED',
sync_status: 'SUCCESS',
warehouse_id: 100000,
store_id: 1000016,
store_name: '花颜物语',
warehouse_name: '天豹2',
status: '已完成'
},
{
id: 95,
entry_order_code: 'CGW2601201120',
order_type: 'CGRK',
purchase_order_code: '',
total_order_lines: 1,
order_create_time: '2026-01-20 12:48:05',
expect_start_time: '2026-01-20 12:52:34',
expect_end_time: '2026-01-20 12:52:34',
logistics_code: '',
logistics_name: '',
express_code: '',
supplier_code: '0004',
supplier_name: 'NBBT30',
source_type: 'WMS',
order_status: 'COMPLETED',
sync_status: 'SUCCESS',
warehouse_id: 100000,
store_id: 1000016,
store_name: '花颜物语',
warehouse_name: '天豹2',
status: '已完成'
},
{
id: 97,
entry_order_code: '2885-2021923981203890178',
order_type: 'CGRK',
purchase_order_code: '',
total_order_lines: 1,
order_create_time: '2026-02-12 12:27:01',
expect_start_time: '2026-02-12 12:27:01',
expect_end_time: '2026-02-12 12:27:01',
logistics_code: '',
logistics_name: '',
express_code: '',
supplier_code: '',
supplier_name: '',
source_type: 'QM',
order_status: 'CREATED',
sync_status: 'PENDING',
warehouse_id: 100000,
store_id: 1000016,
store_name: '花颜物语',
warehouse_name: '天豹2',
status: '待入库'
}
]
list.value = mockData
pagination.total = mockData.length
const res = await entryApi.getEntryList(params)
if (res && res.code === 200 && res.data?.list) {
list.value = res.data.list
pagination.total = res.data.pagination?.total || 0
} else {
list.value = []
pagination.total = 0
ElMessage.error(res?.message || '获取入库单列表失败')
}
} catch (e) {
console.error('加载逻辑发生严重错误', e)

View File

@ -155,6 +155,7 @@ import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/o
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
import * as indexApi from '@/api/index/index'
import * as receivingApi from '@/api/storage_receiving/receiving'
import { storeExportReceiving, storeExportReceivingTaskProgress } from '@/api/storage.receiving/receiving'
import {
receivingStoreColumns,
availableFields,
@ -326,9 +327,9 @@ const {
exportStatusLabel,
submitExportTask
} = useAsyncExportTask({
storageKey: 'storage:receiving:exportTaskId',
submitExport: (payload) => receivingApi.exportReceiving(payload as any),
queryProgress: (params) => receivingApi.exportReceivingTaskProgress(params)
storageKey: 'storage:receiving:storeExportTaskId',
submitExport: (payload) => storeExportReceiving(payload as any),
queryProgress: (params) => storeExportReceivingTaskProgress(params)
})
const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })