From 332ebac7b4673a4b8215a423ce32bba87f59177d Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 9 Jun 2026 00:00:50 +0800 Subject: [PATCH] 1 --- src/api/order.recheckorder/recheckOrder.ts | 26 +- .../component/CreatePendingOrderDialog.vue | 1785 ++++------------- src/views/order/orderreview/index.vue | 203 +- 3 files changed, 550 insertions(+), 1464 deletions(-) diff --git a/src/api/order.recheckorder/recheckOrder.ts b/src/api/order.recheckorder/recheckOrder.ts index 0f41a824..7bb2b46d 100644 --- a/src/api/order.recheckorder/recheckOrder.ts +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -96,11 +96,12 @@ export function scanTask(data: RecheckScanTaskParams): Promise { } as any) } -/** 订单 ID;优先 order_id,兼容 id、orderId */ +/** 订单 ID;优先 order_id,兼容 id、orderId;团购模式支持 wave_id */ export type ConfirmRecheckParams = { order_id?: string | number id?: string | number orderId?: string | number + wave_id?: string | number } function coerceOrderId(v: string | number): string | number { @@ -111,7 +112,11 @@ function coerceOrderId(v: string | number): string | number { return s } -function pickConfirmRecheckBody(data: ConfirmRecheckParams): { order_id: string | number } { +function pickConfirmRecheckBody(data: ConfirmRecheckParams): Record { + // 团购波次模式:优先使用 wave_id + if (data.wave_id !== undefined && data.wave_id !== null && `${data.wave_id}`.trim() !== '') { + return { wave_id: coerceOrderId(data.wave_id) } + } const raw = data.order_id !== undefined && data.order_id !== null && `${data.order_id}`.trim() !== '' ? data.order_id @@ -121,7 +126,7 @@ function pickConfirmRecheckBody(data: ConfirmRecheckParams): { order_id: string ? data.orderId : undefined if (raw === undefined) { - throw new Error('订单 ID 不能为空(order_id / id / orderId)') + throw new Error('订单 ID 不能为空(order_id / id / orderId / wave_id)') } return { order_id: coerceOrderId(raw) } } @@ -161,3 +166,18 @@ export const orderRecheckOrder = { confirmRecheck, confirmIntercept } + +/** order.updateExpressWeighingWeight:更新订单运单称重重量 */ +export function updateExpressWeighingWeight(data: { order_id: number; weighing_weight: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.updateExpressWeighingWeight', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index e006c658..41e66098 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -6,7 +6,6 @@ align-center append-to-body destroy-on-close - :before-close="handleBeforeClose" @closed="resetImportOrderDialog" >
+ + 选择Excel + 下载模板 + 添加明细 + 清除数据 + + 确认创建 + - - - 选择Excel - - 下载模板 - 添加明细 - 清除数据 - - 确认创建 - - 关闭 已选文件:{{ importOrderFileName || '未选择' }} - - 共 {{ importDetailTotalCount }} 条明细,表格滑动窗口渲染最多 40 条 -
-
- -
- 共 {{ importAutoResolveProgress.total }} 条明细 - 地址识别 {{ importAutoResolveProgress.addressCompleted }}/{{ importAutoResolveProgress.total }} - 商品匹配 {{ importAutoResolveProgress.itemMatchCompleted }}/{{ importAutoResolveProgress.total }} - 已完成 {{ importAutoResolveProgress.readyCount }}/{{ importAutoResolveProgress.total }} - 处理中… -
-
- -
- -
- 总计 {{ importProgress.total }} - 成功 {{ importProgress.success_count }} - 失败 {{ importProgress.fail_count }} - 导入中… -
-
- -
-

正在识别地址并匹配商品,全部完成后显示明细

-
- -
+
+ @@ -148,18 +108,6 @@
-
-
未勾选行时,识别地址将自动新建 1 行
+
请先勾选左侧订单行
识别地址 清空
+ + @@ -431,14 +345,14 @@ --> diff --git a/src/views/order/orderreview/index.vue b/src/views/order/orderreview/index.vue index 549db217..71a6ada8 100644 --- a/src/views/order/orderreview/index.vue +++ b/src/views/order/orderreview/index.vue @@ -54,6 +54,14 @@ > 面单补打 + + 称重 + + + + + + + + + +