diff --git a/pages/work/order/order-review-comps/ReviewDetail.vue b/pages/work/order/order-review-comps/ReviewDetail.vue index 8f521c8..fbcb067 100644 --- a/pages/work/order/order-review-comps/ReviewDetail.vue +++ b/pages/work/order/order-review-comps/ReviewDetail.vue @@ -11,7 +11,8 @@ - 运单:{{ detailInfo.waybillNo }} + 波次:{{ detailInfo.waveNo || '--' }} + 运单:{{ detailInfo.waybillNo }} 波次:{{ detailInfo.waveNo }} 拣货人:{{ detailInfo.pickerName }} @@ -30,6 +31,12 @@ 货主:{{ detailInfo.storeName || '--' }} + + + 推荐包材: + {{ detailInfo.suggestedPkg.name }}({{ detailInfo.suggestedPkg.code }}) + {{ detailInfo.suggestedPkg.spec }} + @@ -128,12 +135,6 @@ - - - 推荐包材: - {{ detailInfo.suggestedPkg.name }}({{ detailInfo.suggestedPkg.code }}) - {{ detailInfo.suggestedPkg.spec }} - diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue index 4c6cbc2..5bcf40e 100644 --- a/pages/work/order/order-review.vue +++ b/pages/work/order/order-review.vue @@ -125,7 +125,7 @@ - + 称重 @@ -159,7 +159,7 @@ - + 包材绑定 @@ -2682,10 +2682,19 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; async autoPrintOrder(item) { if (!item || !this.printStationId) return; try { - const params = this.buildOrderPrintDataParams(item); - const response = await this.$http('order.print.getOrderPrintData', params); - const payload = this.extractOrderPrintPayload(response); - const waveGroups = this.normalizeOrderPrintGroups(payload); + let waveGroups; + if (this.listType === 'group') { + const warehouseId = this.resolveWarehouseId(); + const waveId = String(item?.waveId || item?.id || '').trim(); + const response = await this.$http('order.print.getWavePlatformPrintData', { warehouse_id: warehouseId, wave_ids: [waveId] }); + const payload = this.extractWavePlatformPrintPayload(response); + waveGroups = this.normalizeWaveGroups(payload); + } else { + const params = this.buildOrderPrintDataParams(item); + const response = await this.$http('order.print.getOrderPrintData', params); + const payload = this.extractOrderPrintPayload(response); + waveGroups = this.normalizeOrderPrintGroups(payload); + } if (!waveGroups.length) return; this.printRequestCode = this.buildPrintRequestCode(); @@ -2739,10 +2748,19 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; try { // 1. 获取打印数据 - const params = this.buildOrderPrintDataParams(item); - const response = await this.$http('order.print.getOrderPrintData', params); - const payload = this.extractOrderPrintPayload(response); - const waveGroups = this.normalizeOrderPrintGroups(payload); + let waveGroups; + if (this.listType === 'group') { + const warehouseId = this.resolveWarehouseId(); + const waveId = String(item?.waveId || item?.id || '').trim(); + const response = await this.$http('order.print.getWavePlatformPrintData', { warehouse_id: warehouseId, wave_ids: [waveId] }); + const payload = this.extractWavePlatformPrintPayload(response); + waveGroups = this.normalizeWaveGroups(payload); + } else { + const params = this.buildOrderPrintDataParams(item); + const response = await this.$http('order.print.getOrderPrintData', params); + const payload = this.extractOrderPrintPayload(response); + waveGroups = this.normalizeOrderPrintGroups(payload); + } if (!waveGroups.length) { throw new Error('未获取到可打印数据'); } @@ -3277,9 +3295,9 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; } .package-ref-value { - color: #2979ff; + color: #000000; font-weight: 500; - font-size: 32rpx; + font-size: 34rpx; } .package-ref-spec {