修改订单拣货、复核发货、修改商品页面
This commit is contained in:
parent
2335ee8fd9
commit
c195ba9e83
@ -20,10 +20,15 @@
|
||||
<view class="reprint-btn" @click="$emit('reprint')">面单补打</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="detailInfo.storeName && detailInfo.listType !== 'group'" class="store-info-row">
|
||||
<text class="store-info-text">货主:{{ detailInfo.storeName }}</text>
|
||||
</view>
|
||||
<view v-if="detailInfo.listType === 'group'" class="wave-info-row">
|
||||
<text class="wave-info-text">波次订单:{{ detailInfo.totalOrders || '--' }}单</text>
|
||||
<text class="wave-info-divider"></text>
|
||||
<text class="wave-info-text">篮号:{{ detailInfo.waveIndex || detailInfo.boxNo || '--' }}</text>
|
||||
<text class="wave-info-divider"></text>
|
||||
<text class="wave-info-text">货主:{{ detailInfo.storeName || '--' }}</text>
|
||||
</view>
|
||||
<view class="top-module">
|
||||
<view class="top-card">
|
||||
@ -235,6 +240,7 @@ import voice from '@/core/utils/voice';
|
||||
status: 'pending',
|
||||
unreviewedCount: 0,
|
||||
storeRemark: '',
|
||||
storeName: '',
|
||||
waveIndex: '',
|
||||
orderIds: [],
|
||||
interceptStatus: '',
|
||||
@ -864,6 +870,20 @@ import voice from '@/core/utils/voice';
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.store-info-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin: 0 16rpx;
|
||||
padding: 6rpx 16rpx;
|
||||
background: #f5f7fa;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
|
||||
.store-info-text {
|
||||
font-size: 26rpx;
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.wave-info-divider {
|
||||
width: 1rpx;
|
||||
height: 18rpx;
|
||||
|
||||
@ -454,6 +454,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
status: 'pending',
|
||||
unreviewedCount: 0,
|
||||
storeRemark: '',
|
||||
storeName: '',
|
||||
waveIndex: '',
|
||||
orderIds: [],
|
||||
interceptStatus: '',
|
||||
@ -1399,7 +1400,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
recordId: '', orderId: 0, waveId: '', waveNo: '--',
|
||||
waybillNo: '', matchType: '', recheckStatus: '',
|
||||
pickerName: '--', cartNo: '--', status: 'pending',
|
||||
unreviewedCount: 0, storeRemark: '', waveIndex: '',
|
||||
unreviewedCount: 0, storeRemark: '', storeName: '', waveIndex: '',
|
||||
orderIds: [], interceptStatus: '',
|
||||
printStationId: '', printStationName: '', boxNo: '',
|
||||
isPrinted: false, listType: ''
|
||||
@ -1503,6 +1504,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
orderIds: (Array.isArray(wave?.order_ids) ? wave.order_ids : Array.isArray(wave?.orderIds) ? wave.orderIds : []).map(id => Number(id)),
|
||||
interceptStatus: String(wave?.intercept_status || wave?.interceptStatus || '').trim(),
|
||||
firstWaybillNo: String(wave?.first_waybill_no || wave?.firstWaybillNo || '').trim(),
|
||||
storeName: String(wave?.store_remark || '').trim(),
|
||||
suggestedPkg: wave?.suggested_package_material || wave?.suggestedPkg || null,
|
||||
list: subList
|
||||
};
|
||||
@ -1597,6 +1599,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
interceptStatus: String(item?.intercept_status || item?.interceptStatus || '').trim(),
|
||||
totalOrders: Number(item?.total_orders ?? item?.totalOrders ?? 0),
|
||||
storeRemark: String(item?.store_remark || item?.storeRemark || '').trim(),
|
||||
storeName: String(item?.store_remark || '').trim(),
|
||||
detail: item?.detail && typeof item.detail === 'object' ? item.detail : null,
|
||||
items: Array.isArray(item?.items) ? item.items
|
||||
: Array.isArray(item?.goods_items) ? item.goods_items
|
||||
@ -1645,6 +1648,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
interceptStatus: String(item?.interceptStatus || '').trim(),
|
||||
totalOrders: Number(item?.totalOrders ?? 0),
|
||||
storeRemark: item?.storeRemark || '',
|
||||
storeName: item?.storeName || '',
|
||||
detailItems: Array.isArray(item?.items) ? item.items : []
|
||||
}));
|
||||
this.paginationTotal = result?.total ?? flatList.length;
|
||||
@ -1697,6 +1701,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
interceptStatus: String(wave?.interceptStatus || '').trim(),
|
||||
itemsWeight: Number(wave?.itemsWeight ?? 0),
|
||||
firstWaybillNo: String(wave?.firstWaybillNo || '').trim(),
|
||||
storeName: String(wave?.storeName || '').trim(),
|
||||
suggestedPkg: wave?.suggestedPkg || null,
|
||||
status: wave?.status || 'pending',
|
||||
children: subList
|
||||
@ -1767,6 +1772,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
status: String(order?.status || 'pending'),
|
||||
unreviewedCount: Number(order?.unreviewed_count || order?.unreviewedCount || 0),
|
||||
storeRemark: String(result?.storeRemark || ''),
|
||||
storeName: String(order?.store_name || order?.storeName || result?.storeName || '').trim(),
|
||||
waveIndex: String(result?.waveIndex || order?.wave_index || order?.waveIndex || '').trim(),
|
||||
interceptStatus: '',
|
||||
boxNo: String(order?.box_no || order?.boxNo || ''),
|
||||
@ -1928,6 +1934,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
status: 'reviewed',
|
||||
unreviewedCount: 0,
|
||||
storeRemark: String(detail.remark || detail.store_remark || detail.storeRemark || ''),
|
||||
storeName: String(detail.store_name || detail.storeName || '').trim(),
|
||||
waveIndex: String(detail.wave_index || detail.waveIndex || '').trim(),
|
||||
interceptStatus: String(detail.intercept_status || detail.interceptStatus || ''),
|
||||
boxNo: String(detail.box_no || detail.boxNo || ''),
|
||||
@ -2015,6 +2022,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
|
||||
status: String(item.status || 'pending'),
|
||||
unreviewedCount: Number(item.unreviewedCount || 0),
|
||||
storeRemark: String(item?.storeRemark || this.orderList?.[0]?.storeRemark || '').trim(),
|
||||
storeName: String(item?.storeName || this.orderList?.[0]?.storeName || '').trim(),
|
||||
waveIndex: String(item?.waveIndex || '').trim(),
|
||||
totalOrders: Number(item?.totalOrders ?? item?.orderCount ?? 0),
|
||||
orderIds: Array.isArray(item?.orderIds) ? item.orderIds : [],
|
||||
|
||||
@ -57,6 +57,7 @@
|
||||
<text class="pick-name">{{ selectedPickItem.itemName || '--' }}</text>
|
||||
<text v-if="boundCartNo" class="pick-cart-tag">拣货车:{{ boundCartNo }}{{ boundCartName ? `(${boundCartName})` : '' }}</text>
|
||||
</view>
|
||||
<view class="pick-row"><text class="pick-label">货主:</text><text class="pick-value">{{ selectedPickItem.storeRemark || '--' }}</text></view>
|
||||
<view class="pick-row"><text class="pick-label">商品条码:</text><text class="pick-value">{{ selectedItemBarcodeLoading ? '条码加载中...' : (selectedItemBarcode || '--') }}</text></view>
|
||||
<view class="pick-row"><text class="pick-label">库位:</text><text class="pick-value pick-value--highlight">{{ selectedPickItem.spaceName || '--' }}</text></view>
|
||||
<view class="pick-row"><text class="pick-label">应拣总数:</text><text class="pick-value">{{ selectedPickItem.totalQty }}</text></view>
|
||||
@ -1495,6 +1496,7 @@ import voice from '@/core/utils/voice';
|
||||
itemName: item?.item_name || '--',
|
||||
stockId: Number(item?.stock_id || item?.item_snapshot?.stock_id || 0),
|
||||
totalQty: Number(item?.total_qty || 0),
|
||||
storeRemark: item?.store_remark || '',
|
||||
boxAllocations: (Array.isArray(item?.box_allocations) ? item.box_allocations : []).map(alloc => ({
|
||||
boxId: alloc?.box_id ?? '',
|
||||
boxNo: alloc?.box_no ?? '--',
|
||||
@ -2194,7 +2196,9 @@ import voice from '@/core/utils/voice';
|
||||
}
|
||||
|
||||
.pick-value {
|
||||
flex: 1;
|
||||
color: #303133;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.pick-value--highlight {
|
||||
|
||||
@ -1026,17 +1026,6 @@ export default {
|
||||
return;
|
||||
}
|
||||
|
||||
const netWeight = String(this.formData.net_weight || '').trim();
|
||||
if (!netWeight) {
|
||||
this.showToastMessage('请输入净重');
|
||||
return;
|
||||
}
|
||||
const normalizedNetWeight = Number(netWeight);
|
||||
if (!Number.isFinite(normalizedNetWeight) || normalizedNetWeight <= 0) {
|
||||
this.showToastMessage('净重需大于0');
|
||||
return;
|
||||
}
|
||||
|
||||
this.saving = true;
|
||||
try {
|
||||
const storeId = this.resolveStoreId(this.rawItem || {});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user