From 072f4dd833079afe9f1da34b7f221fdc371c8293 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Tue, 25 Aug 2026 18:14:47 +0800 Subject: [PATCH] 1 --- src/api/returnunpack/index.ts | 12 ++ src/api/storage.entry/entry.ts | 8 +- src/api/storage.stockout/stockout.ts | 42 ++++- .../storeWarehouse.store/storeWarehouse.ts | 38 ++++ src/components/UpperTable/index.vue | 30 ++- .../components/UnpackDetailTable.vue | 12 ++ src/views/express/returnUnpack/index.vue | 1 + .../returnUnpack/returnUnpack-config.ts | 5 + .../component/BatchImportDialog.vue | 24 ++- .../component/CreatePendingOrderDialog.vue | 88 ++++++--- .../stock/stock/component/ImportDialog.vue | 173 +++++++++++------ .../component/DirectInboundImportDialog.vue | 30 ++- src/views/storage/entry/index.vue | 16 +- .../entry/utils/direct-inbound-xlsx-import.ts | 2 +- .../storage/receiving/component/Product.vue | 24 ++- src/views/storage/stockout/index.vue | 177 +++++++++++++++++- src/views/storage/stockout/stockout-config.ts | 2 +- src/views/store/stores/index.vue | 144 +++++++++++++- src/views/store/stores/store-config.ts | 21 ++- .../components/RackBulkModifyDialog.vue | 41 ++-- 20 files changed, 748 insertions(+), 142 deletions(-) diff --git a/src/api/returnunpack/index.ts b/src/api/returnunpack/index.ts index e45558fe..2be4d247 100644 --- a/src/api/returnunpack/index.ts +++ b/src/api/returnunpack/index.ts @@ -532,6 +532,18 @@ export type ReturnUnpackDetailParams = { id: number } +/** returnUnpack.detail 响应 */ +export type ReturnUnpackDetailResponse = { + /** 主表完整记录(含 details 明细、videos 视频、returnReceived 退回收到单关联与格式化时间字段;videos 的 video_url 自动拼接 CDN 域名前缀 http://w{warehouseId}-c{recordingComputerId}.o.gztbyc.com{path}) */ + record: ReturnUnpackRecord + /** 关联信息对象 */ + related?: { + /** 原订单详情(含 items 明细,仅原单退回时返回,非原单为 null) */ + order?: ReturnUnpackOriginalOrder | null + [key: string]: any + } +} + /** returnUnpack.detail:拆包单详情(主表 + 明细 + 视频副表 + 退回收到单) */ export function returnUnpackDetail(data: ReturnUnpackDetailParams): Promise { return request({ diff --git a/src/api/storage.entry/entry.ts b/src/api/storage.entry/entry.ts index be9830d4..88dc43f0 100644 --- a/src/api/storage.entry/entry.ts +++ b/src/api/storage.entry/entry.ts @@ -532,7 +532,13 @@ export type ReceivingCompareResponse = { message?: string entry_order_id?: number entry_order_code?: string - /** 各收货单对照结果列表 */ + /** 合并后的逐行对照列表(多个收货单明细先合并,再与入库单对照;以入库单明细为主,每个入库明细仅一行,含匹配状态 matched/entry_only、合并收货数量与各收货单来源明细) */ + comparison?: ReceivingCompareRow[] + /** 仅收货单有的商品列表(合并后仍未匹配到任何入库明细,按商品合并) */ + receiving_only?: ReceivingCompareRow[] + /** 合并对照汇总统计,含 total_entry_items/matched_items/entry_only_items/receiving_only_items */ + summary?: ReceivingCompareSummary + /** 各收货单对照结果列表(兼容旧结构) */ comparisons?: ReceivingCompareItem[] /** 校验失败的收货单列表 */ errors?: Array<{ receiving_id?: number; message?: string; [key: string]: unknown }> diff --git a/src/api/storage.stockout/stockout.ts b/src/api/storage.stockout/stockout.ts index e50f0084..3da34e2b 100644 --- a/src/api/storage.stockout/stockout.ts +++ b/src/api/storage.stockout/stockout.ts @@ -69,8 +69,44 @@ export const stockoutListItems = (data: StockoutListItemsParams) => { }) } -/** 占位扩展接口,参数预留;与文档 storage.stockout.toOrder 对齐 */ -export const stockoutToOrder = (data?: { id?: number; delivery_order_code?: string }) => { +// ── storage.stockout.toOrder ── + +export type StockoutToOrderReceiverInfo = { + name?: string + mobile?: string + tel?: string + province?: string + city?: string + area?: string + town?: string + detailAddress?: string + zipCode?: string +} + +export type StockoutToOrderParams = { + /** 出库单ID(必填) */ + id: number + /** 新订单号,不传自动生成(SK 前缀) */ + delivery_order_code?: string + /** 收件人信息,不传时新订单收货信息为空 */ + receiverInfo?: StockoutToOrderReceiverInfo +} + +export type StockoutToOrderResponse = { + /** 出库单ID */ + id: number + /** 出库单号 */ + stockout_order_code: string + /** 新订单ID */ + order_id: number + /** 新订单号 */ + delivery_order_code: string + /** 订单步骤(0=待审核,1=待处理) */ + step?: number +} + +/** 将非订单出库单转为正式销售订单:新订单 create_channel 固定为 STOCKOUT;转单成功后原出库单置为 CANCELLED(幂等,重复调用返回原订单信息)。仅 CREATED / PENDING 状态允许转单 */ +export const stockoutToOrder = (data: StockoutToOrderParams): Promise => { return request({ url: `/system`, method: 'post', @@ -79,7 +115,7 @@ export const stockoutToOrder = (data?: { id?: number; delivery_order_code?: stri v, timestamp: new Date().getTime() }, - data: data || {} + data: data }) } diff --git a/src/api/storeWarehouse.store/storeWarehouse.ts b/src/api/storeWarehouse.store/storeWarehouse.ts index d9e7442d..8be4647d 100644 --- a/src/api/storeWarehouse.store/storeWarehouse.ts +++ b/src/api/storeWarehouse.store/storeWarehouse.ts @@ -404,6 +404,44 @@ export function storeWarehouseOpenAccount(data: { } as any) } +/** storeWarehouse.store.createUser 响应 */ +export type StoreWarehouseCreateUserResponse = { + /** 账号ID */ + account_id: number + /** 用户名 */ + username: string + /** 货主ID */ + store_id: number + /** 是否本次新建账号;false 表示账号已存在仅完成授权 */ + created: boolean + /** 仅 created=true 时返回:随机生成的初始明文密码(12 位,随机大小写字母/数字) */ + password?: string +} + +/** + * storeWarehouse.store.createUser:为货主创建用户。 + * 按用户名查询平台账号,不存在则自动注册并随机生成 12 位密码返回; + * 两种情况统一完成货主工号绑定并授予货主管理员角色(wms_role.id=5),幂等。 + */ +export function storeWarehouseCreateUser(data: { + /** 用户名,3-50 位字母、数字或下划线,全局唯一 */ + username: string + /** 货主ID */ + store_id: number +}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.store.createUser', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + /** 提交面单余额变更日志导出任务 */ export function storeWarehouseExportPrintQuantityLogs(data: { store_id: number | string diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index 11c5b7ca..ad34b092 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -471,7 +471,7 @@ const props = defineProps({ // 分页每页显示个数选择器的选项设置 pageSizes: { type: Array as any, - default: () => [10, 20, 50, 100, 200, 500], + default: () => [10, 20, 50, 100, 200, 500, 1000], }, // 分页布局 paginationLayout: { @@ -580,6 +580,7 @@ const draggingProp = ref('') const dragOverProp = ref('') const tableContainer = ref(null) const bodyScrollEl = ref(null) +let scrollRaf: number | null = null const columnConfigListRef = ref(null) const virtualScrollTop = ref(0) const virtualViewportHeight = ref(0) @@ -729,7 +730,7 @@ const virtualVisibleCount = computed(() => { const bufferRows = props.virtualBufferRows const viewportCount = virtualViewportHeight.value ? Math.ceil(virtualViewportHeight.value / virtualRowHeight.value) + bufferRows * 2 - : (props.pagination.pageSize || 20) + : 30 if (props.virtualMaxVisibleRows > 0) { return Math.min(props.virtualMaxVisibleRows, viewportCount) } @@ -811,7 +812,7 @@ watch(() => props.data, () => { clearSelection() expandedMultiCopyCells.value = new Set() syncVirtualViewport() -}, { deep: true }) +}) watch( [() => props.columns, () => props.enableColumnConfig, () => props.tableId, () => userStore.roleId, () => userStore.user], @@ -1568,12 +1569,23 @@ function getRowStyle({ row }: { row: any }) { } function handleBodyScroll() { - if (!bodyScrollEl.value) return - virtualScrollTop.value = bodyScrollEl.value.scrollTop || 0 - virtualViewportHeight.value = bodyScrollEl.value.clientHeight || 0 + if (scrollRaf !== null) return + scrollRaf = requestAnimationFrame(() => { + scrollRaf = null + if (!bodyScrollEl.value) return + const top = bodyScrollEl.value.scrollTop || 0 + const height = bodyScrollEl.value.clientHeight || 0 + // 仅在值变化时更新,避免滚动过程中无谓的 computed 重算与表格重渲染 + if (top !== virtualScrollTop.value) virtualScrollTop.value = top + if (height !== virtualViewportHeight.value) virtualViewportHeight.value = height + }) } function unbindBodyScroll() { + if (scrollRaf !== null) { + cancelAnimationFrame(scrollRaf) + scrollRaf = null + } if (!bodyScrollEl.value) return bodyScrollEl.value.removeEventListener('scroll', handleBodyScroll) } @@ -1593,8 +1605,10 @@ function bindBodyScroll() { function syncVirtualViewport() { nextTick(() => { - if (!shouldUseVirtual.value) { - virtualScrollTop.value = 0 + // 数据源变化(翻页/新数据)时重置滚动位置,避免虚拟滚动窗口错位 + virtualScrollTop.value = 0 + if (bodyScrollEl.value) { + bodyScrollEl.value.scrollTop = 0 } bindBodyScroll() }) diff --git a/src/views/express/returnUnpack/components/UnpackDetailTable.vue b/src/views/express/returnUnpack/components/UnpackDetailTable.vue index a2c720a0..25a7c753 100644 --- a/src/views/express/returnUnpack/components/UnpackDetailTable.vue +++ b/src/views/express/returnUnpack/components/UnpackDetailTable.vue @@ -16,6 +16,9 @@ + + + @@ -45,6 +48,9 @@ + + + @@ -70,6 +76,12 @@ function stockBarcodes(row: any): string { } return row?.barcode || '-' } + +/** 明细录入时间展示(ISO → YYYY-MM-DD HH:mm:ss,容错) */ +function formatDetailTime(v: any): string { + if (v === null || v === undefined || v === '') return '-' + return String(v).replace('T', ' ').slice(0, 19) +}