From 2e934c02b5699ac484dc1b46190b8bceb44604b1 Mon Sep 17 00:00:00 2001
From: zm2000 <18386612143@163.com>
Date: Sat, 20 Jun 2026 03:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
env.js | 3 +-
pages.json | 8 +-
.../order/order-review-comps/OrderList.vue | 426 ++++
.../order/order-review-comps/ReviewDetail.vue | 942 ++++++++
pages/work/order/order-review.vue | 1936 ++++++++++-----
.../work/order/scatter-pick-goods-detail.vue | 2153 -----------------
6 files changed, 2661 insertions(+), 2807 deletions(-)
create mode 100644 pages/work/order/order-review-comps/OrderList.vue
create mode 100644 pages/work/order/order-review-comps/ReviewDetail.vue
delete mode 100644 pages/work/order/scatter-pick-goods-detail.vue
diff --git a/env.js b/env.js
index 92e1006..c33f58a 100644
--- a/env.js
+++ b/env.js
@@ -1,3 +1,4 @@
-export const BASE_URL = 'http://192.168.11.56:6060' //后台根域名 https://demo.shopro.top
+// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
+export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
export const API_URL = `${BASE_URL}/system` //后台接口域名
export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
diff --git a/pages.json b/pages.json
index 980b0fa..472683d 100644
--- a/pages.json
+++ b/pages.json
@@ -184,13 +184,7 @@
"titleNView": false
}
},
- {
- "path" : "pages/work/order/scatter-pick-goods-detail",
- "style" :
- {
- "titleNView": false
- }
- },
+
{
"path" : "pages/work/order/order-review",
"style" :
diff --git a/pages/work/order/order-review-comps/OrderList.vue b/pages/work/order/order-review-comps/OrderList.vue
new file mode 100644
index 0000000..88e50e1
--- /dev/null
+++ b/pages/work/order/order-review-comps/OrderList.vue
@@ -0,0 +1,426 @@
+
+
+
+
+
+ 商品信息
+
+
+
+ 蓝号:{{ item.basketNo || '--' }}
+ 数量:{{ item.planQty || 0 }}
+ 已扫:{{ item.scannedQty || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.skuName || '--' }}
+
+
+
+
+
+
+
+
+ 暂无未复核订单
+
+
+
+
+
+
+ {{ getReviewStatusText(item) }}
+ [{{ item.waveIndex }}]
+ {{ listType === 'single' ? (item.waybillNo || '--') : (item.waveNo || '--') }}
+ {{ item.boxNo }}号篮
+
+ 已打印
+ 未打印
+ 拦截
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/work/order/order-review-comps/ReviewDetail.vue b/pages/work/order/order-review-comps/ReviewDetail.vue
new file mode 100644
index 0000000..72daa73
--- /dev/null
+++ b/pages/work/order/order-review-comps/ReviewDetail.vue
@@ -0,0 +1,942 @@
+
+
+
+
+
+ 暂无拣货商品
+
+
+
+
+
+
+
+ 运单:{{ detailInfo.waybillNo }}
+ 波次:{{ detailInfo.waveNo }}
+
+ 拣货人:{{ detailInfo.pickerName }}
+
+
+ 面单补打
+
+
+
+ 波次订单:{{ detailInfo.totalOrders || '--' }}单
+
+ 篮号:{{ detailInfo.waveIndex || detailInfo.boxNo || '--' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1/{{ getCurrentGoodsImageList().length }}
+
+
+
+
+
+ {{ currentGoods.skuName || '--' }}
+ {{ currentGoods.barcode || '--' }}
+
+
+ 数量
+ {{ currentGoods.scannedQty || 0 }} / {{ currentGoods.planQty || 0 }}
+
+
+ 蓝号
+ {{ detailInfo.waveIndex || (detailInfo.boxNo ? '' : '--') }}{{ detailInfo.boxNo }}号篮
+
+
+ 规格
+ {{ currentGoods.location || '--' }}
+
+
+
+
+
+
+
+ 商品列表
+
+
+
+
+
+
+
+ {{ item.lineNo || 0 }}
+ {{ item.planQty || 0 }}
+ {{ item.scannedQty || 0 }}
+
+
+
+
+
+
+
+ {{ item.lineNo || index + 1 }}
+ {{ item.skuName || '--' }}
+ {{ item.planQty || 0 }}
+ {{ item.scannedQty || 0 }}
+ {{ isGoodsMatched(item) ? '已匹配' : '待匹配' }}
+
+
+
+
+
+
+
+
+
+ 合计:{{ totalPlanQty }}
+ 已扫:{{ totalScannedQty }}/{{ totalPlanQty }}件
+ 确认复核
+
+
+ {{ viewMode === 'grid' ? '列表' : '宫格' }}
+
+
+
+
+
+
+
+
diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue
index 810da99..93358a3 100644
--- a/pages/work/order/order-review.vue
+++ b/pages/work/order/order-review.vue
@@ -1,132 +1,240 @@
-
+
+
+
+ 设置
+
+
+
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
- 清空
-
-
+
+
+
+
-
-
-
-
- {{ printStationId ? printStationName : '未绑定' }}
-
+
+ {{ printStationId ? printStationName : '未绑定' }}
-
-
- {{ printMode === 'printFirst' ? '先打印后复核' : '先复核后打印' }}
-
-
-
-
- 先打印后复核
-
-
- 先复核后打印
-
-
+
+ 数量 {{ scanQuantity }}
-
-
- 商品信息
-
-
-
- 蓝号:{{ item.basketNo || '--' }}
- 数量:{{ item.planQty || 0 }}
- 已扫:{{ item.scannedQty || 0 }}
-
-
-
-
-
-
-
-
-
-
-
- {{ item.skuName || '--' }}
-
-
-
-
-
-
+
+
+
+
- 暂无未复核订单
+ 请搜索或扫码选择订单进行复核
-
-
-
- {{ getReviewStatusText(item) }}
- [{{ item.waveIndex }}]
- {{ listType === 'single' ? (item.waybillNo || '--') : (item.waveNo || '--') }}
- {{ item.boxNo }}号篮
-
- 已打印
- 未打印
- 拦截
-
-
-
-
-
-
+
+
- 波次总单数:{{ totalOrders }}
-
- 剩余未复核:{{ totalUnreviewedCount }}
+ {{ totalUnreviewedCount }}/{{ totalOrders }}
-
- 刷新
+
+
+ 订单列表
+
+
+
+ 清空
+
+
+
+ 刷新
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-