From bdb44a385b66061db94cd1516460649393d0ab61 Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Sat, 18 Jul 2026 17:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=8D=E6=A0=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/request/apis.js | 6 ++ pages/work/order/orderReviewList.vue | 134 +++++++++++++-------------- pages/work/product/query.vue | 23 +++++ 3 files changed, 95 insertions(+), 68 deletions(-) diff --git a/core/request/apis.js b/core/request/apis.js index a4ff5ad..600e3a2 100644 --- a/core/request/apis.js +++ b/core/request/apis.js @@ -416,6 +416,12 @@ export default { method: "POST", isSystemApi: true }, + queryRecheckOrderSingleList: { + path: "order.recheckOrder.queryRecheckOrderSingleList", + auth: true, + method: "POST", + isSystemApi: true + }, scanTask: { path: "order.recheckOrder.scanTask", auth: true, diff --git a/pages/work/order/orderReviewList.vue b/pages/work/order/orderReviewList.vue index e687dbe..439cbaa 100644 --- a/pages/work/order/orderReviewList.vue +++ b/pages/work/order/orderReviewList.vue @@ -88,49 +88,14 @@ v-for="item in listData" :key="item.order_id" class="record-item" - :class="{ 'record-item--reviewed': item.recheck_status === 'fin' }" > - - - - 订单号: - {{ item.delivery_order_code || '--' }} - - - {{ item.logistics_name || '--' }} - [{{ item.shop_nick }}] - - - - 商品数: - {{ item.items_count || 0 }} - - - 数量: - {{ item.items_total || 0 }} - - - - - {{ item.recheck_status === 'fin' ? '已复核' : '待复核' }} - - - - {{ item.create_at || item.pick_time || '--' }} - - - 开始复核 - - - + + {{ item.delivery_order_code || '--' }} + ({{ getPickStatusText(item.pick_status) }}) + @@ -287,35 +252,32 @@ export default { async fetchList() { uni.showLoading({ title: '加载中...' }); try { - const listType = this.currentMode === 'group' ? 'group' : 'single'; const where = {}; - if (this.keyword) { - where.keyword = this.keyword; - } - // 待复核/已复核筛选 if (this.currentMode === 'scatter') { - if (this.currentSubTab === 0) { - where.recheck_status = 'pending'; - } else { - where.recheck_status = 'fin'; - } + // 散单模式where传空 } else { + if (this.keyword) { + where.keyword = this.keyword; + } if (this.currentSubTab === 0) { where.review_assignment_status = ['unreviewed', 'partially_reviewed']; } else { where.review_assignment_status = 'reviewed'; } } - const params = { - list_type: listType, - where, - pagination: { - page: this.currentPage, - pageSize: this.pageSize - } + const pagination = { + page: this.currentPage, + pageSize: this.pageSize }; - console.log('[orderReviewList] fetchList params:', JSON.stringify(params)); - const response = await this.$http('order.recheckOrder.recheckOrderList', params); + const requestParams = this.currentMode === 'scatter' + ? { where: {}, pagination } + : { where, pagination, list_type: 'group' }; + console.log('[orderReviewList] fetchList params:', JSON.stringify(requestParams)); + // 散单模式使用散单复核接口,团购模式使用原有接口 + const apiName = this.currentMode === 'scatter' + ? 'order.recheckOrder.queryRecheckOrderSingleList' + : 'order.recheckOrder.recheckOrderList'; + const response = await this.$http(apiName, requestParams); const data = response?.data || response || {}; this.listData = Array.isArray(data.list) ? data.list : []; const pag = data.pagination || {}; @@ -332,6 +294,15 @@ export default { this.currentPage = page; this.fetchList(); }, + getPickStatusText(status) { + const map = { + 'printed': '已打印', + 'unprinted': '未打印', + 'partially_printed': '部分打印', + 'fin': '未打印' + }; + return map[status] || status || '未打印'; + }, reviewStatusText(status) { const map = { 'unreviewed': '未复核', @@ -522,8 +493,14 @@ export default { /* ===== 子标签切换条 ===== */ .sub-tabs { - padding: 16rpx 24rpx 0; + padding: 16rpx 0 16rpx; flex-shrink: 0; + border-bottom: 2rpx solid #e4e7ed; + margin-bottom: 0; +} + +.sub-tabs .sub-switch-bar { + margin: 0 24rpx; } .sub-switch-bar { @@ -562,7 +539,7 @@ export default { min-height: 0; overflow-y: auto; -webkit-overflow-scrolling: touch; - padding: 16rpx 24rpx; + padding: 16rpx 0; box-sizing: border-box; } @@ -583,19 +560,40 @@ export default { .record-list { display: flex; flex-direction: column; - gap: 16rpx; } .record-item { + padding: 20rpx 0; background: #ffffff; - border-radius: 12rpx; - padding: 24rpx; - border: 1rpx solid #ebeef5; +} + +.record-item:nth-child(even) { + background: #f5f7fa; } .record-item--reviewed { background: #f9f9f9; - border-color: #e0e0e0; +} + +.record-simple-text { + font-size: 30rpx; + color: #000000; + font-weight: 500; + padding: 0 24rpx; +} + +.record-simple-status { + font-size: 26rpx; + font-weight: 400; + color: #000000; +} + +.record-simple-status--pending { + color: #000000; +} + +.record-simple-status--done { + color: #000000; } .record-main { diff --git a/pages/work/product/query.vue b/pages/work/product/query.vue index 49ce72e..21dbb44 100644 --- a/pages/work/product/query.vue +++ b/pages/work/product/query.vue @@ -1663,6 +1663,29 @@ const detailList = listOk ? this.extractListFromResponse(listRes) : []; let mergedList = this.mergeProductResultLists(nextList, warehouseList, detailList); + // 优先使用 stock.warehouse.search 的库存数据(storage 数组),覆盖其他来源的库存数据 + // 注意:必须用 id 精确匹配,不能用条码等共享字段,否则多个商品共用同一条码时会互相覆盖 + if (searchOk && Array.isArray(nextList) && nextList.length) { + const searchStorageById = new Map(); + nextList.forEach(item => { + if (item && typeof item === 'object' && Array.isArray(item.storage)) { + const id = this.normalizePositiveId(item.id); + if (id) { + searchStorageById.set(id, item.storage); + } + } + }); + if (searchStorageById.size) { + mergedList = mergedList.map(item => { + const id = this.normalizePositiveId(item.id || item.stock_id); + if (id && searchStorageById.has(id)) { + return { ...item, storage: searchStorageById.get(id) }; + } + return item; + }); + } + } + // 从分拣缺货补货进入时,根据 stock_id 精确匹配 if (this.routeStockId) { const targetStockId = Number(this.routeStockId);