feat: 变更物流查看方式

This commit is contained in:
2026-08-06 17:49:37 +08:00
parent 811f87d385
commit 01e6925ede
2 changed files with 327 additions and 101 deletions
+89 -33
View File
@@ -26,9 +26,14 @@
<view class="shipment-popup__item-sku">{{ item.skuText || '-' }}</view>
<view class="shipment-popup__item-footer flex-center ju-between">
<view class="shipment-popup__item-count">
<text v-if="props.mode === 'delay' && Number(item.alreadyDelayed) > 0" class="shipment-popup__item-delayed">
已延迟 x{{ item.alreadyDelayed }}
</text>
<view class="shipment-popup__item-tags flex-wrap">
<text v-if="props.mode === 'delay' && Number(item.alreadyDelayed) > 0" class="shipment-popup__item-delayed">
已延迟 x{{ item.alreadyDelayed }}
</text>
<text v-if="props.mode === 'delay' && Number(item.shippedOrReceived) > 0" class="shipment-popup__item-shipped">
已出单 x{{ item.shippedOrReceived }}
</text>
</view>
<text class="shipment-popup__item-remain">最多可选 x{{ item.maxCount }}</text>
</view>
<su-number-box
@@ -284,36 +289,48 @@ const buildAlreadyDelayedCountForSpu = (spuItem = {}, parentSpu = {}, delayRecor
if (targetSpuName && recordSpuName) return String(targetSpuName).trim() === String(recordSpuName).trim();
return false;
};
const records = (Array.isArray(delayRecordsInput) && delayRecordsInput.length > 0 ? delayRecordsInput : []).filter((r) => {
const buildEmptyMap = () => {
const empty = new Map();
skuItems.forEach((_, i) => empty.set(resolveOrderItemId(skuItems[i]) || `sku-${i}`, 0));
return empty;
};
const deductedMap = buildEmptyMap();
const delayedOnlyMap = buildEmptyMap();
const shippedReceivedMap = buildEmptyMap();
const allRecords = (Array.isArray(delayRecordsInput) && delayRecordsInput.length > 0 ? delayRecordsInput : []).filter((r) => {
if (!r) return false;
const status = Number(r?.status);
if (status !== 1) return false;
if (!matchSpuIdentity(r)) return false;
const c = resolveRecordCount(r);
return c > 0;
});
if (!records.length || !skuItems.length) {
const empty = new Map();
skuItems.forEach((_, i) => empty.set(resolveOrderItemId(skuItems[i]) || `sku-${i}`, 0));
return empty;
if (!allRecords.length || !skuItems.length) {
return {
deducted: deductedMap,
delayedOnly: delayedOnlyMap,
shippedAndReceived: shippedReceivedMap,
};
}
const skuCountMap = new Map();
skuItems.forEach((skuItem, idx) => {
const key = resolveOrderItemId(skuItem) || `sku-${idx}`;
skuCountMap.set(key, 0);
});
const DEDUCT_STATUS_SET = new Set([1, 3, 4]);
const DELAY_ONLY_SET = new Set([1]);
const SHIPPED_RECEIVED_SET = new Set([3, 4]);
const usedRecordKeys = new Set();
const addToMap = (targetMap, key, count) => {
if (!targetMap.has(key)) targetMap.set(key, 0);
targetMap.set(key, (Number(targetMap.get(key)) || 0) + count);
};
const addRecordCountToSku = (record, skuItem, skuIdx) => {
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
if (usedRecordKeys.has(rKey)) return false;
const skuKey = resolveOrderItemId(skuItem) || `sku-${skuIdx}`;
if (!skuCountMap.has(skuKey)) skuCountMap.set(skuKey, 0);
const c = resolveRecordCount(record);
skuCountMap.set(skuKey, (Number(skuCountMap.get(skuKey)) || 0) + c);
const status = Number(record?.status);
if (DEDUCT_STATUS_SET.has(status)) addToMap(deductedMap, skuKey, c);
if (DELAY_ONLY_SET.has(status)) addToMap(delayedOnlyMap, skuKey, c);
if (SHIPPED_RECEIVED_SET.has(status)) addToMap(shippedReceivedMap, skuKey, c);
usedRecordKeys.add(rKey);
return true;
};
records.forEach((record) => {
allRecords.forEach((record) => {
const recordItemId = resolveRecordItemId(record);
if (!recordItemId) return;
const matchedIdx = skuItems.findIndex((skuItem) => {
@@ -322,26 +339,39 @@ const buildAlreadyDelayedCountForSpu = (spuItem = {}, parentSpu = {}, delayRecor
});
if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx);
});
records.forEach((record) => {
allRecords.forEach((record) => {
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
if (usedRecordKeys.has(rKey)) return;
const matchedIdx = skuItems.findIndex((skuItem) => isSameSku(skuItem, record));
if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx);
});
records.forEach((record) => {
allRecords.forEach((record) => {
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
if (usedRecordKeys.has(rKey)) return;
if (skuItems.length === 1 && matchSpuIdentity(record)) {
addRecordCountToSku(record, skuItems[0], 0);
}
});
return skuCountMap;
return {
deducted: deductedMap,
delayedOnly: delayedOnlyMap,
shippedAndReceived: shippedReceivedMap,
};
};
const getCountFromMap = (map, skuItem, skuIdx) => {
if (!map || map.size === 0) return 0;
const key = resolveOrderItemId(skuItem) || `sku-${skuIdx}`;
return Number(map.get(key)) || 0;
};
const getSkuAlreadyDelayedCount = (skuCountMap, skuItem, skuIdx) => {
if (!skuCountMap || skuCountMap.size === 0) return 0;
const key = resolveOrderItemId(skuItem) || `sku-${skuIdx}`;
return Number(skuCountMap.get(key)) || 0;
if (!skuCountMap) return 0;
if (skuCountMap instanceof Map) {
return getCountFromMap(skuCountMap, skuItem, skuIdx);
}
const legacy = skuCountMap?.deducted ?? skuCountMap;
return getCountFromMap(legacy, skuItem, skuIdx);
};
const resolveDelayRecordId = (item = {}) =>
@@ -369,13 +399,18 @@ const createDelayShipmentItems = (data) => {
const results = [];
sourceItems.forEach((spuItem) => {
const hasNested = Array.isArray(spuItem?.items) && spuItem.items.length > 0;
const skuCountMap = buildAlreadyDelayedCountForSpu(spuItem, spuItem, delayRecordsInput);
const counter = buildAlreadyDelayedCountForSpu(spuItem, spuItem, delayRecordsInput);
const deductedMap = counter?.deducted;
const delayedOnlyMap = counter?.delayedOnly;
const shippedReceivedMap = counter?.shippedAndReceived;
if (hasNested) {
spuItem.items.forEach((skuItem, idx) => {
if (!skuItem) return;
const totalCount = resolveDelayItemCount(skuItem);
const alreadyDelayed = getSkuAlreadyDelayedCount(skuCountMap, skuItem, idx);
const remaining = Math.max(0, Number(totalCount) - Number(alreadyDelayed));
const deducted = getCountFromMap(deductedMap, skuItem, idx);
const delayedOnly = getCountFromMap(delayedOnlyMap, skuItem, idx);
const shippedReceived = getCountFromMap(shippedReceivedMap, skuItem, idx);
const remaining = Math.max(0, Number(totalCount) - Number(deducted));
const maxCount = remaining;
if (maxCount <= 0) return;
const orderItemId = resolveOrderItemId(skuItem);
@@ -396,7 +431,7 @@ const createDelayShipmentItems = (data) => {
results.push({
itemKey: getFirstValidValue(
submitOrderItemId,
`${skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${alreadyDelayed}`,
`${skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${deducted}`,
),
orderItemId,
parentOrderItemId,
@@ -405,15 +440,19 @@ const createDelayShipmentItems = (data) => {
spuName: skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || '',
skuText,
totalCount,
alreadyDelayed,
deducted,
alreadyDelayed: delayedOnly,
shippedOrReceived: shippedReceived,
maxCount,
selectedCount: maxCount,
});
});
} else {
const totalCount = resolveDelayItemCount(spuItem);
const alreadyDelayed = getSkuAlreadyDelayedCount(skuCountMap, spuItem, 0);
const remaining = Math.max(0, Number(totalCount) - Number(alreadyDelayed));
const deducted = getCountFromMap(deductedMap, spuItem, 0);
const delayedOnly = getCountFromMap(delayedOnlyMap, spuItem, 0);
const shippedReceived = getCountFromMap(shippedReceivedMap, spuItem, 0);
const remaining = Math.max(0, Number(totalCount) - Number(deducted));
const maxCount = remaining;
if (maxCount <= 0) return;
const orderItemId = resolveOrderItemId(spuItem);
@@ -430,7 +469,7 @@ const createDelayShipmentItems = (data) => {
results.push({
itemKey: getFirstValidValue(
submitOrderItemId,
`${spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${alreadyDelayed}`,
`${spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${deducted}`,
),
orderItemId,
parentOrderItemId: orderItemId,
@@ -439,7 +478,9 @@ const createDelayShipmentItems = (data) => {
spuName: spuItem?.spuName || spuItem?.name || '',
skuText,
totalCount,
alreadyDelayed,
deducted,
alreadyDelayed: delayedOnly,
shippedOrReceived: shippedReceived,
maxCount,
selectedCount: maxCount,
});
@@ -721,6 +762,14 @@ defineExpose({
font-size: 24rpx;
color: #666666;
display: flex;
flex-direction: column;
align-items: flex-start;
flex-wrap: wrap;
gap: 6rpx;
}
.shipment-popup__item-tags {
display: inline-flex;
align-items: center;
flex-wrap: wrap;
gap: 8rpx;
@@ -733,6 +782,13 @@ defineExpose({
border-radius: 8rpx;
}
.shipment-popup__item-shipped {
color: #1677FF;
background: #E8F1FF;
padding: 4rpx 12rpx;
border-radius: 8rpx;
}
.shipment-popup__item-remain {
color: #666666;
}