From 5aa29019b488913dc6336e79e0125b3c848604c1 Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Fri, 7 Aug 2026 17:33:21 +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 --- env.js | 4 +- .../order/order-review-comps/OrderList.vue | 10 ++-- .../order/order-review-comps/ReviewDetail.vue | 13 +++-- pages/work/order/order-review.vue | 52 +++++++++++++++++-- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/env.js b/env.js index c33f58a..b87b72a 100644 --- a/env.js +++ b/env.js @@ -1,4 +1,4 @@ -// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 -export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 +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/work/order/order-review-comps/OrderList.vue b/pages/work/order/order-review-comps/OrderList.vue index ca57b2e..a4225b0 100644 --- a/pages/work/order/order-review-comps/OrderList.vue +++ b/pages/work/order/order-review-comps/OrderList.vue @@ -7,7 +7,7 @@ - 蓝号:{{ item.basketNo || '--' }} + 篮号:{{ item.basketNo || '--' }} 数量:{{ item.planQty || 0 }} 已扫:{{ item.scannedQty || 0 }} @@ -61,7 +61,7 @@ :class="getReviewStatusText(item) === '已复核' ? 'record-value--reviewed' : 'record-value--unreviewed'" >{{ getReviewStatusText(item) }} [{{ item.waveIndex }}] @@ -69,7 +69,7 @@ class="record-value record-value--id" :class="{ 'record-value--id-reviewed': getReviewStatusText(item) === '已复核' }" >{{ listType === 'single' ? (item.waybillNo || '--') : (item.waveNo || '--') }} - {{ item.boxNo }}号篮 + {{ item.boxNo }}号篮 已打印 - 蓝号:{{ detailInfo.waveIndex || detailInfo.boxNo || '--' }} - + + 货主:{{ detailInfo.storeName }} @@ -83,7 +86,7 @@ - 蓝号 + 篮号 {{ item.boxNo || '--' }} @@ -1155,8 +1158,8 @@ import voice from '@/core/utils/voice'; color: #000000; flex-shrink: 0; width: 100rpx; - text-align: center; - padding: 0 6rpx; + text-align: left; + padding: 0; line-height: 1.8; } diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue index 1043e93..dcf1960 100644 --- a/pages/work/order/order-review.vue +++ b/pages/work/order/order-review.vue @@ -94,6 +94,7 @@ :displayList="displayOrderList" :listType="listType" :printMode="printMode" + :pickMode="pickMode" :activeOrderId="showDetailView ? (detailInfo.orderId || detailInfo.recordId || '') : ''" @orderClick="handleDrawerOrderClick" @printClick="handlePrintOrder" @@ -562,8 +563,10 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; return this.printMode; }, isDprefixedWave() { - // D前缀波次:单品单件订单,无需逐件扫描 + // 单品单件订单,无需逐件扫描 + // 优先根据 pick_mode=2 判断(scanOrder 接口返回),D前缀波次作为兼容兜底 if (this.listType !== 'single') return false; + if (Number(this.pickMode) === 2) return true; const list = Array.isArray(this.orderList) ? this.orderList : []; if (!list.length) return false; return list.some(item => String(item.waveNo || '').startsWith('D')); @@ -1136,11 +1139,27 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; }, 600); } }, - matchPrintStation(text) { - if (!text || !Array.isArray(this.printStationList) || !this.printStationList.length) { + async matchPrintStation(text) { + if (!text) { uni.showToast({ title: '暂无可用打印台', icon: 'none' }); return; } + // 打印台列表未加载时自动加载,保证广播扫描/列表视图下无需打开弹窗即可直接匹配绑定 + if (!Array.isArray(this.printStationList) || !this.printStationList.length) { + try { + uni.showLoading({ title: '加载打印台...' }); + await this.loadPrintStations(1, false); + } catch (error) { + console.warn('[OrderReview][matchPrintStation] 加载打印台失败:', error); + } finally { + uni.hideLoading(); + } + } + if (!Array.isArray(this.printStationList) || !this.printStationList.length) { + uni.showToast({ title: '暂无可用打印台', icon: 'none' }); + this.speakVoice('未绑定打印台'); + return; + } const kw = text.toLowerCase(); const matched = this.printStationList.find(station => String(station.name).toLowerCase() === kw @@ -1347,6 +1366,25 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; } return null; }, + /** + * D前缀波次:按快递面单号(waybillNo)在订单列表中定位所属订单 + * @param {string} waybillNo - 扫描到的快递面单号 + * @returns {Object|null} 匹配到的订单,未匹配返回 null + */ + findOrderByWaybillNo(waybillNo) { + if (!waybillNo || !Array.isArray(this.orderList)) return null; + const kw = String(waybillNo).trim().toLowerCase(); + if (!kw) return null; + for (const order of this.orderList) { + // 跳过已复核的订单 + if (order.isReviewed) continue; + const orderWaybill = String(order.waybillNo || order.waybillCode || '').trim().toLowerCase(); + if (orderWaybill === kw) { + return order; + } + } + return null; + }, handleSearch() { const text = this.normalizeKeyword(this.keyword); if (!text) return; @@ -1381,7 +1419,13 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; this.goPickGoodsDetail(matchedOrder); return; } - // 商品条码未匹配时,尝试用车号/运单号查询后端(支持扫拣货车进入下一个波次) + // 商品条码未命中时,按快递面单号(waybillNo)定位所属订单并进入复核详情 + const waybillOrder = this.findOrderByWaybillNo(text); + if (waybillOrder) { + this.goPickGoodsDetail(waybillOrder); + return; + } + // 仍未匹配时,尝试用车号/运单号查询后端(支持扫拣货车进入下一个波次) if (this.printStationId || this.printMode === 'noPrint') { this.requestScanOrder(text); } else {