diff --git a/src/core/request/apis.js b/src/core/request/apis.js
index cd2e2b3..9490bab 100644
--- a/src/core/request/apis.js
+++ b/src/core/request/apis.js
@@ -700,6 +700,56 @@ export default {
isSystemApi: true
}
},
+ pendingOrder2b: {
+ list: {
+ path: "order.pendingOrder2b.list",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ }
+ },
+ startB2bPrep: {
+ path: "order.startB2bPrep",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ getB2bPackingSnapshot: {
+ path: "order.getB2bPackingSnapshot",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ updateB2bPackingItems: {
+ path: "order.updateB2bPackingItems",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ cancelB2bPrep: {
+ path: "order.cancelB2bPrep",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ updateB2bOrderImages: {
+ path: "order.updateB2bOrderImages",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ finishB2bPrep: {
+ path: "order.finishB2bPrep",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ pickupB2b: {
+ path: "order.pickupB2b",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
recheckOrder: {
recheckOrderList: {
path: "order.recheckOrder.recheckOrderList",
@@ -764,6 +814,15 @@ export default {
isSystemApi: true
}
},
+ // B2B 配送订单列表:dispatch 分表 + 默认 dispatch_lane=m4,强制 is_b2b='Y'
+ deliveryOrder2b: {
+ list: {
+ path: "order.deliveryOrder2b.list",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ }
+ },
detail: {
path: "order.detail",
auth: true,
diff --git a/src/pages.json b/src/pages.json
index d25e6c6..b8a893d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -380,6 +380,27 @@
{
"titleNView": false
}
+ },
+ {
+ "path" : "pages/B2BOperation/stockPreparation",
+ "style" :
+ {
+ "titleNView": false
+ }
+ },
+ {
+ "path" : "pages/B2BOperation/pickupOperation",
+ "style" :
+ {
+ "titleNView": false
+ }
+ },
+ {
+ "path" : "pages/B2BOperation/stockPreparationDetail",
+ "style" :
+ {
+ "titleNView": false
+ }
}
],
diff --git a/src/pages/B2BOperation/pickupOperation.vue b/src/pages/B2BOperation/pickupOperation.vue
new file mode 100644
index 0000000..662509f
--- /dev/null
+++ b/src/pages/B2BOperation/pickupOperation.vue
@@ -0,0 +1,1009 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tab.label }}
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+ 暂无B2B提货订单
+
+
+
+
+
+
+
+ 货主:
+ {{ getStoreOwner(item) }}
+
+
+ 总箱数:
+ {{ item.total_box_count || 0 }}
+
+
+ 提货车牌号:
+ {{ item.pickup_plate_number || '--' }}
+
+
+ 提货时间:
+ {{ formatDateTime(item.picked_up_at) }}
+
+
+
+ 备货人:
+ {{ getPrepOperatorName(item) }}
+
+
+ 备货照片:
+
+
+
+
+
+ 提货照片:
+
+
+
+
+
+
+
+
+
+
+
+ {{ noMore ? '没有更多了' : '上拉加载更多' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+ 确认提货?提货后该订单将标记为已提货。
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/B2BOperation/stockPreparation.vue b/src/pages/B2BOperation/stockPreparation.vue
new file mode 100644
index 0000000..2ba66bd
--- /dev/null
+++ b/src/pages/B2BOperation/stockPreparation.vue
@@ -0,0 +1,587 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tab.label }}
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+ 暂无B2B待处理订单
+
+
+
+
+
+
+
+ 货主:
+ {{ getStoreOwner(item) }}
+
+
+ 总箱数:
+ {{ item.total_box_count || 0 }}
+
+
+ 备货人:
+ {{ item.prep_operator_name || '--' }}
+
+
+ 备注:
+ {{ item.prep_remark || '--' }}
+
+
+
+
+
+
+
+ {{ noMore ? '没有更多了' : '上拉加载更多' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/B2BOperation/stockPreparationDetail.vue b/src/pages/B2BOperation/stockPreparationDetail.vue
new file mode 100644
index 0000000..f95671a
--- /dev/null
+++ b/src/pages/B2BOperation/stockPreparationDetail.vue
@@ -0,0 +1,895 @@
+
+
+
+
+
+ 保存分箱
+
+
+
+
+
+
+
+ 加载中...
+
+
+
+
+ 发货单号:
+ {{ detail.delivery_order_code || '--' }}
+
+
+ 备货状态:
+ {{ prepStatusText }}
+
+
+ 总箱数:
+ {{ displayTotalBoxCount }}
+
+
+ 取货储位:
+ {{ detail.pick_location_count || 0 }} 个
+
+
+
+
+
+ 同一商品行 + 箱号不能重复;分箱数量合计需等于应拣数量(超量会被拦截)。
+
+
+
+
+ 应拣
+ {{ it.plan_qty || 0 }}
+ 已分箱
+ {{ getItemPackedQty(it) }}
+ {{ getDiffLabel(it) }}
+ {{ getItemDiffAbs(it) }}
+
+
+ 取货储位
+ {{ getPickLocations(it) }}
+
+
+
+
+ 删除
+
+
+ + 添加箱号
+
+
+
+
+
+
+ 暂无商品明细
+
+
+
+
+
+ 应拣:
+ {{ it.plan_qty || 0 }}
+ 已分箱:
+ {{ it.packed_quantity || 0 }}
+
+
+ 分箱:
+
+ {{ box.box_no || '--' }} × {{ box.quantity || 0 }}
+
+
+
+ 取货储位:
+ {{ getPickLocations(it) }}
+
+
+
+
+
+
+
+
+
+
+
+ 总箱数:
+ {{ displayTotalBoxCount }}
+
+
+
+
+
+
+
+
+
+ 取消备货
+ 完成备货
+
+
+
+
+
+
+