diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue
index 593ca7d..1b9624e 100644
--- a/src/pages/order/index.vue
+++ b/src/pages/order/index.vue
@@ -131,8 +131,6 @@
拣货人:{{ pickerName || '-' }}
货主:{{ storeRemark || '-' }}
- 波次:{{ selectedWaveNo || '-' }}
- 蓝号:{{ selectedWaveIndex || '-' }}
@@ -145,7 +143,9 @@
订单数:{{ currentOrderCount || '-' }}
- 篮号:{{ basketSummary || '-' }}
+ 波次:{{ selectedWaveNo || '-' }}
+ 篮号:{{ selectedWaveIndex || '-' }}
+ 篮号:{{ selectedWaveIndex || '-' }}
商品明细
已扫{{ scannedCount }}/{{ totalCount }}件
@@ -161,7 +161,7 @@
图片
条码
规格
- 打包要求
+ 复核要求
@@ -174,7 +174,7 @@
@contextmenu.prevent="handleNoBarcodeReviewDirect(order)"
@longtap = "handleProductRowClick(order)"
>
- {{ order.basketNo || '-' }}
+ {{ order.boxNo || '-' }}
{{ order.quantity }}
{{ order.scannedQty }}
{{ order.productName }}
@@ -186,7 +186,7 @@
{{ order.barcode }}
{{ order.spec }}
- {{ order.packingRequirements }}
+ {{ order.packingRequirements }}
@@ -952,10 +952,15 @@ export default {
return qty <= 0 || this.isRecheckExempt(order) || scanned >= qty
})
},
- // pick_mode=3 散单分播模式:商品明细显示“篮号”列(位置在总数列前)
+ // pick_mode=3(先拣后分)散单分播:商品明细总数列前新增“篮号”列(值取 item.boxNo)
showBasketColumn() {
return this.scanListType === 'single' && Number(this.currentPickMode) === 3
},
+ // 顶部商品明细标签行的“篮号”:pick_mode=2(单品单件)/3(先拣后分)时不显示
+ showTopBasketTag() {
+ const mode = Number(this.currentPickMode)
+ return mode !== 2 && mode !== 3
+ },
// 商品明细标签行左侧:团购模式显示当前波次订单数(order_count)
currentOrderCount() {
if (this.scanListType !== 'group' || !this.currentOrderHeader) {
@@ -1138,6 +1143,8 @@ export default {
needRecheck,
// 篮号(pick_mode=3 散单分播,明细行 box_no 等字段)
basketNo: this.getRowValue(row, ['box_no', 'boxNo', 'basket_no', 'basketNo', 'seed_no', 'seedNo']),
+ // 明细行“篮号”列取值(先拣后分 pick_mode=3:item.boxNo)
+ boxNo: this.getRowValue(row, ['boxNo', 'box_no']),
// 共享条码:库内存在相同条码的其它商品(has_shared_barcode,布尔)
hasSharedBarcode: !!this.getRowValue(row, ['has_shared_barcode', 'hasSharedBarcode']),
scannedQty,
@@ -2254,11 +2261,21 @@ export default {
this.warehouseId = scanWarehouseId
}
- // 汇总数据:波次总单数 = 该次查询所有波次的订单数(order_count)累加
- this.waveTotalOrders = list.reduce(
- (sum, row) => sum + (Number(this.getRowValue(row, ['order_count', 'orderCount'])) || 0),
- 0
- )
+ // 汇总数据:波次总单数
+ if (this.scanListType === 'single') {
+ // 散单:扁平订单列表,每行一个订单,总数 = 列表行数(含刷新后回填的已复核项)
+ this.waveTotalOrders = this.scanOrderList.length
+ } else {
+ // 团购:各波次的订单数(total_orders / order_count)累加
+ this.waveTotalOrders = this.scanOrderList.reduce(
+ (sum, row) =>
+ sum +
+ (Number(
+ this.getRowValue(row, ['total_orders', 'totalOrders', 'order_count', 'orderCount'])
+ ) || 0),
+ 0
+ )
+ }
// 剩余未复核数:前端统计并排除拦截/已拦截订单
this.waveUnreviewedCount = this.countUnreviewedExcludingIntercepted(list)
this.clearSelection()
@@ -4465,6 +4482,13 @@ export default {
}
this.selectedPendingOrderKey = ''
this.selectedOrderNo = this.getRowValue(wave, ['wave_no', 'waveNo']) || ''
+ // 篮号:团购 pick_mode=1 时优先取波次 box_no(data.list[x].box_no),缺失兜底 wave_index
+ const wavePickMode = Number(this.getRowValue(wave, ['pick_mode', 'pickMode']))
+ const waveBoxNo = this.getRowValue(wave, ['box_no', 'boxNo'])
+ this.selectedWaveIndex =
+ wavePickMode === 1 && waveBoxNo !== ''
+ ? waveBoxNo
+ : this.getRowValue(wave, ['wave_index', 'waveIndex'])
this.selectedItemsWeight = this.getRowValue(wave, ['items_weight', 'itemsWeight'])
const pkg = this.resolveSuggestedPackageMaterial(wave)
this.selectedPackageMaterial = pkg ? this.formatPackageMaterial(pkg) : null
@@ -5149,10 +5173,16 @@ export default {
.cell-pack-value {
color: var(--wms-danger-strong);
- background-color: #fdecea;
}
-/* 已扫行(绿底白字)也统一显示:打包要求值保持红字 + 浅红底 */
+/* 仅文字本身带浅红底(高亮),单元格不整列浅红 */
+.cell-pack-value-inner {
+ background-color: #fdecea;
+ border-radius: 0.04rem;
+ padding: 0.02rem 0.06rem;
+}
+
+/* 已扫行(绿底白字)也统一显示:复核要求值保持红字 */
.detail-row--scanned .cell-pack-value {
color: var(--wms-danger-strong);
}
@@ -6069,6 +6099,12 @@ export default {
background-color: #f6f8fc;
}
+/* 波次行选中态:.wave-group-header 的底色声明在 .table-row--selected 之后,
+ 会覆盖选中高亮,这里显式提高优先级,保证首个/被点击波次选中后仍显示高亮 */
+.wave-group-header.table-row--selected {
+ background-color: #a6c8ff;
+}
+
.wave-group-header:active {
background-color: #d6e8ff;
}
@@ -6386,6 +6422,11 @@ export default {
white-space: nowrap;
}
+.detail-tab-tag--orange {
+ color: var(--wms-warning);
+ background-color: #fff3e6;
+}
+
.detail-tab-summary {
flex-shrink: 0;
font-size: 0.18rem;