修改复核发货页面

This commit is contained in:
zm2000 2026-07-23 16:50:00 +08:00
parent a5715794a7
commit aae10716d3
2 changed files with 38 additions and 19 deletions

View File

@ -11,7 +11,8 @@
<!-- 订单信息行 --> <!-- 订单信息行 -->
<view class="order-info-row"> <view class="order-info-row">
<view class="order-info-left"> <view class="order-info-left">
<text class="order-info-text" v-if="detailInfo.waybillNo && detailInfo.waybillNo !== '--'">运单:{{ detailInfo.waybillNo }}</text> <text class="order-info-text" v-if="detailInfo.listType === 'group'">波次:{{ detailInfo.waveNo || '--' }}</text>
<text class="order-info-text" v-else-if="detailInfo.waybillNo && detailInfo.waybillNo !== '--'">运单:{{ detailInfo.waybillNo }}</text>
<text class="order-info-text" v-else>波次:{{ detailInfo.waveNo }}</text> <text class="order-info-text" v-else>波次:{{ detailInfo.waveNo }}</text>
<text class="order-info-divider"></text> <text class="order-info-divider"></text>
<text class="order-info-text">拣货人:{{ detailInfo.pickerName }}</text> <text class="order-info-text">拣货人:{{ detailInfo.pickerName }}</text>
@ -30,6 +31,12 @@
<text class="wave-info-divider"></text> <text class="wave-info-divider"></text>
<text class="wave-info-text">货主:{{ detailInfo.storeName || '--' }}</text> <text class="wave-info-text">货主:{{ detailInfo.storeName || '--' }}</text>
</view> </view>
<!-- 推荐包材提示 -->
<view v-if="detailInfo.listType === 'group' && detailInfo.suggestedPkg" class="package-info-hint">
<text class="package-info-label">推荐包材:</text>
<text class="package-info-value">{{ detailInfo.suggestedPkg.name }}({{ detailInfo.suggestedPkg.code }})</text>
<text class="package-info-spec">{{ detailInfo.suggestedPkg.spec }}</text>
</view>
<view class="top-module"> <view class="top-module">
<view class="top-card"> <view class="top-card">
<view class="top-main top-main--horizontal"> <view class="top-main top-main--horizontal">
@ -128,12 +135,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 推荐包材提示 -->
<view v-if="detailInfo.suggestedPkg" class="package-info-hint">
<text class="package-info-label">推荐包材:</text>
<text class="package-info-value">{{ detailInfo.suggestedPkg.name }}({{ detailInfo.suggestedPkg.code }})</text>
<text class="package-info-spec">{{ detailInfo.suggestedPkg.spec }}</text>
</view>
<view class="safe-area-bottom"></view> <view class="safe-area-bottom"></view>
</view> </view>
</view> </view>

View File

@ -125,7 +125,7 @@
</u-popup> </u-popup>
<!-- 称重弹窗 --> <!-- 称重弹窗 -->
<u-popup :show="showWeighPopup" mode="bottom" :closeable="true" border-radius="20" :z-index="10080" @close="showWeighPopup = false"> <u-popup :show="showWeighPopup" mode="bottom" :closeable="true" border-radius="20" :z-index="10080" @close="handleWeighCancel">
<view class="weigh-popup"> <view class="weigh-popup">
<view class="weigh-popup-title weigh-popup-title--sm">称重</view> <view class="weigh-popup-title weigh-popup-title--sm">称重</view>
<view class="weigh-popup-body"> <view class="weigh-popup-body">
@ -159,7 +159,7 @@
</u-popup> </u-popup>
<!-- 包材绑定弹窗 --> <!-- 包材绑定弹窗 -->
<u-popup :show="showPackageBindingPopup" mode="bottom" :closeable="true" border-radius="20" :z-index="10080" @close="showPackageBindingPopup = false"> <u-popup :show="showPackageBindingPopup" mode="bottom" :closeable="true" border-radius="20" :z-index="10080" @close="handlePackageBindingSkip">
<view class="package-popup"> <view class="package-popup">
<view class="package-popup-title">包材绑定</view> <view class="package-popup-title">包材绑定</view>
<view class="package-popup-body"> <view class="package-popup-body">
@ -2682,10 +2682,19 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
async autoPrintOrder(item) { async autoPrintOrder(item) {
if (!item || !this.printStationId) return; if (!item || !this.printStationId) return;
try { try {
const params = this.buildOrderPrintDataParams(item); let waveGroups;
const response = await this.$http('order.print.getOrderPrintData', params); if (this.listType === 'group') {
const payload = this.extractOrderPrintPayload(response); const warehouseId = this.resolveWarehouseId();
const waveGroups = this.normalizeOrderPrintGroups(payload); 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; if (!waveGroups.length) return;
this.printRequestCode = this.buildPrintRequestCode(); this.printRequestCode = this.buildPrintRequestCode();
@ -2739,10 +2748,19 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
try { try {
// 1. 获取打印数据 // 1. 获取打印数据
const params = this.buildOrderPrintDataParams(item); let waveGroups;
const response = await this.$http('order.print.getOrderPrintData', params); if (this.listType === 'group') {
const payload = this.extractOrderPrintPayload(response); const warehouseId = this.resolveWarehouseId();
const waveGroups = this.normalizeOrderPrintGroups(payload); 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) { if (!waveGroups.length) {
throw new Error('未获取到可打印数据'); throw new Error('未获取到可打印数据');
} }
@ -3277,9 +3295,9 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
} }
.package-ref-value { .package-ref-value {
color: #2979ff; color: #000000;
font-weight: 500; font-weight: 500;
font-size: 32rpx; font-size: 34rpx;
} }
.package-ref-spec { .package-ref-spec {