diff --git a/src/api/storage.entry/entry.ts b/src/api/storage.entry/entry.ts index 442cc2d0..be9830d4 100644 --- a/src/api/storage.entry/entry.ts +++ b/src/api/storage.entry/entry.ts @@ -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 { +export function queryEntryLogs(data: QueryEntryLogsParams = { + id: '' +}): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/storage.receiving/receiving.ts b/src/api/storage.receiving/receiving.ts index bd0a82c9..a82227e4 100644 --- a/src/api/storage.receiving/receiving.ts +++ b/src/api/storage.receiving/receiving.ts @@ -98,3 +98,50 @@ export function exportReceivingTaskProgress(data: ReceivingExportTaskProgressPar isSystemApi: true } as any) } + +/** storage.receiving.storeExport 查询参数(货主维度收货单导出,以当前平台激活的货主 store_id 为维度) */ +export type StoreReceivingExportParams = { + where?: Record + sort?: { + sortField?: string + sort_field?: string + sortOrder?: string + sort_order?: string + } +} + +/** storage.receiving.storeExport:提交货主侧收货单导出任务(货主维度,异步) */ +export function storeExportReceiving(data: StoreReceivingExportParams): Promise { + 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 { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.receiving.storeExportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index d4a18e46..fb913874 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -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' }, ] diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index b76ec259..96039bd2 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -92,7 +92,7 @@ - + diff --git a/src/views/storage/entry/component/EntryBindingRelations.vue b/src/views/storage/entry/component/EntryBindingRelations.vue index 8301edd2..0ac064e1 100644 --- a/src/views/storage/entry/component/EntryBindingRelations.vue +++ b/src/views/storage/entry/component/EntryBindingRelations.vue @@ -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)) : '—', } } diff --git a/src/views/storage/entry/component/ReceivingBindingDetailDialog.vue b/src/views/storage/entry/component/ReceivingBindingDetailDialog.vue index 800ff6e2..80d8bad7 100644 --- a/src/views/storage/entry/component/ReceivingBindingDetailDialog.vue +++ b/src/views/storage/entry/component/ReceivingBindingDetailDialog.vue @@ -23,9 +23,10 @@ {{ item.statusLabel }} + {{ item.storeName || '—' }} + {{ item.totalItems }} + {{ item.totalQuantity }} {{ item.createdAt }} - {{ item.supplierName || '—' }} - {{ item.expressCode || '—' }} {{ item.remark || '—' }} @@ -46,10 +47,10 @@ > - - - + + +