From ade15558ca59d2e65dba6f57d06358b5dcc47964 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 19 Nov 2026 09:11:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20B2B=20=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AA=97=E5=8F=A3=E4=B8=8E=E6=8F=90=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 备货:行内「备货」打开作业窗口(startB2bPrep 激活),窗口内完成分箱登记(getB2bPackingSnapshot/updateB2bPackingItems,含取货储位)与备货完成(备货照片 updateB2bOrderImages + finishB2bPrep);齐套校验失败展示 item_mismatches;关闭窗口(含遮罩/ESC)统一提示取消备货(cancelB2bPrep)。 提货:确认提货进入操作列,车牌 + 提货照片随 pickupB2b 一次提交,提货即出库完成;已提货订单车牌锁定仅可追加照片。 列表:操作列按状态动态生成(备货/确认提货/设置车牌),移除独立分箱入口;B2B 列表补充作业创建时间、备货/提货照片;B2B 详情补充 b2b 作业明细、备货与提货照片分组展示。 其它:COS 图片上传兼容多层 data 包裹并回传 fileId;UpperTable 操作列宽度不受历史列配置覆盖。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../order.deliveryorder/orderdeliveryOrder.ts | 7 + .../order.pendingorder/orderpendingOrder.ts | 316 +++- src/api/order/order.ts | 33 + src/components/ImagesUpload/index.vue | 5 +- src/components/UpperTable/index.vue | 4 +- src/utils/cosImageUpload.ts | 77 +- .../component/PendingOrderDetailPanel.vue | 121 +- .../config/order-common-config.ts | 185 ++- .../order/orderManagement/deliveryOrder.vue | 118 +- .../orderManagement/form/B2bPickupForm.vue | 524 +++++++ .../form/B2bPickupPlateForm.vue | 330 ++++ .../form/B2bPrepFinishForm.vue | 5 +- .../orderManagement/form/B2bPrepForm.vue | 1364 +++++++++++++++++ .../order/orderManagement/pendingOrder.vue | 119 +- .../order/orderManagement/utils/export.ts | 4 +- .../orderManagement/utils/use-b2b-actions.ts | 598 +++++++- 16 files changed, 3696 insertions(+), 114 deletions(-) create mode 100644 src/views/order/orderManagement/form/B2bPickupForm.vue create mode 100644 src/views/order/orderManagement/form/B2bPickupPlateForm.vue create mode 100644 src/views/order/orderManagement/form/B2bPrepForm.vue diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index 90334b27..30e09acf 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -1,4 +1,5 @@ import request from '@/utils/request' +import type { OrderDetailB2bInfo, OrderDetailImage } from '@/api/order/order' const v = '1.0' @@ -220,6 +221,12 @@ export type DeliveryOrderDetailPayload = { expresses?: DeliveryOrderDetailExpressItem[] logs?: DeliveryOrderDetailLogItem[] waybill_codes?: string[] + /** B2B 作业明细:仅 is_b2b=Y 的订单输出,非 B2B 为 null */ + b2b?: OrderDetailB2bInfo | null + /** B2B 备货留证照片(business_type=b2b_order);无图片为空数组 */ + images?: OrderDetailImage[] + /** B2B 提货留证照片(business_type=b2b_pickup);无图片为空数组,与 images 分开输出 */ + pickup_images?: OrderDetailImage[] } export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Promise { diff --git a/src/api/order.pendingorder/orderpendingOrder.ts b/src/api/order.pendingorder/orderpendingOrder.ts index dddb9714..6d6b64fb 100644 --- a/src/api/order.pendingorder/orderpendingOrder.ts +++ b/src/api/order.pendingorder/orderpendingOrder.ts @@ -1,4 +1,5 @@ import request from "@/utils/request"; +import type { OrderDetailB2bInfo, OrderDetailImage } from "@/api/order/order"; import { orderModulePendingOrderDownloadCreateTemplate, orderModulePendingOrderManualWaybill, @@ -68,16 +69,40 @@ export type PendingOrderListParams = { export type PendingOrderListResponse = PendingOrderWorkbenchListResponse; export type PendingOrderDetailParams = { + /** 订单ID:支持 ids 数组、逗号分隔字符串或单个 id/order_id,至少提供一项 */ ids?: Array | string | number; id?: number | string; order_id?: number | string; orderId?: number | string; + /** 已忽略:接口固定先查配送表(dispatch),查不到再兜底待处理表(current),传入不生效 */ tableType?: string; tablePosition?: string; type?: string; moduleName?: string; }; +/** + * order.pendingOrder.detail 响应 data + * - B2B 订单(is_b2b='Y')额外返回副表作业明细 b2b、备货照片 images 与提货照片 pickup_images, + * 非 B2B 时 b2b 为 null、images / pickup_images 为空数组 + */ +export type PendingOrderDetailPayload = { + /** 订单头对象(raw 行数据,来自配送表或兜底的待处理表) */ + detail?: Record; + order?: Record; + orderItems?: Record[]; + items?: Record[]; + expresses?: Record[]; + /** 按库位平铺的储位分配明细 */ + storage_items?: Record[]; + /** B2B 作业明细:仅 is_b2b=Y 的订单输出,非 B2B 为 null */ + b2b?: OrderDetailB2bInfo | null; + /** B2B 备货留证照片(business_type=b2b_order);无图片为空数组 */ + images?: OrderDetailImage[]; + /** B2B 提货留证照片(business_type=b2b_pickup);无图片为空数组,与 images 分开输出 */ + pickup_images?: OrderDetailImage[]; +}; + /** markPendingOutboundOrder / cancelOrder:文档要求订单 ID 正整数数组,不支持单 id 或逗号字符串 */ export type PendingOrderIdsParams = { ids: number[]; @@ -353,6 +378,9 @@ export function orderPendingOrderList(data: PendingOrderListParams = {}): Promis * total_box_count、pickup_plate_number、prep_remark、prep_duration_seconds、is_urgent(Y/N)、prep_at、 * is_picked_up(Y/N)、picked_up_at、created_at(作业明细创建时间,与订单 create_at 不同)、 * prep_status(none/padding/fin)、prep_operator_id、prep_operator_name、prep_start_at + * - 行内另带出 images(备货留证照片 business_type=b2b_order)、pickup_images(提货留证照片 b2b_pickup), + * 元素 { id: file_id, url, display_order };无图片为空数组 + * - 取货储位不在列表返回:逐商品取货储位见 order.getB2bPackingSnapshot 的 items[].pick_locations * - where 额外支持(仅 B2B 列表开放,普通列表不识别):total_box_count / pickup_plate_number / prep_remark / * prep_duration_seconds / is_picked_up / picked_up_at / created_at / prep_at / is_urgent / * prep_status / prep_operator_id / prep_start_at(支持简写与 {operator,value} 标准结构,prep_at 支持 between) @@ -373,6 +401,28 @@ export function orderPendingOrder2bList(data: PendingOrderListParams = {}): Prom } as any); } +/** order.pendingOrder2b.list 列表行(在普通订单行基础上追加 B2B 作业字段与照片) */ +export type PendingOrderB2bListRow = Record & { + prep_status?: string; + prep_operator_id?: number | null; + prep_operator_name?: string | null; + prep_start_at?: string | null; + total_box_count?: number; + pickup_plate_number?: string | null; + prep_remark?: string | null; + prep_duration_seconds?: number; + prep_at?: string | null; + is_urgent?: string; + is_picked_up?: string; + picked_up_at?: string | null; + /** B2B 作业明细创建时间(与订单 create_at 不同) */ + created_at?: string | null; + /** 备货留证照片(business_type=b2b_order) */ + images?: OrderDetailImage[]; + /** 提货留证照片(business_type=b2b_pickup) */ + pickup_images?: OrderDetailImage[]; +}; + /** * order.convertToB2b:待处理订单批量转 B2B 订单 * - 仅查当前仓库 current 分表(wms_order_delivery_{warehouseId}),仓库取自登录上下文,禁止前端传入 @@ -487,6 +537,25 @@ export type PendingOrderB2bOrderIdParams = { orderId?: number; }; +/** + * B2B 照片入参项:可直接传 file_id,或传 { file_id, display_order } + * (display_order 缺省按去重后下标补 0 起序号) + */ +export type PendingOrderB2bImageInput = + | number + | { file_id: number; display_order?: number }; + +/** + * B2B 照片项(接口响应内):order.pickupB2b / order.updateB2bOrderImages 返回 { file_id, url, display_order }; + * 明细与列表的 images / pickup_images 返回 { id: file_id, url, display_order }(见 OrderDetailImage) + */ +export type PendingOrderB2bImageItem = { + /** file_id */ + file_id: number | string; + url: string; + display_order?: number; +}; + /** * order.startB2bPrep:备货开始(仅 B2B 订单,单订单作业) * - 操作人取当前登录工号写入 prep_operator_id / prep_operator_name,prep_status 置 padding,prep_start_at 记开始时间 @@ -556,6 +625,8 @@ export function orderPendingOrderCancelB2bPrep( * - 写入 prep_remark / total_box_count / prep_at(提交时刻)/ prep_duration_seconds,prep_status 置 fin * - 仅 prep_status=padding 可提交,且必须由同一备货工号提交 * - ⚠️ 完成时**同步扣减库存**(口径同拣货完成:扣 wms_storage 锁定+可用、写 OUTBOUND/PICK_OUTBOUND 流水、wms_picking 置 fin) + * - 仓库开启 subject_config.b2b_packing_quantity_check 时,逐商品行校验分箱数量合计 = plan_qty, + * 并校验 total_box_count = 分箱箱号数;不符返回 400(data.item_mismatches),事务回滚 */ export type PendingOrderFinishB2bPrepParams = PendingOrderB2bOrderIdParams & { /** 备货备注,必填,最长 500 字符 */ @@ -566,6 +637,19 @@ export type PendingOrderFinishB2bPrepParams = PendingOrderB2bOrderIdParams & { totalBoxCount?: number; }; +/** order.finishB2bPrep 齐套校验失败明细项(data.item_mismatches) */ +export type PendingOrderFinishB2bPrepMismatch = { + /** 订单商品明细ID */ + order_item_id?: number; + item_id?: number | null; + item_code?: string | null; + item_name?: string | null; + /** 应拣数量 */ + plan_qty?: number; + /** 已分箱数量合计 */ + packed_quantity?: number; +}; + /** order.finishB2bPrep 响应 */ export type PendingOrderFinishB2bPrepResponse = { /** 固定 fin */ @@ -603,9 +687,20 @@ export function orderPendingOrderFinishB2bPrep( /** * order.pickupB2b:B2B 提货(仅 B2B 订单,单订单作业) * - is_picked_up 置 Y、picked_up_at 记提交时刻;要求 is_b2b=Y、未取消、prep_status=fin - * - 已提货重复调用幂等成功并返回首次提货时间(already_picked_up=true) + * - **提货即出库完成**:同一事务把订单所在分表的 outbound_status 置 fin、step 置 4、delivery_time 置提货时间, + * 随后由出库迁移调度搬到配送表(dispatch_lane=m4),可从 order.deliveryOrder2b.list 查询 + * - 已提货重复调用幂等成功并返回首次提货时间(already_picked_up=true);已提货但主表未出库的历史单会补写(自愈) * - 订单先在 current 分表查,未命中兜底 dispatch 分表 + * - 可选 pickup_plate_number:提货时一并写入提货车牌(空串/null 清空;已提货时传不同值返回 400) + * - 可选 pickup_file_ids:提货照片(追加语义,写入 business_type=b2b_pickup,不覆盖已有照片) */ +export type PendingOrderPickupB2bParams = PendingOrderB2bOrderIdParams & { + /** 提货车牌(可选;归一化后写入 wms_order_b2b.pickup_plate_number) */ + pickup_plate_number?: string | null; + /** 提货照片 file_id 列表(可选;兼容 pickupFileIds / file_ids / fileIds / pickup_images) */ + pickup_file_ids?: PendingOrderB2bImageInput[]; +}; + export type PendingOrderPickupB2bResponse = { /** 固定 Y */ is_picked_up: string; @@ -617,10 +712,22 @@ export type PendingOrderPickupB2bResponse = { picked_up_count: number; /** true=已提货幂等命中(未改写提货时间与操作日志) */ already_picked_up: boolean; + /** 订单当前提货车牌:本次传入为新值,未传为库中已有值,均无时为 null */ + pickup_plate_number?: string | null; + /** 订单当前提货照片(business_type=b2b_pickup),无照片为空数组 */ + pickup_images: PendingOrderB2bImageItem[]; + /** 订单当前提货照片数量 */ + pickup_image_count: number; + /** 提货后订单主表出库状态,固定 fin */ + outbound_status: string; + /** 提货后订单主表步骤,固定 4(已出库,等待迁移到配送表) */ + step: number; + /** 本次调用是否写入了主表出库状态(已提货且主表已完成出库时为 false) */ + outbound_marked: boolean; }; export function orderPendingOrderPickupB2b( - data: PendingOrderB2bOrderIdParams, + data: PendingOrderPickupB2bParams, ): Promise { return request({ url: "/system", @@ -716,6 +823,199 @@ export function orderPendingOrderCancelB2bUrgent( } as any); } +/** + * order.setB2bPickupPlate:录入/修改 B2B 提货车牌(仅 B2B 订单,单订单作业,提货前可改) + * - 车牌归一化(去空格与 ·/•/-/-/_ 分隔符后转大写)后写入 wms_order_b2b.pickup_plate_number + * - pickup_plate_number 键必须传;传空字符串或 null 表示清空车牌 + * - 仅 is_b2b=Y 且未取消的订单可录入;已提货(is_picked_up=Y)后车牌锁定不允许再修改 + * - 作业明细行缺失时按默认值补建(detail_created=true) + */ +export type PendingOrderSetB2bPickupPlateParams = { + /** 订单ID:单订单作业,仅允许传 1 个(单值或单元素数组) */ + ids: number[]; + /** 提货车牌;空字符串或 null 表示清空 */ + pickup_plate_number: string | null; +}; + +export type PendingOrderSetB2bPickupPlateResponse = { + order_id: number; + delivery_order_code: string; + /** 本次落库的车牌(归一化后);清空时为 null */ + pickup_plate_number: string | null; + /** 修改前的车牌;原本无车牌时为 null */ + previous_pickup_plate_number: string | null; + /** 车牌是否发生变化(false 表示与原值一致,未重复写操作日志) */ + changed: boolean; + /** 作业明细行是否本次补建(true=原无 wms_order_b2b 行) */ + detail_created: boolean; +}; + +export function orderPendingOrderSetB2bPickupPlate( + data: PendingOrderSetB2bPickupPlateParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.setB2bPickupPlate", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.updateB2bOrderImages:更新 B2B 订单备货留证照片(单订单,全量覆盖) + * - business_type 固定 b2b_order(与提货照片 b2b_pickup 分开存放) + * - images 全量覆盖语义,传 [] 清空;单订单最多 20 张;文件必须属于当前仓库且未删除 + */ +export type PendingOrderUpdateB2bOrderImagesParams = { + /** 订单ID:单订单作业,仅允许传 1 个(单值或单元素数组) */ + ids: number[]; + /** 备货照片列表(全量覆盖;支持 file_id 或 { file_id, display_order }) */ + images: PendingOrderB2bImageInput[]; +}; + +export type PendingOrderUpdateB2bOrderImagesResponse = { + order_id: number; + delivery_order_code: string; + image_count: number; + /** 更新后的备货照片列表(按 display_order、id 升序) */ + images: PendingOrderB2bImageItem[]; + added_file_ids: number[]; + removed_file_ids: number[]; +}; + +export function orderPendingOrderUpdateB2bOrderImages( + data: PendingOrderUpdateB2bOrderImagesParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.updateB2bOrderImages", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.getB2bPackingSnapshot:查询单个 B2B 订单的商品明细与分箱快照 + * - items 每项含 order_item_id / plan_qty / packed_quantity / boxes({ box_no, quantity }) + * 以及 pick_locations(该商品从哪些储位取货多少:{ space_id, space_name, quantity }) + * - pick_location_count:本单涉及的不同储位个数(wms_picking 排除 status=cancel,未分配储位为 0) + * - require_packing_quantity_match:当前仓库是否开启分箱齐套校验(subject_config.b2b_packing_quantity_check) + */ +export type PendingOrderB2bPackingBox = { + box_no: string; + quantity: number; +}; + +/** 逐商品取货储位(wms_picking 排除 status=cancel,同商品同储位合并数量) */ +export type PendingOrderB2bPackingPickLocation = { + space_id: number | string; + space_name: string; + /** 该商品在此储位的取货数量 */ + quantity: number; +}; + +export type PendingOrderB2bPackingSnapshotItem = { + order_item_id: number; + item_id?: number | null; + stock_id?: number | null; + item_code?: string | null; + item_name?: string | null; + item_snapshot?: Record | null; + /** 应拣数量(订单明细 plan_qty) */ + plan_qty: number; + /** 已分箱数量 */ + packed_quantity: number; + boxes: PendingOrderB2bPackingBox[]; + /** 该商品的取货储位(未分配储位时为空数组) */ + pick_locations: PendingOrderB2bPackingPickLocation[]; +}; + +export type PendingOrderB2bPackingSnapshot = { + order_id: number; + delivery_order_code: string; + status?: string; + /** 备货状态,无作业明细时为 none */ + prep_status: string; + total_box_count: number; + /** 取货储位数量(本单涉及的不同储位个数),未分配储位时为 0 */ + pick_location_count: number; + /** 当前仓库是否启用分箱数量齐套校验 */ + require_packing_quantity_match: boolean; + items: PendingOrderB2bPackingSnapshotItem[]; +}; + +export function orderPendingOrderGetB2bPackingSnapshot( + data: PendingOrderB2bOrderIdParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.getB2bPackingSnapshot", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.updateB2bPackingItems:全量更新单个 B2B 订单的分箱商品明细 + * - 每条记录关联订单商品明细 order_item_id,记录箱号 box_no 与该箱数量 quantity + * - 整单全量替换,items 传空数组可清空;同时按不同箱号数同步 wms_order_b2b.total_box_count + * - 仅当前仓库的 B2B 且备货中(prep_status=padding)的订单可更新 + */ +export type PendingOrderB2bPackingItem = { + /** 订单商品明细ID */ + order_item_id: number; + /** 箱号(最长 50 字符) */ + box_no: string; + /** 该商品在该箱的正整数数量 */ + quantity: number; +}; + +export type PendingOrderUpdateB2bPackingItemsParams = { + /** 订单ID:仅允许传 1 个(单值或单元素数组) */ + ids: number[]; + /** 完整分箱明细(最多 10000 条;同一商品行与箱号不能重复) */ + items: PendingOrderB2bPackingItem[]; +}; + +export type PendingOrderUpdateB2bPackingItemsResponse = { + order_id: number; + /** 本次保存的分箱明细行数 */ + item_count: number; + /** 不同箱号的数量 */ + box_count: number; +}; + +export function orderPendingOrderUpdateB2bPackingItems( + data: PendingOrderUpdateB2bPackingItemsParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.updateB2bPackingItems", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderReverseReviewOrder( data: PendingOrderReverseReviewParams, ): Promise { @@ -1197,6 +1497,10 @@ export type OrderPendingOrderApi = { cancelB2b: typeof orderPendingOrderCancelB2b; setB2bUrgent: typeof orderPendingOrderSetB2bUrgent; cancelB2bUrgent: typeof orderPendingOrderCancelB2bUrgent; + setB2bPickupPlate: typeof orderPendingOrderSetB2bPickupPlate; + getB2bPackingSnapshot: typeof orderPendingOrderGetB2bPackingSnapshot; + updateB2bPackingItems: typeof orderPendingOrderUpdateB2bPackingItems; + updateB2bOrderImages: typeof orderPendingOrderUpdateB2bOrderImages; startB2bPrep: typeof orderPendingOrderStartB2bPrep; cancelB2bPrep: typeof orderPendingOrderCancelB2bPrep; finishB2bPrep: typeof orderPendingOrderFinishB2bPrep; @@ -1241,6 +1545,10 @@ export const orderPendingOrder: OrderPendingOrderApi = { cancelB2b: orderPendingOrderCancelB2b, setB2bUrgent: orderPendingOrderSetB2bUrgent, cancelB2bUrgent: orderPendingOrderCancelB2bUrgent, + setB2bPickupPlate: orderPendingOrderSetB2bPickupPlate, + getB2bPackingSnapshot: orderPendingOrderGetB2bPackingSnapshot, + updateB2bPackingItems: orderPendingOrderUpdateB2bPackingItems, + updateB2bOrderImages: orderPendingOrderUpdateB2bOrderImages, startB2bPrep: orderPendingOrderStartB2bPrep, cancelB2bPrep: orderPendingOrderCancelB2bPrep, finishB2bPrep: orderPendingOrderFinishB2bPrep, @@ -1283,6 +1591,10 @@ export const orderPendingOrder2b = { list: orderPendingOrder2bList, setB2bUrgent: orderPendingOrderSetB2bUrgent, cancelB2bUrgent: orderPendingOrderCancelB2bUrgent, + setB2bPickupPlate: orderPendingOrderSetB2bPickupPlate, + getB2bPackingSnapshot: orderPendingOrderGetB2bPackingSnapshot, + updateB2bPackingItems: orderPendingOrderUpdateB2bPackingItems, + updateB2bOrderImages: orderPendingOrderUpdateB2bOrderImages, startB2bPrep: orderPendingOrderStartB2bPrep, cancelB2bPrep: orderPendingOrderCancelB2bPrep, finishB2bPrep: orderPendingOrderFinishB2bPrep, diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 9d0920f2..33fc7248 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -2,6 +2,39 @@ import request from '@/utils/request' const v = '1.0' +/** + * order.pendingOrder.detail / order.deliveryOrder.detail 响应 data.b2b + * 仅 is_b2b='Y' 的订单输出;非 B2B 为 null,副表无作业行时为占位对象(数值 0 / is_*='N' / 时间为 null) + */ +export type OrderDetailB2bInfo = { + total_box_count?: number + pickup_plate_number?: string | null + prep_remark?: string | null + prep_duration_seconds?: number | null + /** none=未开始 / padding=备货中 / fin=已完成 */ + prep_status?: string + prep_operator_id?: number | null + prep_operator_name?: string | null + prep_start_at?: string | null + /** Y=加急 N=普通 */ + is_urgent?: string + /** Y=已提货 N=未提货 */ + is_picked_up?: string + picked_up_at?: string | null + /** 作业明细创建时间(与订单 create_at 不同) */ + created_at?: string | null + /** 备货完成时间 */ + prep_at?: string | null +} + +/** 订单详情响应 data.images / data.pickup_images(B2B 留证照片,元素 { id: file_id, url, display_order }) */ +export type OrderDetailImage = { + /** file_id */ + id: number | string + url: string + display_order?: number +} + /** order.wave.batchList 的 where 白名单(禁止 warehouse_id / warehouseId) */ export type WaveBatchListWhere = { wave_id?: number | string diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue index e5250826..a4129666 100644 --- a/src/components/ImagesUpload/index.vue +++ b/src/components/ImagesUpload/index.vue @@ -129,7 +129,7 @@ import { Plus, Camera, CameraFilled, Picture } from '@element-plus/icons-vue' import * as indexApi from '@/api/index/index' import SparkMD5 from 'spark-md5' import { useUserStore } from '@/stores/modules/user' -import { resolveUploadUrl } from '@/utils/cosImageUpload' +import { resolveUploadUrl, unwrapFileInfo } from '@/utils/cosImageUpload' const props = defineProps<{ type: string @@ -336,8 +336,9 @@ const uploadFile = async (file: any) => { throw new Error(`上传失败: ${response.status}`) } + // 通知后端登记文件,响应 data 里带回图片 URL(兼容 { data: { code, data: { fileUrl } } } 双层包裹) const { data: resultData } = await indexApi.uploadSuccessNotify(cosConfig.fileInfo || cosConfig) - return resultData + return unwrapFileInfo(resultData) } const getCOSUploadConfig = async (file: File) => { diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index 751f534b..54029606 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -784,9 +784,11 @@ const displayColumns = computed(() => { .map((column) => { const cfg = configMap[String(column.prop || '')] if (!cfg) return column + // 操作列宽度由页面定义决定:历史保存的列宽可能偏窄,会把行内按钮裁掉 + const isActionColumn = String(column.prop || '') === 'actions' return { ...column, - width: cfg.width ?? column.width, + width: isActionColumn ? column.width : (cfg.width ?? column.width), fixed: cfg.fixed === false ? undefined : (cfg.fixed ?? column.fixed) } }) diff --git a/src/utils/cosImageUpload.ts b/src/utils/cosImageUpload.ts index a781914f..fdfa881d 100644 --- a/src/utils/cosImageUpload.ts +++ b/src/utils/cosImageUpload.ts @@ -130,14 +130,77 @@ function pickFileUrl(src: Record): string { return value ? String(value) : '' } -/** 兼容 fileId / file_id / file.id */ + /** 兼容 fileId / file_id / file.id / file.file_id */ function pickFileId(src: Record): number | string | undefined { const nested = src.file as Record | undefined - const value = src.fileId ?? src.file_id ?? nested?.id + const value = src.fileId ?? src.file_id ?? nested?.id ?? nested?.file_id if (value === null || value === undefined || value === '') return undefined return value as number | string } +/** 是否像「文件信息」对象(用于逐层解包) */ +function looksLikeFileInfo(src: Record) { + return ( + pickFileUrl(src) !== '' || + pickFileId(src) !== undefined || + 'fileName' in src || + 'file_name' in src || + 'fileKey' in src || + 'file_key' in src + ) +} + +/** + * 逐层解包后端返回,取出真正的文件信息对象。兼容: + * - `{ fileId, fileUrl, ... }` + * - `{ data: { fileId, fileUrl, ... } }`(request 拦截器解一层) + * - `{ data: { code, message, data: { fileId, fileUrl, ... } } }`(后端中间件再包一层) + */ +export function unwrapFileInfo(src: unknown): Record { + let current: unknown = src + for (let depth = 0; depth < 4; depth += 1) { + if (!current || typeof current !== 'object') break + const record = current as Record + if (looksLikeFileInfo(record)) return record + const next = record.data + if (!next || typeof next !== 'object') return record + current = next + } + return (current && typeof current === 'object' ? current : {}) as Record +} + +/** COS 直传配置判定(避免把配置里的 data 表单字段误当成外层包裹) */ +function looksLikeCosConfig(src: Record) { + return [ + 'uploadUrl', + 'upload_url', + 'isNew', + 'fileInfo', + 'file_info', + 'error', + 'headers', + 'fileUrl', + 'file_url', + 'fileId', + 'file_id' + ].some((key) => key in src) +} + +/** 解包 `index.getCOSUploadConfig` 返回(兼容双层 data 包裹) */ +function resolveCosConfig(res: unknown): CosUploadConfig { + const record = (res && typeof res === 'object' ? res : {}) as Record + const candidate = ((record.data as Record | undefined) ?? record) as Record< + string, + unknown + > + if (looksLikeCosConfig(candidate)) return candidate as CosUploadConfig + const nested = candidate.data + if (nested && typeof nested === 'object' && looksLikeCosConfig(nested as Record)) { + return nested as CosUploadConfig + } + return candidate as CosUploadConfig +} + /** * 上传图片并返回图片地址 * @param file 待上传的图片文件 @@ -149,7 +212,7 @@ export async function uploadImageToCos( ): Promise { const md5 = await calculateFileMd5(file).catch(() => '') - const configRes: any = await getCOSUploadConfig({ + const configRes: unknown = await getCOSUploadConfig({ fileName: file.name, fileType: file.type, fileSize: file.size, @@ -158,7 +221,7 @@ export async function uploadImageToCos( ...(ctx?.id !== undefined && ctx?.id !== null && ctx?.id !== '' ? { id: ctx.id } : {}) }) - const config = ((configRes?.data ?? configRes ?? {}) as CosUploadConfig) || {} + const config = resolveCosConfig(configRes) || {} if (config.error) throw new Error(config.msg || '获取上传配置失败') // 同 MD5 文件已存在:无需重复上传,直接用已有文件信息 @@ -193,9 +256,9 @@ export async function uploadImageToCos( } if (!uploadRes.ok) throw new Error(`上传失败:${uploadRes.status}`) - // 通知后端登记文件,响应 data 里带回图片 URL(fileUrl/file_url) - const notifyRes: any = await uploadSuccessNotify(config.fileInfo || config) - const info = ((notifyRes?.data ?? notifyRes ?? {}) as Record) || {} + // 通知后端登记文件;响应可能是 { data: { code, message, data: { fileUrl } } } 的双层包裹 + const notifyRes: unknown = await uploadSuccessNotify(config.fileInfo || config) + const info = unwrapFileInfo(notifyRes) const fileUrl = pickFileUrl(info) if (!fileUrl) throw new Error('上传成功但未返回图片地址') return { fileUrl, fileId: pickFileId(info), raw: info } diff --git a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue index 20e7fc3e..b4ea9d5f 100644 --- a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue +++ b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue @@ -11,7 +11,22 @@ :label="field.label" :span="field.span" > - {{ field.text }} + + {{ field.text }}
{{ field.text }}
@@ -34,6 +49,7 @@ import { ORDER_DETAIL_TIME_FIELDS, COMMON_TRANSLATIONS, formatOrderTime, + getOrderDetailFieldValue, getTagType, getStatusTextClass, orderDetailCompactSections, @@ -128,7 +144,14 @@ function getFieldRawValue(prop: string) { if (prop === 'recheck_status') { return resolveOrderRecheckStatus(detail.value) } - return detail.value[prop] + // 支持 b2b.prep_status 这类嵌套路径(B2B 作业明细在响应 data 里是独立对象) + return getOrderDetailFieldValue(detail.value, prop) +} + +/** 字段是否走翻译表:嵌套字段(b2b.prep_status)按最后一段取名 */ +function fieldTranslateKey(prop: string) { + const index = prop.lastIndexOf('.') + return index >= 0 ? prop.slice(index + 1) : prop } function displayFieldValue(field: OrderDetailFieldConfig) { @@ -157,23 +180,37 @@ function displayFieldValue(field: OrderDetailFieldConfig) { return formatOrderTime(raw) } + const translateKey = fieldTranslateKey(field.prop) if (field.tag) { - return translateOrderField(field.prop, raw) + return translateOrderField(translateKey, raw) } - if (COMMON_TRANSLATIONS[field.prop]) { - return translateOrderField(field.prop, raw) + if (COMMON_TRANSLATIONS[translateKey]) { + return translateOrderField(translateKey, raw) } return raw } +/** 图片字段取值:兼容字符串数组与 { url } 对象数组 */ +function toDetailImageUrls(value: unknown): string[] { + if (!Array.isArray(value)) return [] + return value + .map((item) => + typeof item === 'string' ? item : String((item as Record | null)?.url ?? '') + ) + .map((url) => url.trim()) + .filter(Boolean) +} + type DetailFieldView = { prop: string label: string span: number multiline: boolean text: string + hasValue: boolean + images?: string[] tagClass?: string } @@ -190,20 +227,40 @@ type DetailSectionView = { */ const sectionViews = computed(() => { if (!detail.value) return [] - return activeSections.value.map((section) => ({ - title: section.title, - column: section.column || 3, - fields: section.fields.map((field) => ({ - prop: field.prop, - label: field.label, - span: field.span || 1, - multiline: !!field.multiline, - text: String(displayFieldValue(field) ?? ''), - tagClass: field.tag - ? getStatusTextClass(getTagType(field.prop, getFieldRawValue(field.prop))) - : undefined + return activeSections.value + .map((section) => ({ + title: section.title, + column: section.column || 3, + optional: !!section.optional, + fields: section.fields.map((field): DetailFieldView => { + if (field.images) { + const images = toDetailImageUrls(getFieldRawValue(field.prop)) + return { + prop: field.prop, + label: field.label, + span: field.span || 1, + multiline: false, + text: '', + hasValue: images.length > 0, + images + } + } + const text = String(displayFieldValue(field) ?? '') + return { + prop: field.prop, + label: field.label, + span: field.span || 1, + multiline: !!field.multiline, + text, + hasValue: text !== '' && text !== '-', + tagClass: field.tag + ? getStatusTextClass(getTagType(fieldTranslateKey(field.prop), getFieldRawValue(field.prop))) + : undefined + } + }) })) - })) + .filter((section) => !section.optional || section.fields.some((field) => field.hasValue)) + .map((section) => ({ title: section.title, column: section.column, fields: section.fields })) }) function normalizeDetailPayload(payload: Record) { @@ -221,7 +278,19 @@ function normalizeDetailPayload(payload: Record) { return { ...orderDetail, recheck_status: resolveOrderRecheckStatus(orderDetail), - waybill_codes: waybillCodes + waybill_codes: waybillCodes, + // B2B 专属字段在响应 data 顶层(与 detail 同级):b2b 作业明细 + 备货照片 images + 提货照片 pickup_images + b2b: payload.b2b ?? orderDetail.b2b ?? null, + images: Array.isArray(payload.images) + ? payload.images + : Array.isArray(orderDetail.images) + ? orderDetail.images + : [], + pickup_images: Array.isArray(payload.pickup_images) + ? payload.pickup_images + : Array.isArray(orderDetail.pickup_images) + ? orderDetail.pickup_images + : [] } } @@ -340,6 +409,20 @@ onBeforeUnmount(() => { overflow: auto; } +.field-images { + display: flex; + flex-wrap: wrap; + gap: 6px; +} + +.detail-image { + width: 56px; + height: 56px; + border-radius: 4px; + border: 1px solid #ebeef5; + cursor: zoom-in; +} + .empty-tip { height: 100%; display: flex; diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 328a4ad7..ff2038e5 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -47,6 +47,20 @@ export const COMMON_TRANSLATIONS: Record> = { 'Y': '是', 'N': '否' }, + /** B2B 作业明细(订单详情 data.b2b):是否加急 / 是否提货 / 备货状态 */ + is_urgent: { + 'Y': '加急', + 'N': '普通' + }, + is_picked_up: { + 'Y': '是', + 'N': '否' + }, + prep_status: { + 'none': '未开始', + 'padding': '备货中', + 'fin': '已完成' + }, status: { 'pedding': '待审核', 'created': '已创建', @@ -213,6 +227,20 @@ export const COMMON_TAG_TYPES: Record> = { 'Y': 'danger', 'N': 'info' }, + /** B2B 作业明细(订单详情 data.b2b)标签色 */ + is_urgent: { + 'Y': 'danger', + 'N': 'info' + }, + is_picked_up: { + 'Y': 'success', + 'N': 'info' + }, + prep_status: { + 'none': 'info', + 'padding': 'warning', + 'fin': 'success' + }, status: { 'pedding': 'warning', 'pending': 'warning', @@ -574,16 +602,6 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { disabledKey: 'hasNoSelection', action: 'openCancelB2bDialog' }, - /** B2B 备货开始(order.startB2bPrep):单订单作业,必须恰好勾选 1 行 */ - b2bStartPrep: { - key: 'b2bStartPrep', - label: '开始备货', - size: 'small', - category: 'action', - loadingKey: 'b2bActionLoading', - disabledKey: 'notSingleSelection', - action: 'handleB2bStartPrep' - }, /** B2B 备货完成(order.finishB2bPrep):必填备货备注 + 总箱数,完成时同步扣减库存 */ b2bFinishPrep: { key: 'b2bFinishPrep', @@ -1017,14 +1035,70 @@ export type OrderDetailFieldConfig = { time?: boolean waybill?: boolean multiline?: boolean + /** 图片字段:值按 URL 列表渲染(兼容 { url } 对象数组) */ + images?: boolean } export type OrderDetailSectionConfig = { title: string column?: number fields: OrderDetailFieldConfig[] + /** 分区内所有字段都无值时整体隐藏(用于仅部分订单才有的字段,如 B2B 作业明细/照片) */ + optional?: boolean } +/** 订单详情字段取值:支持 `b2b.prep_status` 这类嵌套路径 */ +export function getOrderDetailFieldValue( + row: Record | null | undefined, + prop: string +): unknown { + if (!row || typeof row !== 'object') return undefined + if (!prop.includes('.')) return row[prop] + let current: any = row + for (const key of prop.split('.')) { + if (current === null || current === undefined || typeof current !== 'object') return undefined + current = current[key] + } + return current +} + +/** + * B2B 专属详情分区(order.pendingOrder.detail / order.deliveryOrder.detail 的 data.b2b、data.images、data.pickup_images) + * 仅 is_b2b='Y' 的订单才有值;非 B2B 订单 b2b 为 null、images / pickup_images 为空数组,分区由 optional 自动隐藏。 + */ +const b2bOrderDetailSections: OrderDetailSectionConfig[] = [ + { + title: 'B2B作业', + column: 3, + optional: true, + fields: [ + { prop: 'b2b.prep_status', label: '备货状态', tag: true }, + { prop: 'b2b.is_urgent', label: '是否加急', tag: true }, + { prop: 'b2b.is_picked_up', label: '是否提货', tag: true }, + { prop: 'b2b.total_box_count', label: '总箱数' }, + { prop: 'b2b.pickup_plate_number', label: '提货车牌' }, + { prop: 'b2b.prep_operator_name', label: '备货人' }, + { prop: 'b2b.prep_duration_seconds', label: '备货时长(秒)' }, + { prop: 'b2b.prep_start_at', label: '备货开始时间', time: true }, + { prop: 'b2b.prep_at', label: '备货时间', time: true }, + { prop: 'b2b.picked_up_at', label: '提货时间', time: true }, + { prop: 'b2b.prep_remark', label: '备货备注', span: 3, multiline: true } + ] + }, + { + title: '备货照片', + column: 1, + optional: true, + fields: [{ prop: 'images', label: '备货照片', images: true }] + }, + { + title: '提货照片', + column: 1, + optional: true, + fields: [{ prop: 'pickup_images', label: '提货照片', images: true }] + } +] + /** 订单明细显示全部:对齐 order.pendingOrder.detail data.detail 字段 */ export const orderDetailFullSections: OrderDetailSectionConfig[] = [ { @@ -1095,6 +1169,7 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [ { prop: 'basket_number', label: '篮号' } ] }, + ...b2bOrderDetailSections, { title: '收货与物流', column: 3, @@ -1198,6 +1273,7 @@ export const orderDetailCompactSections: OrderDetailSectionConfig[] = [ { prop: 'lock_status', label: '锁定状态', tag: true } ] }, + ...b2bOrderDetailSections, { title: '收货与物流', column: 3, @@ -1845,6 +1921,9 @@ export const b2bPrepDurationScanField = scanBasicField({ defaultOperator: 'ge' }) +/** ScanBox:B2B 作业明细创建时间(wms_order_b2b.created_at,与订单 create_at 不同) */ +export const b2bCreatedAtRangeScanField = scanBasicField({ label: '作业创建时间', value: 'created_at', type: 'datetimerange' }) + /** B2B 页签共用的作业筛选项(追加到普通筛选项之后) */ const b2bExtraScanFields = [ { ...b2bUrgentScanField, group: SCAN_B2B_GROUP }, @@ -1857,7 +1936,8 @@ const b2bExtraScanFields = [ { ...b2bPickupPlateScanField, group: SCAN_B2B_GROUP }, { ...b2bPrepRemarkScanField, group: SCAN_B2B_GROUP }, { ...b2bTotalBoxCountScanField, group: SCAN_B2B_GROUP }, - { ...b2bPrepDurationScanField, group: SCAN_B2B_GROUP } + { ...b2bPrepDurationScanField, group: SCAN_B2B_GROUP }, + { ...b2bCreatedAtRangeScanField, group: SCAN_B2B_GROUP } ] // deliveryOrder相关配置 @@ -2390,6 +2470,12 @@ export const ORDER_LIST_FIELD_LABELS: Record = { prep_at: '备货时间', is_picked_up: '是否提货', picked_up_at: '提货时间', + created_at: '作业创建时间', + images: '备货照片', + pickup_images: '提货照片', + prep_status: '备货状态', + prep_operator_name: '备货人', + prep_start_at: '备货开始时间', } export function applyOrderListColumnLabels(columns: T[]): T[] { @@ -2467,6 +2553,12 @@ export function buildPendingB2bColumns() { { prop: 'prep_at', label: '备货时间', width: '165', formatter: orderTimeFormatter }, { prop: 'is_picked_up', label: '是否提货', width: '90', formatter: (row: any) => (String(row?.is_picked_up ?? '').trim().toUpperCase() === 'Y' ? '是' : '否') }, { prop: 'picked_up_at', label: '提货时间', width: '165', formatter: orderTimeFormatter }, + // order.pendingOrder2b.list 新增:作业明细创建时间 / 备货与提货照片 + { prop: 'created_at', label: '作业创建时间', width: '165', formatter: orderTimeFormatter }, + { prop: 'images', label: '备货照片', width: '110', imgs: (row: any) => toB2bImageUrls(row?.images) }, + { prop: 'pickup_images', label: '提货照片', width: '110', imgs: (row: any) => toB2bImageUrls(row?.pickup_images) }, + // 行内操作列(按状态动态:备货 / 确认提货 / 设置车牌) + { prop: 'actions', label: '操作', width: '220', minWidth: '220', fixed: 'right' }, ] return applyOrderListCopyActions([...base, ...extras]) } @@ -2479,6 +2571,67 @@ export function translateB2bPrepStatus(value: unknown): string { return '未开始' } +/** B2B 行内操作项(表格「操作」列按订单状态动态生成) */ +export type B2bRowAction = { + key: 'prep' | 'pickup' | 'plate' + label: string +} + +/** + * B2B 列表行内操作(操作列): + * - 备货:未提货且备货未完成(padding 显示「继续备货」,none 显示「开始备货」);分箱在备货窗口内完成 + * - 确认提货:备货已完成且未提货 + * - 设置车牌:提货前均可维护(提货后车牌随提货锁定) + * 已取消订单不展示任何操作。 + */ +export function buildB2bRowActions(row: Record | null | undefined): B2bRowAction[] { + if (!row) return [] + if (String(row?.status ?? '').trim().toLowerCase() === 'cancel') return [] + + const pickedUp = String(row?.is_picked_up ?? '').trim().toUpperCase() === 'Y' + const prepStatus = String(row?.prep_status ?? '').trim().toLowerCase() + const actions: B2bRowAction[] = [] + + if (!pickedUp && prepStatus !== 'fin') { + actions.push({ key: 'prep', label: prepStatus === 'padding' ? '继续备货' : '开始备货' }) + } + if (!pickedUp && prepStatus === 'fin') { + actions.push({ key: 'pickup', label: '确认提货' }) + } + if (!pickedUp) { + actions.push({ key: 'plate', label: '设置车牌' }) + } + return actions +} + +/** + * B2B 分箱快照:逐商品取货储位文案(order.getB2bPackingSnapshot 的 items[].pick_locations) + * 元素 { space_id, space_name, quantity },展示为「库位名×数量」 + */ +export function formatB2bItemPickLocations(item: Record | null | undefined): string { + const list = Array.isArray(item?.pick_locations) ? item.pick_locations : [] + const texts = list + .map((row: any) => { + const name = String(row?.space_name ?? row?.space_id ?? '').trim() + const qty = Number(row?.quantity ?? 0) + if (!name) return '' + return Number.isFinite(qty) && qty > 0 ? `${name}×${qty}` : name + }) + .filter((text: string) => !!text) + return texts.length ? texts.join(',') : '--' +} + +/** B2B 列表:照片字段(images / pickup_images)→ URL 列表,供 UpperTable 的 imgs 列渲染 */ +export function toB2bImageUrls(value: unknown): string[] { + if (!Array.isArray(value)) return [] + return value + .map((item) => + typeof item === 'string' ? item : String((item as Record | null)?.url ?? '') + ) + .map((url) => url.trim()) + .filter(Boolean) +} + /** * 配送 B2B 订单专属列(仅「配送B2B订单」页签使用)。 * order.deliveryOrder2b.list 在配送订单列基础上额外带出 wms_order_b2b 作业字段。 @@ -2498,6 +2651,12 @@ export function buildDeliveryB2bColumns() { { prop: 'prep_at', label: '备货时间', width: '165', formatter: orderTimeFormatter }, { prop: 'is_picked_up', label: '是否提货', width: '90', formatter: (row: any) => (String(row?.is_picked_up ?? '').trim().toUpperCase() === 'Y' ? '是' : '否') }, { prop: 'picked_up_at', label: '提货时间', width: '165', formatter: orderTimeFormatter }, + // order.deliveryOrder2b.list 新增:作业明细创建时间 / 备货与提货照片 + { prop: 'created_at', label: '作业创建时间', width: '165', formatter: orderTimeFormatter }, + { prop: 'images', label: '备货照片', width: '110', imgs: (row: any) => toB2bImageUrls(row?.images) }, + { prop: 'pickup_images', label: '提货照片', width: '110', imgs: (row: any) => toB2bImageUrls(row?.pickup_images) }, + // 行内操作列(按状态动态:备货 / 确认提货 / 设置车牌) + { prop: 'actions', label: '操作', width: '220', minWidth: '220', fixed: 'right' }, ] return applyOrderListCopyActions([...base, ...extras]) } @@ -2647,11 +2806,11 @@ export const pendingToolbarButtonKeys = [ export const pendingToolbarButtons = pickToolbarButtons(pendingToolbarButtonKeys) /** - * B2B 作业按钮(order.startB2bPrep / finishB2bPrep / cancelB2bPrep / pickupB2b / setB2bUrgent / cancelB2bUrgent) + * B2B 作业按钮(order.finishB2bPrep / cancelB2bPrep / pickupB2b / setB2bUrgent / cancelB2bUrgent) * 仅追加到「待处理B2B订单」「配送B2B订单」两个页签,普通订单页不展示。 + * 「开始备货 / 分箱 / 设置车牌」是单订单行内操作,放在表格「操作」列。 */ export const b2bToolbarButtonKeys = [ - 'b2bStartPrep', 'b2bFinishPrep', 'b2bCancelPrep', 'b2bPickup', diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index e839d979..954942ee 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -1,4 +1,4 @@ -