feat: 多规格延迟发货
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
{{ formatAfterSaleStatus(props.data) }}
|
{{ formatAfterSaleStatus(props.data) }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<card_order :data="props.data" v-if="props.index != 5" type="3"></card_order>
|
<card_order :data="props.data" :source="props.data.__source" v-if="props.index != 5" type="3"></card_order>
|
||||||
<view v-else class="con_item flex-center ju-between al-flex-start">
|
<view v-else class="con_item flex-center ju-between al-flex-start">
|
||||||
<view class="order_img shrink">
|
<view class="order_img shrink">
|
||||||
<image :src="`${props.data.picUrl}`" mode="aspectFill" />
|
<image :src="`${props.data.picUrl}`" mode="aspectFill" />
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
<view
|
<view
|
||||||
class="delay-popup__item"
|
class="delay-popup__item"
|
||||||
v-for="(item, index) in delayShipmentItems"
|
v-for="(item, index) in delayShipmentItems"
|
||||||
:key="item.orderItemId || index"
|
:key="item.itemKey || index"
|
||||||
>
|
>
|
||||||
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
||||||
<view class="delay-popup__item-main">
|
<view class="delay-popup__item-main">
|
||||||
@@ -238,20 +238,51 @@
|
|||||||
const resolveAiOrderId = (data) => {
|
const resolveAiOrderId = (data) => {
|
||||||
return data?.id || data?.orderId;
|
return data?.id || data?.orderId;
|
||||||
};
|
};
|
||||||
const resolveDelayOrderItemId = (item) => {
|
const getDelayFirstValidValue = (...values) =>
|
||||||
return Number(item?.id || item?.orderItemId || item?.itemId || 0);
|
values.find((value) => value !== undefined && value !== null && String(value).trim() !== '') ?? '';
|
||||||
|
const resolveDelayOrderItemId = (item = {}) => {
|
||||||
|
return getDelayFirstValidValue(
|
||||||
|
item?.id,
|
||||||
|
item?.orderItemId,
|
||||||
|
item?.itemId,
|
||||||
|
item?.orderGoodsId,
|
||||||
|
item?.goodsId,
|
||||||
|
item?.skuId,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
const hasDelayOrderItemId = (value) => value !== undefined && value !== null && String(value).trim() !== '';
|
||||||
|
const resolveDelayMaxCount = (item = {}) => {
|
||||||
|
const candidates = [
|
||||||
|
item?.count,
|
||||||
|
item?.remainingCount,
|
||||||
|
item?.availableCount,
|
||||||
|
item?.canCount,
|
||||||
|
item?.maxCount,
|
||||||
|
];
|
||||||
|
const matched = candidates
|
||||||
|
.map((value) => Number(value))
|
||||||
|
.find((value) => Number.isFinite(value) && value > 0);
|
||||||
|
return matched || 0;
|
||||||
};
|
};
|
||||||
const delayPopupRef = ref();
|
const delayPopupRef = ref();
|
||||||
const delayShipmentItems = ref([]);
|
const delayShipmentItems = ref([]);
|
||||||
const createDelayShipmentItem = (item, parentItem = {}) => {
|
const createDelayShipmentItem = (item, parentItem = {}) => {
|
||||||
const maxCount = Number(item?.count || 0);
|
const maxCount = resolveDelayMaxCount(item);
|
||||||
const orderItemId =
|
const orderItemId = resolveDelayOrderItemId(item);
|
||||||
resolveDelayOrderItemId(item) || resolveDelayOrderItemId(parentItem);
|
const parentOrderItemId = resolveDelayOrderItemId(parentItem);
|
||||||
|
const submitOrderItemId = getDelayFirstValidValue(orderItemId, parentOrderItemId);
|
||||||
|
const skuText = formatSkuProperties(item?.properties || parentItem?.properties);
|
||||||
return {
|
return {
|
||||||
|
itemKey: getDelayFirstValidValue(
|
||||||
|
submitOrderItemId,
|
||||||
|
`${item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || ''}_${skuText}_${maxCount}`,
|
||||||
|
),
|
||||||
orderItemId,
|
orderItemId,
|
||||||
|
parentOrderItemId,
|
||||||
|
submitOrderItemId,
|
||||||
picUrl: item?.picUrl || parentItem?.picUrl || '',
|
picUrl: item?.picUrl || parentItem?.picUrl || '',
|
||||||
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
|
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
|
||||||
skuText: formatSkuProperties(item?.properties),
|
skuText,
|
||||||
maxCount,
|
maxCount,
|
||||||
selectedCount: maxCount,
|
selectedCount: maxCount,
|
||||||
};
|
};
|
||||||
@@ -262,11 +293,11 @@
|
|||||||
.flatMap((item) => {
|
.flatMap((item) => {
|
||||||
const children = Array.isArray(item?.items) ? item.items : [];
|
const children = Array.isArray(item?.items) ? item.items : [];
|
||||||
if (children.length) {
|
if (children.length) {
|
||||||
return children.map((child) => createDelayShipmentItem(child, item));
|
return children.filter(Boolean).map((child) => createDelayShipmentItem(child, item));
|
||||||
}
|
}
|
||||||
return [createDelayShipmentItem(item)];
|
return [createDelayShipmentItem(item, item)];
|
||||||
})
|
})
|
||||||
.filter((item) => item.orderItemId > 0 && item.maxCount > 0);
|
.filter((item) => item.maxCount > 0);
|
||||||
};
|
};
|
||||||
const closeDelayShipmentPopup = () => {
|
const closeDelayShipmentPopup = () => {
|
||||||
delayPopupRef.value?.close();
|
delayPopupRef.value?.close();
|
||||||
@@ -274,7 +305,11 @@
|
|||||||
const onDelayShipmentCountChange = (index, value) => {
|
const onDelayShipmentCountChange = (index, value) => {
|
||||||
const current = delayShipmentItems.value[index];
|
const current = delayShipmentItems.value[index];
|
||||||
if (!current) return;
|
if (!current) return;
|
||||||
const next = Number(value || 0);
|
const next = Number(value);
|
||||||
|
if (!Number.isFinite(next)) {
|
||||||
|
current.selectedCount = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
|
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
|
||||||
};
|
};
|
||||||
const openDelayShipmentPopup = (data) => {
|
const openDelayShipmentPopup = (data) => {
|
||||||
@@ -288,10 +323,6 @@
|
|||||||
}
|
}
|
||||||
const nextItems = createDelayShipmentItems(data);
|
const nextItems = createDelayShipmentItems(data);
|
||||||
if (!nextItems.length) {
|
if (!nextItems.length) {
|
||||||
uni.showToast({
|
|
||||||
title: '未获取到可延迟商品',
|
|
||||||
icon: 'none',
|
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
delayShipmentItems.value = nextItems;
|
delayShipmentItems.value = nextItems;
|
||||||
@@ -306,15 +337,18 @@
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const hasSelectedCount = delayShipmentItems.value.some((item) => Number(item.selectedCount) > 0);
|
||||||
const items = delayShipmentItems.value
|
const items = delayShipmentItems.value
|
||||||
.filter((item) => Number(item.selectedCount) > 0)
|
.filter(
|
||||||
|
(item) => Number(item.selectedCount) > 0 && hasDelayOrderItemId(item.submitOrderItemId),
|
||||||
|
)
|
||||||
.map((item) => ({
|
.map((item) => ({
|
||||||
orderItemId: item.orderItemId,
|
orderItemId: item.submitOrderItemId,
|
||||||
count: Number(item.selectedCount),
|
count: Number(item.selectedCount),
|
||||||
}));
|
}));
|
||||||
if (!items.length) {
|
if (!items.length) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '请选择延迟发货数量',
|
title: hasSelectedCount ? '订单商品信息异常' : '请选择延迟发货数量',
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
|||||||
+53
-18
@@ -125,7 +125,7 @@
|
|||||||
<view
|
<view
|
||||||
class="delay-popup__item"
|
class="delay-popup__item"
|
||||||
v-for="(item, index) in delayShipmentItems"
|
v-for="(item, index) in delayShipmentItems"
|
||||||
:key="item.orderItemId || index"
|
:key="item.itemKey || index"
|
||||||
>
|
>
|
||||||
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
||||||
<view class="delay-popup__item-main">
|
<view class="delay-popup__item-main">
|
||||||
@@ -255,8 +255,32 @@
|
|||||||
const resolveAiOrderId = (data) => {
|
const resolveAiOrderId = (data) => {
|
||||||
return data?.id || data?.orderId;
|
return data?.id || data?.orderId;
|
||||||
};
|
};
|
||||||
const resolveDelayOrderItemId = (item) => {
|
const getDelayFirstValidValue = (...values) =>
|
||||||
return Number(item?.id || item?.orderItemId || item?.itemId || 0);
|
values.find((value) => value !== undefined && value !== null && String(value).trim() !== '') ?? '';
|
||||||
|
const resolveDelayOrderItemId = (item = {}) => {
|
||||||
|
return getDelayFirstValidValue(
|
||||||
|
item?.id,
|
||||||
|
item?.orderItemId,
|
||||||
|
item?.itemId,
|
||||||
|
item?.orderGoodsId,
|
||||||
|
item?.goodsId,
|
||||||
|
item?.skuId,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
const hasDelayOrderItemId = (value) =>
|
||||||
|
value !== undefined && value !== null && String(value).trim() !== '';
|
||||||
|
const resolveDelayMaxCount = (item = {}) => {
|
||||||
|
const candidates = [
|
||||||
|
item?.count,
|
||||||
|
item?.remainingCount,
|
||||||
|
item?.availableCount,
|
||||||
|
item?.canCount,
|
||||||
|
item?.maxCount,
|
||||||
|
];
|
||||||
|
const matched = candidates
|
||||||
|
.map((value) => Number(value))
|
||||||
|
.find((value) => Number.isFinite(value) && value > 0);
|
||||||
|
return matched || 0;
|
||||||
};
|
};
|
||||||
const formatSkuProperties = (properties) => {
|
const formatSkuProperties = (properties) => {
|
||||||
const list = Array.isArray(properties) ? properties : [];
|
const list = Array.isArray(properties) ? properties : [];
|
||||||
@@ -271,14 +295,22 @@
|
|||||||
const delayPopupRef = ref();
|
const delayPopupRef = ref();
|
||||||
const delayShipmentItems = ref([]);
|
const delayShipmentItems = ref([]);
|
||||||
const createDelayShipmentItem = (item, parentItem = {}) => {
|
const createDelayShipmentItem = (item, parentItem = {}) => {
|
||||||
const maxCount = Number(item?.count || 0);
|
const maxCount = resolveDelayMaxCount(item);
|
||||||
const orderItemId =
|
const orderItemId = resolveDelayOrderItemId(item);
|
||||||
resolveDelayOrderItemId(item) || resolveDelayOrderItemId(parentItem);
|
const parentOrderItemId = resolveDelayOrderItemId(parentItem);
|
||||||
|
const submitOrderItemId = getDelayFirstValidValue(orderItemId, parentOrderItemId);
|
||||||
|
const skuText = formatSkuProperties(item?.properties || parentItem?.properties);
|
||||||
return {
|
return {
|
||||||
|
itemKey: getDelayFirstValidValue(
|
||||||
|
submitOrderItemId,
|
||||||
|
`${item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || ''}_${skuText}_${maxCount}`,
|
||||||
|
),
|
||||||
orderItemId,
|
orderItemId,
|
||||||
|
parentOrderItemId,
|
||||||
|
submitOrderItemId,
|
||||||
picUrl: item?.picUrl || parentItem?.picUrl || '',
|
picUrl: item?.picUrl || parentItem?.picUrl || '',
|
||||||
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
|
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
|
||||||
skuText: formatSkuProperties(item?.properties),
|
skuText,
|
||||||
maxCount,
|
maxCount,
|
||||||
selectedCount: maxCount,
|
selectedCount: maxCount,
|
||||||
};
|
};
|
||||||
@@ -289,11 +321,11 @@
|
|||||||
.flatMap((item) => {
|
.flatMap((item) => {
|
||||||
const children = Array.isArray(item?.items) ? item.items : [];
|
const children = Array.isArray(item?.items) ? item.items : [];
|
||||||
if (children.length) {
|
if (children.length) {
|
||||||
return children.map((child) => createDelayShipmentItem(child, item));
|
return children.filter(Boolean).map((child) => createDelayShipmentItem(child, item));
|
||||||
}
|
}
|
||||||
return [createDelayShipmentItem(item)];
|
return [createDelayShipmentItem(item, item)];
|
||||||
})
|
})
|
||||||
.filter((item) => item.orderItemId > 0 && item.maxCount > 0);
|
.filter((item) => item.maxCount > 0);
|
||||||
};
|
};
|
||||||
const closeDelayShipmentPopup = () => {
|
const closeDelayShipmentPopup = () => {
|
||||||
delayPopupRef.value?.close();
|
delayPopupRef.value?.close();
|
||||||
@@ -301,7 +333,11 @@
|
|||||||
const onDelayShipmentCountChange = (index, value) => {
|
const onDelayShipmentCountChange = (index, value) => {
|
||||||
const current = delayShipmentItems.value[index];
|
const current = delayShipmentItems.value[index];
|
||||||
if (!current) return;
|
if (!current) return;
|
||||||
const next = Number(value || 0);
|
const next = Number(value);
|
||||||
|
if (!Number.isFinite(next)) {
|
||||||
|
current.selectedCount = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
|
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
|
||||||
};
|
};
|
||||||
const openDelayShipmentPopup = () => {
|
const openDelayShipmentPopup = () => {
|
||||||
@@ -315,10 +351,6 @@
|
|||||||
}
|
}
|
||||||
const nextItems = createDelayShipmentItems(state.orderInfo);
|
const nextItems = createDelayShipmentItems(state.orderInfo);
|
||||||
if (!nextItems.length) {
|
if (!nextItems.length) {
|
||||||
uni.showToast({
|
|
||||||
title: '未获取到可延迟商品',
|
|
||||||
icon: 'none',
|
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
delayShipmentItems.value = nextItems;
|
delayShipmentItems.value = nextItems;
|
||||||
@@ -333,15 +365,18 @@
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const hasSelectedCount = delayShipmentItems.value.some((item) => Number(item.selectedCount) > 0);
|
||||||
const items = delayShipmentItems.value
|
const items = delayShipmentItems.value
|
||||||
.filter((item) => Number(item.selectedCount) > 0)
|
.filter(
|
||||||
|
(item) => Number(item.selectedCount) > 0 && hasDelayOrderItemId(item.submitOrderItemId),
|
||||||
|
)
|
||||||
.map((item) => ({
|
.map((item) => ({
|
||||||
orderItemId: item.orderItemId,
|
orderItemId: item.submitOrderItemId,
|
||||||
count: Number(item.selectedCount),
|
count: Number(item.selectedCount),
|
||||||
}));
|
}));
|
||||||
if (!items.length) {
|
if (!items.length) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '请选择延迟发货数量',
|
title: hasSelectedCount ? '订单商品信息异常' : '请选择延迟发货数量',
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user