From f174309d68ef3e171a42f51b368312cf91663f8e Mon Sep 17 00:00:00 2001
From: zm2000 <18386612143@163.com>
Date: Wed, 26 Aug 2026 17:55:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=A4=8D?=
=?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 7 +
src/api/order.ts | 31 +
src/pages/order/index.vue | 1710 ++++++++++++++-----------------------
3 files changed, 667 insertions(+), 1081 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 52dd89d..60a6604 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,4 +14,11 @@ export default {
diff --git a/src/api/order.ts b/src/api/order.ts
index 11505f3..1a8d4ed 100644
--- a/src/api/order.ts
+++ b/src/api/order.ts
@@ -69,3 +69,34 @@ export function fetchOrderDetail(id: string | number, options?: RequestOptions)
id,
}, options)
}
+
+/**
+ * 订单复核-扫码搜索(order.recheckOrder.scanOrder)
+ * 支持运单号 / 波次号 / 车号三种匹配模式:
+ * - 运单号/波次号命中(散单)返回扁平订单列表 list_type='single'
+ * - 车号命中(团单)返回嵌套波次结构 list_type='group'
+ * - 运单号命中但订单无波次信息时,退回单订单详情模式(list 每项含 detail/items/expresses/logs)
+ * 所有 list[] 每项均附带 items_weight 与 suggested_package_material
+ */
+export function scanReviewOrder(
+ params: {
+ keyword?: string
+ waybill_no?: string
+ waybillCode?: string
+ waybill_code?: string
+ wave_no?: string
+ waveNo?: string
+ cart_code?: string
+ cartCode?: string
+ } = {},
+ options?: RequestOptions
+) {
+ return request(
+ 'order.recheckOrder.scanOrder',
+ {
+ ...workerPayload,
+ ...params,
+ },
+ options
+ )
+}
diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue
index a284ce0..c463d33 100644
--- a/src/pages/order/index.vue
+++ b/src/pages/order/index.vue
@@ -3,202 +3,182 @@
-
-
-
-
-
-
- 待处理:{{ pendingCount }};当前波次:{{ currentWaveCount }}
+
+
-
-
-
-
-
-
-
-
- {{ (orderPagination.page - 1) * orderPagination.pageSize + index + 1 }}
- {{ item.pendingOrderNo }}
+
+
+
+
+
+
+
+
+ {{ getScanOrderNo(item) }}
+ {{ formatWeight(item.items_weight) }}
+
-
-
-
- 暂无匹配数据
-
-
+ 暂无匹配订单
-
-
-
-
-
-
- {{ index + 1 }}
- {{ item.orderNo }}
- {{ item.waveNo }}
+
+
+
+
+
+ {{ getWaveReviewStatus(wave) }}
+ {{ wave.wave_no || wave.wave_id || '-' }}
+ {{ getWavePrintStatus(wave) }}
+
-
-
-
- 暂无匹配数据
-
-
-
- 默认打印机
-
+
+ 暂无匹配波次
+
-
- 预出单
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
+
+ 请输入关键词查询
-
-
-
-
- {{ cameraLoading ? '摄像头启动中...' : cameraError || '暂无摄像头画面' }}
-
-
-
-
-
-
- {{ Math.round(cameraZoom * 100) }}%
-
+
+
+
+
+
+
+
+
+
+
+ {{ selectedPrinter || '选择打印台' }}
+
+
-
+
+
+
+ {{ selectedReviewProcess || '复核流程' }}
+
+
+
+
+
+
+
+ {{ selectedWeigh || '是否称重' }}
+
+
+
+
+
+ 拣货人:{{ pickerName || '-' }}
+ 货主:{{ storeRemark || '-' }}
+
+
+
+
+
+ 商品明细
+ {{ scannedCount }}/{{ totalCount }}件
-
-
+
+
-
-
-
- {{ order.blueNo }}
- {{ order.quantity }}
- {{ order.scanMark }}
- {{ order.barcode }}
- {{ order.productName }}
- {{ order.color }}
- {{ order.spec }}
+
+
+
+ {{ order.scannedQty }}
+ {{ order.quantity }}
+ {{ order.productName }}
+
+
+ -
+
+ {{ order.barcode }}
+ {{ order.spec }}
+ {{ order.packingRequirements }}
+
-
-
- 暂无匹配数据
-
+
+ 暂无匹配数据
+
+
+
+
+ 在左侧列表选择订单后,在此查看商品明细
@@ -208,7 +188,7 @@
@@ -946,155 +604,6 @@ export default {
min-width: 0;
}
-.camera-preview-panel {
- width: 50%;
- margin-bottom: 14rpx;
- margin-left: auto;
- margin-right: auto;
- border: 1rpx solid #e6ebf5;
- border-radius: 8rpx;
- background-color: #fff;
- padding: 12rpx;
- box-sizing: border-box;
-}
-
-.camera-preview-frame {
- position: relative;
- width: 100%;
- min-height: 120rpx;
- aspect-ratio: 16 / 9;
- border-radius: 8rpx;
- overflow: hidden;
- background-color: #000;
-}
-
-.camera-preview-video {
- width: 100%;
- height: 100%;
- display: block;
- object-fit: contain;
- object-position: center;
- background-color: transparent;
-}
-
-.camera-preview-host {
- width: 100%;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.camera-controls {
- margin-top: 12rpx;
- display: flex;
- align-items: center;
- gap: 10rpx;
-}
-
-.camera-controls--inside {
- position: absolute;
- left: 8rpx;
- right: 8rpx;
- bottom: 8rpx;
- z-index: 3;
- margin-top: 0;
- padding: 8rpx;
- border-radius: 8rpx;
-}
-
-.camera-controls--inside .camera-zoom-text {
- color: #fff;
-}
-
-.camera-control-btn {
- min-width: 116rpx;
- height: 64rpx;
- line-height: 64rpx;
- font-size: 28rpx;
- margin: 0;
- padding: 0 16rpx;
- border: none;
- border-radius: 0;
- background-color: transparent;
- color: #ffffff;
-}
-
-.camera-control-btn::after {
- border: none;
-}
-
-.camera-controls .camera-control-btn:first-child {
- min-width: 64rpx;
- width: 64rpx;
- padding: 0;
-}
-
-.camera-control-icon {
- font-size: 28rpx;
- line-height: 1;
- color: #ffffff;
-}
-
-.camera-control-btn--small {
- min-width: 64rpx;
- width: 64rpx;
- padding: 0;
-}
-
-.camera-pause-progress {
- flex: 1;
- margin: 0;
-}
-
-.camera-zoom-controls {
- display: flex;
- align-items: center;
- gap: 8rpx;
-}
-
-.camera-zoom-text {
- width: 88rpx;
- text-align: center;
- font-size: 28rpx;
- color: #333;
-}
-
-.camera-preview-placeholder {
- position: absolute;
- inset: 0;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 0 20rpx;
- box-sizing: border-box;
- background-color: #f9fbff;
-}
-
-.camera-preview-text {
- font-size: 28rpx;
- color: #9098a4;
- line-height: 1.5;
- text-align: center;
-}
-
-.left-summary {
- margin-bottom: 12rpx;
-}
-
-.left-summary-text {
- font-size: 28rpx;
- color: #333;
- line-height: 1.4;
-}
-
-.left-header-actions {
- display: flex;
- align-items: center;
- flex-wrap: nowrap;
- gap: 12rpx;
-}
-
.left-reviewed-list {
margin-top: 14rpx;
max-height: 1100rpx;
@@ -1111,99 +620,6 @@ export default {
min-height: 0;
}
-.left-reviewed-list--reviewed {
- margin-top: 0;
- width: 100%;
- flex: 1;
- max-height: none;
- min-height: 0;
-}
-
-.settings-panel {
- margin-top: 14rpx;
- border: 1rpx solid #e6ebf5;
- border-radius: 8rpx;
- padding: 18rpx;
- box-sizing: border-box;
-}
-
-.settings-row {
- display: flex;
- align-items: center;
- gap: 16rpx;
- margin-bottom: 16rpx;
-}
-
-.settings-row:last-of-type {
- margin-bottom: 24rpx;
-}
-
-.settings-label {
- width: 200rpx;
- font-size: 28rpx;
- color: #333;
-}
-
-.settings-input {
- flex: 1;
- height: 64rpx;
- border: 1rpx solid #e5e5e5;
- border-radius: 8rpx;
- padding: 0 16rpx;
- font-size: 28rpx;
- background-color: #fff;
- box-sizing: border-box;
-}
-
-.settings-switch-wrap {
- display: flex;
- align-items: center;
- gap: 12rpx;
-}
-
-.settings-save-btn {
- width: 100%;
- height: 68rpx;
- line-height: 68rpx;
- font-size: 28rpx;
-}
-
-.header-action-btn {
- flex: 1;
- min-width: 0;
- display: flex;
- align-items: center;
- justify-content: center;
- box-sizing: border-box;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #d9dde8;
- background-color: #fff;
- padding: 0 8rpx;
- white-space: nowrap;
-}
-
-.header-action-btn--active {
- background-color: #34c759;
- border-color: #34c759;
-}
-
-.header-action-text {
- width: 100%;
- text-align: center;
- font-size: 28rpx;
- line-height: 1;
- color: #333;
-}
-
-.header-action-btn--active .header-action-text {
- color: #fff;
-}
-
-.header-action-btn--reviewed {
- letter-spacing: 0;
-}
-
.search-bar {
display: flex;
align-items: center;
@@ -1221,13 +637,6 @@ export default {
background-color: #fff;
}
-.search-btn {
- width: 160rpx;
- height: 72rpx;
- line-height: 72rpx;
- font-size: 28rpx;
-}
-
.table-scroll {
width: 100%;
}
@@ -1236,44 +645,10 @@ export default {
max-height: none;
}
-.pagination-bar {
- margin-top: 16rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-
-.pagination-bar--left {
- width: 100%;
-}
-
-.pagination-info {
- font-size: 28rpx;
- color: #666;
-}
-
-.pagination-actions {
- display: flex;
- align-items: center;
- gap: 12rpx;
-}
-
-.pagination-btn {
- width: 140rpx;
- height: 56rpx;
- line-height: 56rpx;
- font-size: 28rpx;
- margin: 0;
-}
-
.table-wrap {
min-width: 980rpx;
}
-.table-wrap--reviewed {
- min-width: 620rpx;
-}
-
.table-wrap--current-wave {
min-width: 620rpx;
}
@@ -1289,17 +664,6 @@ export default {
flex-shrink: 0;
}
-.table-wrap--reviewed-sticky {
- margin-top: 14rpx;
- height: 60vh;
- display: flex;
- flex-direction: column;
-}
-
-.table-wrap--reviewed-sticky .table-header {
- flex-shrink: 0;
-}
-
.table-wrap--detail-sticky {
height: 520rpx;
display: flex;
@@ -1323,10 +687,6 @@ export default {
height: 60vh;
}
-.empty-panel--right {
- height: 520rpx;
-}
-
.empty-panel--right-inline {
flex: 1;
min-height: 0;
@@ -1414,18 +774,6 @@ export default {
text-overflow: ellipsis;
}
-.cell-blue-no {
- width: 110rpx;
-}
-
-.cell-qty {
- width: 90rpx;
-}
-
-.cell-scan {
- width: 110rpx;
-}
-
.cell-barcode {
width: 200rpx;
}
@@ -1435,32 +783,236 @@ export default {
min-width: 180rpx;
}
-.cell-color {
- width: 110rpx;
+.cell-scanned {
+ width: 100rpx;
+}
+
+.cell-total {
+ width: 100rpx;
}
.cell-spec {
width: 240rpx;
}
+.cell-image {
+ width: 100rpx;
+}
+
+.item-image {
+ width: 72rpx;
+ height: 72rpx;
+ border-radius: 6rpx;
+ background-color: #f2f4f8;
+}
+
+.cell-image-empty {
+ color: #999;
+}
+
+.cell-pack {
+ width: 240rpx;
+}
+
.cell-index {
width: 120rpx;
}
-.cell-order-no {
- flex: 1;
- min-width: 280rpx;
-}
-
-.cell-wave-no {
- width: 180rpx;
-}
-
.cell-pending-order {
flex: 1;
min-width: 0;
}
+.cell-weight {
+ width: 130rpx;
+}
+
+.cell-review-status {
+ width: 110rpx;
+}
+
+.cell-review-status--unreviewed {
+ color: #ff7d00;
+}
+
+.cell-wave-no {
+ flex: 1;
+ min-width: 0;
+ padding-left: 4rpx;
+}
+
+.cell-print-status {
+ width: 160rpx;
+ text-align: right;
+ padding-right: 24rpx;
+}
+
+.cell-print-status--unprinted {
+ color: #34c759;
+}
+
+.wave-group-header {
+ cursor: pointer;
+ background-color: #f6f8fc;
+}
+
+.wave-group-header:active {
+ background-color: #d6e8ff;
+}
+
+.review-toolbar {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 12rpx;
+ max-width: 100%;
+ margin-bottom: 12rpx;
+ padding: 12rpx 16rpx;
+ background-color: #fff;
+ overflow: hidden;
+}
+
+.tool-btn {
+ height: 56rpx;
+ line-height: 56rpx;
+ padding: 0 20rpx;
+ margin: 0;
+ font-size: 26rpx;
+ border: 1rpx solid #d9dde8;
+ border-radius: 8rpx;
+ background-color: #fff;
+ color: #333;
+}
+
+.tool-btn::after {
+ border: none;
+}
+
+.tool-btn--confirm {
+ background-color: #34c759;
+ border-color: #34c759;
+ color: #fff;
+}
+
+.tool-btn--blue-outline {
+ color: #2f7dff;
+ border-color: #2f7dff;
+ background-color: #eaf2ff;
+}
+
+.tool-btn--orange {
+ background-color: #ff7d00;
+ border-color: #ff7d00;
+ color: #fff;
+}
+
+.tool-btn--gray {
+ background-color: #909399;
+ border-color: #909399;
+ color: #fff;
+}
+
+.tool-select {
+ display: flex;
+ align-items: center;
+ gap: 6rpx;
+ min-width: 140rpx;
+ max-width: 100%;
+ height: 48rpx;
+ padding: 0 12rpx;
+ font-size: 24rpx;
+ color: #333;
+ border: 1rpx solid #d9dde8;
+ border-radius: 6rpx;
+ background-color: #fff;
+ box-sizing: border-box;
+ overflow: hidden;
+}
+
+.tool-select--wide {
+ width: 240rpx;
+ min-width: 240rpx;
+}
+
+.tool-select--printer {
+ min-width: 260rpx;
+ justify-content: space-between;
+}
+
+.tool-select--open {
+ border-color: #2f7dff;
+}
+
+.tool-select-text {
+ display: flex;
+ align-items: center;
+ flex: 1;
+ min-width: 0;
+ font-size: 24rpx;
+ color: #333;
+ line-height: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.tool-select-arrow {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+ width: 40rpx;
+ height: 40rpx;
+}
+
+.tool-select-arrow-icon {
+ display: block;
+ width: 36rpx;
+ height: 36rpx;
+ transition: transform 0.2s ease;
+}
+
+.tool-select--open .tool-select-arrow-icon {
+ transform: rotate(180deg);
+}
+
+.tool-info-text {
+ font-size: 26rpx;
+ color: #666;
+}
+
+.detail-tab {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 12rpx;
+ padding: 8rpx 16rpx;
+ border-left: 6rpx solid #2f7dff;
+ border-radius: 6rpx;
+ background-color: #f6f8fc;
+}
+
+.detail-tab-text {
+ font-size: 28rpx;
+ font-weight: 600;
+ color: #333;
+}
+
+.detail-tab-summary {
+ font-size: 26rpx;
+ color: #555;
+}
+
+.detail-empty-tip {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 260rpx;
+ color: #999;
+ font-size: 26rpx;
+ background-color: #fafcff;
+}
+
.empty {
text-align: center;
color: #999;
@@ -1496,9 +1048,5 @@ export default {
.table-wrap--detail-sticky {
height: 460rpx;
}
-
- .empty-panel--right {
- height: 460rpx;
- }
}