feat: 变更物流查看方式
This commit is contained in:
@@ -5,50 +5,87 @@
|
|||||||
<view>
|
<view>
|
||||||
<view class="express-popup__title">查看物流</view>
|
<view class="express-popup__title">查看物流</view>
|
||||||
<view class="express-popup__order-no">订单号:{{ orderNo || '-' }}</view>
|
<view class="express-popup__order-no">订单号:{{ orderNo || '-' }}</view>
|
||||||
<view class="express-popup__tip">请选择要查看物流的商品</view>
|
<view class="express-popup__tip">点击商品右侧按钮可展开/收起物流轨迹</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="express-popup__close" @tap.stop="handleClose">×</view>
|
<view class="express-popup__close" @tap.stop="handleClose">×</view>
|
||||||
</view>
|
</view>
|
||||||
<scroll-view scroll-y class="express-popup__content">
|
<view class="express-popup__scroll-wrap">
|
||||||
<view v-if="renderItems.length === 0" class="express-popup__empty">
|
<scroll-view
|
||||||
暂无物流信息
|
scroll-y
|
||||||
</view>
|
scroll-with-animation
|
||||||
<view
|
enhanced
|
||||||
v-else
|
:show-scrollbar="false"
|
||||||
class="express-popup__item"
|
class="express-popup__content"
|
||||||
v-for="(item, index) in renderItems"
|
|
||||||
:key="item.itemKey || index"
|
|
||||||
>
|
>
|
||||||
<image class="express-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
<view v-if="renderItems.length === 0" class="express-popup__empty">
|
||||||
<view class="express-popup__item-main">
|
暂无物流信息
|
||||||
<view class="express-popup__item-name lineTwo">{{ item.spuName }}</view>
|
</view>
|
||||||
<view class="express-popup__item-sku">{{ item.skuText || '-' }}</view>
|
<view
|
||||||
<view class="express-popup__item-info">
|
v-else
|
||||||
<text class="express-popup__item-count">数量:x{{ item.count }}</text>
|
class="express-popup__item"
|
||||||
<text
|
:class="{ 'express-popup__item--expanded': item.expanded }"
|
||||||
v-if="item.logisticsNo"
|
v-for="(item, index) in renderItems"
|
||||||
class="express-popup__item-logistics"
|
:key="item.itemKey || index"
|
||||||
>运单号:{{ item.logisticsNo }}</text>
|
>
|
||||||
|
<view class="express-popup__item-top flex-row al-flex-start">
|
||||||
|
<image class="express-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
||||||
|
<view class="express-popup__item-main">
|
||||||
|
<view class="express-popup__item-name lineTwo">{{ item.spuName }}</view>
|
||||||
|
<view class="express-popup__item-sku">{{ item.skuText || '-' }}</view>
|
||||||
|
<view class="express-popup__item-info">
|
||||||
|
<text class="express-popup__item-count">数量:x{{ item.count }}</text>
|
||||||
|
<text
|
||||||
|
v-if="item.logisticsNo"
|
||||||
|
class="express-popup__item-logistics"
|
||||||
|
>运单号:{{ item.logisticsNo }}</text>
|
||||||
|
</view>
|
||||||
|
<view class="express-popup__item-action">
|
||||||
|
<view
|
||||||
|
class="express-popup__btn"
|
||||||
|
:class="item.expanded ? 'express-popup__btn--ghost' : 'express-popup__btn--primary'"
|
||||||
|
@tap.stop="handleToggleTrack(item)"
|
||||||
|
>
|
||||||
|
<text v-if="item.loading">加载中...</text>
|
||||||
|
<template v-else>
|
||||||
|
{{ item.expanded ? '收起物流' : '查看物流' }}
|
||||||
|
</template>
|
||||||
|
<text class="express-popup__btn-arrow" :class="{ rotated: item.expanded }">▾</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="express-popup__item-action">
|
<view v-if="item.expanded" class="express-popup__track">
|
||||||
<view
|
<view v-if="item.loading" class="express-popup__track-loading">物流信息加载中...</view>
|
||||||
class="express-popup__btn express-popup__btn--primary"
|
<view v-else-if="!Array.isArray(item.tracks) || item.tracks.length === 0" class="express-popup__track-empty">
|
||||||
@tap.stop="handleViewExpress(item)"
|
暂无物流轨迹
|
||||||
>
|
</view>
|
||||||
查看物流
|
<view v-else class="express-popup__track-list">
|
||||||
|
<view
|
||||||
|
class="express-popup__track-node"
|
||||||
|
:class="{ 'is-first': i === 0 }"
|
||||||
|
v-for="(node, i) in item.tracks"
|
||||||
|
:key="i"
|
||||||
|
>
|
||||||
|
<view class="express-popup__track-dot" />
|
||||||
|
<view class="express-popup__track-main">
|
||||||
|
<view class="express-popup__track-content">{{ node.content || node.desc || node.text || '-' }}</view>
|
||||||
|
<view class="express-popup__track-time">{{ node.time || node.ftime || node.createTime || '' }}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</scroll-view>
|
||||||
</scroll-view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, ref, watch } from 'vue';
|
import { computed, reactive, ref, watch } from 'vue';
|
||||||
import sheep from '@/sheep';
|
import sheep from '@/sheep';
|
||||||
import { getAiOrderDelayRecords } from '@/sheep/api/ai';
|
import { getAiOrderDelayRecords } from '@/sheep/api/ai';
|
||||||
|
import { getExpressTrackList } from '@/sheep/api/index/index';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
popupType: {
|
popupType: {
|
||||||
@@ -274,13 +311,6 @@ const resolveRecordLogisticsNo = (record) =>
|
|||||||
record?.orderItem?.logisticsNo,
|
record?.orderItem?.logisticsNo,
|
||||||
);
|
);
|
||||||
|
|
||||||
const hasRecordLogistics = (record) => {
|
|
||||||
if (Number(record?.logisticsId) > 0) return true;
|
|
||||||
if (hasValue(resolveRecordLogisticsNo(record))) return true;
|
|
||||||
if (hasValue(record?.deliveryTime)) return true;
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const buildExpressItemList = () => {
|
const buildExpressItemList = () => {
|
||||||
const records = resolveAllDelayRecords();
|
const records = resolveAllDelayRecords();
|
||||||
const expressRecords = records.filter((record) => {
|
const expressRecords = records.filter((record) => {
|
||||||
@@ -339,7 +369,7 @@ const buildExpressItemList = () => {
|
|||||||
const delayRecordId = Number(record?.delayRecordId || record?.id) || 0;
|
const delayRecordId = Number(record?.delayRecordId || record?.id) || 0;
|
||||||
const logisticsNo = resolveRecordLogisticsNo(record);
|
const logisticsNo = resolveRecordLogisticsNo(record);
|
||||||
|
|
||||||
return {
|
return reactive({
|
||||||
itemKey: `${delayRecordId}-${idx}`,
|
itemKey: `${delayRecordId}-${idx}`,
|
||||||
delayRecordId,
|
delayRecordId,
|
||||||
spuName: spuName || '商品信息',
|
spuName: spuName || '商品信息',
|
||||||
@@ -347,7 +377,10 @@ const buildExpressItemList = () => {
|
|||||||
picUrl: picUrl || '',
|
picUrl: picUrl || '',
|
||||||
count,
|
count,
|
||||||
logisticsNo,
|
logisticsNo,
|
||||||
};
|
expanded: false,
|
||||||
|
loading: false,
|
||||||
|
tracks: null,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -379,36 +412,59 @@ const handleClose = () => {
|
|||||||
close();
|
close();
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleViewExpress = (item) => {
|
const loadTrackList = async (item) => {
|
||||||
const delayRecordId = Number(item?.delayRecordId) || 0;
|
const delayRecordId = Number(item?.delayRecordId) || 0;
|
||||||
if (!delayRecordId) {
|
const id = props.orderId || props.orderData?.id || props.orderData?.orderId;
|
||||||
|
if (!delayRecordId || !id) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '物流信息异常',
|
title: '物流信息异常',
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
});
|
});
|
||||||
return;
|
return [];
|
||||||
}
|
}
|
||||||
const id = props.orderId || props.orderData?.id || props.orderData?.orderId;
|
try {
|
||||||
if (!id) {
|
const { code, data } = await getExpressTrackList({
|
||||||
uni.showToast({
|
id,
|
||||||
title: '订单信息异常',
|
code: 2,
|
||||||
icon: 'none',
|
delayRecordId,
|
||||||
});
|
});
|
||||||
return;
|
if (code === 0 && Array.isArray(data)) {
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
} catch (e) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleToggleTrack = async (item) => {
|
||||||
|
if (!item) return;
|
||||||
|
if (item.loading) return;
|
||||||
|
if (!item.expanded) {
|
||||||
|
const delayRecordId = Number(item?.delayRecordId) || 0;
|
||||||
|
const id = props.orderId || props.orderData?.id || props.orderData?.orderId;
|
||||||
|
if (!delayRecordId || !id) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '物流信息异常',
|
||||||
|
icon: 'none',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
emit('view-express', {
|
||||||
|
id,
|
||||||
|
delayRecordId,
|
||||||
|
code: 2,
|
||||||
|
});
|
||||||
|
if (!Array.isArray(item.tracks)) {
|
||||||
|
item.loading = true;
|
||||||
|
const data = await loadTrackList(item);
|
||||||
|
item.tracks = data;
|
||||||
|
item.loading = false;
|
||||||
|
}
|
||||||
|
item.expanded = true;
|
||||||
|
} else {
|
||||||
|
item.expanded = false;
|
||||||
}
|
}
|
||||||
emit('view-express', {
|
|
||||||
id,
|
|
||||||
delayRecordId,
|
|
||||||
code: 2,
|
|
||||||
});
|
|
||||||
close();
|
|
||||||
const query = [
|
|
||||||
`id=${encodeURIComponent(id)}`,
|
|
||||||
`code=${encodeURIComponent(2)}`,
|
|
||||||
`delayRecordId=${encodeURIComponent(delayRecordId)}`,
|
|
||||||
].join('&');
|
|
||||||
const url = `/pages/order/express/log?${query}`;
|
|
||||||
uni.navigateTo({ url });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
defineExpose({ open, close });
|
defineExpose({ open, close });
|
||||||
@@ -423,25 +479,29 @@ defineExpose({ open, close });
|
|||||||
|
|
||||||
&--bottom {
|
&--bottom {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
height: 82vh;
|
||||||
max-height: 82vh;
|
max-height: 82vh;
|
||||||
border-radius: 24rpx 24rpx 0 0;
|
border-radius: 24rpx 24rpx 0 0;
|
||||||
padding: 32rpx 32rpx calc(24rpx + env(safe-area-inset-bottom)) 32rpx;
|
padding: 32rpx 32rpx calc(24rpx + env(safe-area-inset-bottom)) 32rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
&--center {
|
&--center {
|
||||||
width: 680rpx;
|
width: 680rpx;
|
||||||
|
height: 78vh;
|
||||||
max-height: 78vh;
|
max-height: 78vh;
|
||||||
border-radius: 24rpx;
|
border-radius: 24rpx;
|
||||||
padding: 32rpx 32rpx 0 32rpx;
|
padding: 32rpx 32rpx 32rpx 32rpx;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
&--center &__content {
|
&--center &__content {
|
||||||
max-height: 52vh;
|
padding-bottom: 0;
|
||||||
}
|
}
|
||||||
&--center &__btn {
|
&--center &__btn {
|
||||||
min-width: 160rpx;
|
min-width: 200rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__header {
|
&__header {
|
||||||
@@ -450,6 +510,10 @@ defineExpose({ open, close });
|
|||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
padding-bottom: 24rpx;
|
padding-bottom: 24rpx;
|
||||||
border-bottom: 1rpx solid #f2f2f2;
|
border-bottom: 1rpx solid #f2f2f2;
|
||||||
|
flex-shrink: 0;
|
||||||
|
flex-grow: 0;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
&__title {
|
&__title {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
@@ -479,12 +543,25 @@ defineExpose({ open, close });
|
|||||||
color: #9ca3af;
|
color: #9ca3af;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
}
|
}
|
||||||
&__content {
|
&__scroll-wrap {
|
||||||
flex: 1;
|
flex: 1 1 auto;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
max-height: calc(82vh - 280rpx - env(safe-area-inset-bottom));
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
&__content {
|
||||||
|
width: 100%;
|
||||||
|
flex: 1 1 auto;
|
||||||
|
height: auto;
|
||||||
|
min-height: 100%;
|
||||||
|
max-height: none;
|
||||||
|
margin: 0;
|
||||||
|
padding-bottom: 40rpx;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
&__empty {
|
&__empty {
|
||||||
padding: 80rpx 0;
|
padding: 80rpx 0;
|
||||||
@@ -494,10 +571,16 @@ defineExpose({ open, close });
|
|||||||
}
|
}
|
||||||
&__item {
|
&__item {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-start;
|
flex-direction: column;
|
||||||
padding: 20rpx 0;
|
padding: 20rpx 0;
|
||||||
border-bottom: 1rpx solid #f2f2f2;
|
border-bottom: 1rpx solid #f2f2f2;
|
||||||
}
|
}
|
||||||
|
&__item--expanded {
|
||||||
|
padding-bottom: 24rpx;
|
||||||
|
}
|
||||||
|
&__item-top {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
&__item-image {
|
&__item-image {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
width: 140rpx;
|
width: 140rpx;
|
||||||
@@ -552,7 +635,7 @@ defineExpose({ open, close });
|
|||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
&__btn {
|
&__btn {
|
||||||
min-width: 180rpx;
|
min-width: 200rpx;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
line-height: 60rpx;
|
line-height: 60rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@@ -560,6 +643,19 @@ defineExpose({ open, close });
|
|||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
padding: 0 24rpx;
|
padding: 0 24rpx;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 6rpx;
|
||||||
|
}
|
||||||
|
&__btn-arrow {
|
||||||
|
font-size: 22rpx;
|
||||||
|
transition: transform .2s ease;
|
||||||
|
display: inline-block;
|
||||||
|
transform-origin: center;
|
||||||
|
}
|
||||||
|
&__btn-arrow.rotated {
|
||||||
|
transform: rotate(180deg);
|
||||||
}
|
}
|
||||||
&__btn--ghost {
|
&__btn--ghost {
|
||||||
border: 2rpx solid #e5e7eb;
|
border: 2rpx solid #e5e7eb;
|
||||||
@@ -573,6 +669,80 @@ defineExpose({ open, close });
|
|||||||
&__btn--disabled {
|
&__btn--disabled {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
&__track {
|
||||||
|
margin-top: 20rpx;
|
||||||
|
margin-left: 160rpx;
|
||||||
|
padding: 20rpx 20rpx 10rpx 20rpx;
|
||||||
|
background: #f8fafc;
|
||||||
|
border-radius: 12rpx;
|
||||||
|
}
|
||||||
|
&__track-loading,
|
||||||
|
&__track-empty {
|
||||||
|
padding: 28rpx 0;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #9ca3af;
|
||||||
|
}
|
||||||
|
&__track-list {
|
||||||
|
position: relative;
|
||||||
|
padding: 8rpx 0 0 10rpx;
|
||||||
|
}
|
||||||
|
&__track-node {
|
||||||
|
position: relative;
|
||||||
|
padding-left: 24rpx;
|
||||||
|
padding-bottom: 20rpx;
|
||||||
|
&:last-child {
|
||||||
|
padding-bottom: 10rpx;
|
||||||
|
}
|
||||||
|
&:last-child::before {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&__track-node::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
left: 4rpx;
|
||||||
|
top: 20rpx;
|
||||||
|
bottom: 0;
|
||||||
|
width: 2rpx;
|
||||||
|
background: #e5e7eb;
|
||||||
|
}
|
||||||
|
&__track-dot {
|
||||||
|
position: absolute;
|
||||||
|
left: -4rpx;
|
||||||
|
top: 8rpx;
|
||||||
|
width: 14rpx;
|
||||||
|
height: 14rpx;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: #d1d5db;
|
||||||
|
border: 2rpx solid #ffffff;
|
||||||
|
box-sizing: border-box;
|
||||||
|
box-shadow: 0 0 0 2rpx #e5e7eb;
|
||||||
|
}
|
||||||
|
&__track-node.is-first &__track-dot {
|
||||||
|
background: linear-gradient(135deg, #fa8735 0%, #fe3b48 100%);
|
||||||
|
box-shadow: 0 0 0 2rpx rgba(250,135,53,0.25);
|
||||||
|
width: 16rpx;
|
||||||
|
height: 16rpx;
|
||||||
|
left: -5rpx;
|
||||||
|
}
|
||||||
|
&__track-content {
|
||||||
|
font-size: 24rpx;
|
||||||
|
line-height: 34rpx;
|
||||||
|
color: #374151;
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
&__track-node.is-first &__track-content {
|
||||||
|
color: #111827;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 26rpx;
|
||||||
|
}
|
||||||
|
&__track-time {
|
||||||
|
margin-top: 6rpx;
|
||||||
|
font-size: 22rpx;
|
||||||
|
line-height: 30rpx;
|
||||||
|
color: #9ca3af;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
::v-deep .uni-popup {
|
::v-deep .uni-popup {
|
||||||
|
|||||||
@@ -26,9 +26,14 @@
|
|||||||
<view class="shipment-popup__item-sku">{{ item.skuText || '-' }}</view>
|
<view class="shipment-popup__item-sku">{{ item.skuText || '-' }}</view>
|
||||||
<view class="shipment-popup__item-footer flex-center ju-between">
|
<view class="shipment-popup__item-footer flex-center ju-between">
|
||||||
<view class="shipment-popup__item-count">
|
<view class="shipment-popup__item-count">
|
||||||
<text v-if="props.mode === 'delay' && Number(item.alreadyDelayed) > 0" class="shipment-popup__item-delayed">
|
<view class="shipment-popup__item-tags flex-wrap">
|
||||||
已延迟 x{{ item.alreadyDelayed }}
|
<text v-if="props.mode === 'delay' && Number(item.alreadyDelayed) > 0" class="shipment-popup__item-delayed">
|
||||||
</text>
|
已延迟 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>
|
<text class="shipment-popup__item-remain">最多可选 x{{ item.maxCount }}</text>
|
||||||
</view>
|
</view>
|
||||||
<su-number-box
|
<su-number-box
|
||||||
@@ -284,36 +289,48 @@ const buildAlreadyDelayedCountForSpu = (spuItem = {}, parentSpu = {}, delayRecor
|
|||||||
if (targetSpuName && recordSpuName) return String(targetSpuName).trim() === String(recordSpuName).trim();
|
if (targetSpuName && recordSpuName) return String(targetSpuName).trim() === String(recordSpuName).trim();
|
||||||
return false;
|
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;
|
if (!r) return false;
|
||||||
const status = Number(r?.status);
|
|
||||||
if (status !== 1) return false;
|
|
||||||
if (!matchSpuIdentity(r)) return false;
|
if (!matchSpuIdentity(r)) return false;
|
||||||
const c = resolveRecordCount(r);
|
const c = resolveRecordCount(r);
|
||||||
return c > 0;
|
return c > 0;
|
||||||
});
|
});
|
||||||
if (!records.length || !skuItems.length) {
|
if (!allRecords.length || !skuItems.length) {
|
||||||
const empty = new Map();
|
return {
|
||||||
skuItems.forEach((_, i) => empty.set(resolveOrderItemId(skuItems[i]) || `sku-${i}`, 0));
|
deducted: deductedMap,
|
||||||
return empty;
|
delayedOnly: delayedOnlyMap,
|
||||||
|
shippedAndReceived: shippedReceivedMap,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
const skuCountMap = new Map();
|
const DEDUCT_STATUS_SET = new Set([1, 3, 4]);
|
||||||
skuItems.forEach((skuItem, idx) => {
|
const DELAY_ONLY_SET = new Set([1]);
|
||||||
const key = resolveOrderItemId(skuItem) || `sku-${idx}`;
|
const SHIPPED_RECEIVED_SET = new Set([3, 4]);
|
||||||
skuCountMap.set(key, 0);
|
|
||||||
});
|
|
||||||
const usedRecordKeys = new Set();
|
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 addRecordCountToSku = (record, skuItem, skuIdx) => {
|
||||||
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
|
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||||
if (usedRecordKeys.has(rKey)) return false;
|
if (usedRecordKeys.has(rKey)) return false;
|
||||||
const skuKey = resolveOrderItemId(skuItem) || `sku-${skuIdx}`;
|
const skuKey = resolveOrderItemId(skuItem) || `sku-${skuIdx}`;
|
||||||
if (!skuCountMap.has(skuKey)) skuCountMap.set(skuKey, 0);
|
|
||||||
const c = resolveRecordCount(record);
|
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);
|
usedRecordKeys.add(rKey);
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
records.forEach((record) => {
|
allRecords.forEach((record) => {
|
||||||
const recordItemId = resolveRecordItemId(record);
|
const recordItemId = resolveRecordItemId(record);
|
||||||
if (!recordItemId) return;
|
if (!recordItemId) return;
|
||||||
const matchedIdx = skuItems.findIndex((skuItem) => {
|
const matchedIdx = skuItems.findIndex((skuItem) => {
|
||||||
@@ -322,26 +339,39 @@ const buildAlreadyDelayedCountForSpu = (spuItem = {}, parentSpu = {}, delayRecor
|
|||||||
});
|
});
|
||||||
if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx);
|
if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx);
|
||||||
});
|
});
|
||||||
records.forEach((record) => {
|
allRecords.forEach((record) => {
|
||||||
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
|
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||||
if (usedRecordKeys.has(rKey)) return;
|
if (usedRecordKeys.has(rKey)) return;
|
||||||
const matchedIdx = skuItems.findIndex((skuItem) => isSameSku(skuItem, record));
|
const matchedIdx = skuItems.findIndex((skuItem) => isSameSku(skuItem, record));
|
||||||
if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx);
|
if (matchedIdx >= 0) addRecordCountToSku(record, skuItems[matchedIdx], matchedIdx);
|
||||||
});
|
});
|
||||||
records.forEach((record) => {
|
allRecords.forEach((record) => {
|
||||||
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
|
const rKey = resolveRecordUniqueId(record) || JSON.stringify(record);
|
||||||
if (usedRecordKeys.has(rKey)) return;
|
if (usedRecordKeys.has(rKey)) return;
|
||||||
if (skuItems.length === 1 && matchSpuIdentity(record)) {
|
if (skuItems.length === 1 && matchSpuIdentity(record)) {
|
||||||
addRecordCountToSku(record, skuItems[0], 0);
|
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) => {
|
const getSkuAlreadyDelayedCount = (skuCountMap, skuItem, skuIdx) => {
|
||||||
if (!skuCountMap || skuCountMap.size === 0) return 0;
|
if (!skuCountMap) return 0;
|
||||||
const key = resolveOrderItemId(skuItem) || `sku-${skuIdx}`;
|
if (skuCountMap instanceof Map) {
|
||||||
return Number(skuCountMap.get(key)) || 0;
|
return getCountFromMap(skuCountMap, skuItem, skuIdx);
|
||||||
|
}
|
||||||
|
const legacy = skuCountMap?.deducted ?? skuCountMap;
|
||||||
|
return getCountFromMap(legacy, skuItem, skuIdx);
|
||||||
};
|
};
|
||||||
|
|
||||||
const resolveDelayRecordId = (item = {}) =>
|
const resolveDelayRecordId = (item = {}) =>
|
||||||
@@ -369,13 +399,18 @@ const createDelayShipmentItems = (data) => {
|
|||||||
const results = [];
|
const results = [];
|
||||||
sourceItems.forEach((spuItem) => {
|
sourceItems.forEach((spuItem) => {
|
||||||
const hasNested = Array.isArray(spuItem?.items) && spuItem.items.length > 0;
|
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) {
|
if (hasNested) {
|
||||||
spuItem.items.forEach((skuItem, idx) => {
|
spuItem.items.forEach((skuItem, idx) => {
|
||||||
if (!skuItem) return;
|
if (!skuItem) return;
|
||||||
const totalCount = resolveDelayItemCount(skuItem);
|
const totalCount = resolveDelayItemCount(skuItem);
|
||||||
const alreadyDelayed = getSkuAlreadyDelayedCount(skuCountMap, skuItem, idx);
|
const deducted = getCountFromMap(deductedMap, skuItem, idx);
|
||||||
const remaining = Math.max(0, Number(totalCount) - Number(alreadyDelayed));
|
const delayedOnly = getCountFromMap(delayedOnlyMap, skuItem, idx);
|
||||||
|
const shippedReceived = getCountFromMap(shippedReceivedMap, skuItem, idx);
|
||||||
|
const remaining = Math.max(0, Number(totalCount) - Number(deducted));
|
||||||
const maxCount = remaining;
|
const maxCount = remaining;
|
||||||
if (maxCount <= 0) return;
|
if (maxCount <= 0) return;
|
||||||
const orderItemId = resolveOrderItemId(skuItem);
|
const orderItemId = resolveOrderItemId(skuItem);
|
||||||
@@ -396,7 +431,7 @@ const createDelayShipmentItems = (data) => {
|
|||||||
results.push({
|
results.push({
|
||||||
itemKey: getFirstValidValue(
|
itemKey: getFirstValidValue(
|
||||||
submitOrderItemId,
|
submitOrderItemId,
|
||||||
`${skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${alreadyDelayed}`,
|
`${skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${deducted}`,
|
||||||
),
|
),
|
||||||
orderItemId,
|
orderItemId,
|
||||||
parentOrderItemId,
|
parentOrderItemId,
|
||||||
@@ -405,15 +440,19 @@ const createDelayShipmentItems = (data) => {
|
|||||||
spuName: skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || '',
|
spuName: skuItem?.spuName || skuItem?.name || spuItem?.spuName || spuItem?.name || '',
|
||||||
skuText,
|
skuText,
|
||||||
totalCount,
|
totalCount,
|
||||||
alreadyDelayed,
|
deducted,
|
||||||
|
alreadyDelayed: delayedOnly,
|
||||||
|
shippedOrReceived: shippedReceived,
|
||||||
maxCount,
|
maxCount,
|
||||||
selectedCount: maxCount,
|
selectedCount: maxCount,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const totalCount = resolveDelayItemCount(spuItem);
|
const totalCount = resolveDelayItemCount(spuItem);
|
||||||
const alreadyDelayed = getSkuAlreadyDelayedCount(skuCountMap, spuItem, 0);
|
const deducted = getCountFromMap(deductedMap, spuItem, 0);
|
||||||
const remaining = Math.max(0, Number(totalCount) - Number(alreadyDelayed));
|
const delayedOnly = getCountFromMap(delayedOnlyMap, spuItem, 0);
|
||||||
|
const shippedReceived = getCountFromMap(shippedReceivedMap, spuItem, 0);
|
||||||
|
const remaining = Math.max(0, Number(totalCount) - Number(deducted));
|
||||||
const maxCount = remaining;
|
const maxCount = remaining;
|
||||||
if (maxCount <= 0) return;
|
if (maxCount <= 0) return;
|
||||||
const orderItemId = resolveOrderItemId(spuItem);
|
const orderItemId = resolveOrderItemId(spuItem);
|
||||||
@@ -430,7 +469,7 @@ const createDelayShipmentItems = (data) => {
|
|||||||
results.push({
|
results.push({
|
||||||
itemKey: getFirstValidValue(
|
itemKey: getFirstValidValue(
|
||||||
submitOrderItemId,
|
submitOrderItemId,
|
||||||
`${spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${alreadyDelayed}`,
|
`${spuItem?.spuName || spuItem?.name || ''}_${skuText}_${totalCount}_${deducted}`,
|
||||||
),
|
),
|
||||||
orderItemId,
|
orderItemId,
|
||||||
parentOrderItemId: orderItemId,
|
parentOrderItemId: orderItemId,
|
||||||
@@ -439,7 +478,9 @@ const createDelayShipmentItems = (data) => {
|
|||||||
spuName: spuItem?.spuName || spuItem?.name || '',
|
spuName: spuItem?.spuName || spuItem?.name || '',
|
||||||
skuText,
|
skuText,
|
||||||
totalCount,
|
totalCount,
|
||||||
alreadyDelayed,
|
deducted,
|
||||||
|
alreadyDelayed: delayedOnly,
|
||||||
|
shippedOrReceived: shippedReceived,
|
||||||
maxCount,
|
maxCount,
|
||||||
selectedCount: maxCount,
|
selectedCount: maxCount,
|
||||||
});
|
});
|
||||||
@@ -721,6 +762,14 @@ defineExpose({
|
|||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-start;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 6rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.shipment-popup__item-tags {
|
||||||
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 8rpx;
|
gap: 8rpx;
|
||||||
@@ -733,6 +782,13 @@ defineExpose({
|
|||||||
border-radius: 8rpx;
|
border-radius: 8rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.shipment-popup__item-shipped {
|
||||||
|
color: #1677FF;
|
||||||
|
background: #E8F1FF;
|
||||||
|
padding: 4rpx 12rpx;
|
||||||
|
border-radius: 8rpx;
|
||||||
|
}
|
||||||
|
|
||||||
.shipment-popup__item-remain {
|
.shipment-popup__item-remain {
|
||||||
color: #666666;
|
color: #666666;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user