This commit is contained in:
2026-09-20 16:02:10 +08:00
parent 375e5e53ce
commit 486d5163b2
2 changed files with 3 additions and 4 deletions
-2
View File
@@ -22,8 +22,6 @@ declare module 'vue' {
ElCard: typeof import('element-plus/es')['ElCard'] ElCard: typeof import('element-plus/es')['ElCard']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCollapse: typeof import('element-plus/es')['ElCollapse']
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -173,12 +173,13 @@ const relabelInboundOptions = computed(() => {
for (const candidate of relabelCandidates.value) { for (const candidate of relabelCandidates.value) {
const value = candidate.sourceType === 'RETURN_CARTON' ? `RETURN_CARTON:${candidate.returnCartonId}` : String(candidate.inboundOrderId) const value = candidate.sourceType === 'RETURN_CARTON' ? `RETURN_CARTON:${candidate.returnCartonId}` : String(candidate.inboundOrderId)
const current = grouped.get(value) const current = grouped.get(value)
if (current) current.availablePackages += candidate.availablePackages const availablePackages = Number(candidate.availablePackages)
if (current) current.availablePackages += Number.isFinite(availablePackages) ? availablePackages : 0
else grouped.set(value, { else grouped.set(value, {
value, value,
inboundOrderNo: candidate.sourceType === 'RETURN_CARTON' ? `退货合箱 ${candidate.cartonMark || '—'}` : (candidate.inboundOrderNo || '—'), inboundOrderNo: candidate.sourceType === 'RETURN_CARTON' ? `退货合箱 ${candidate.cartonMark || '—'}` : (candidate.inboundOrderNo || '—'),
inboundCode: candidate.sourceType === 'RETURN_CARTON' ? '仓库唛头库存' : (candidate.inboundCode || '—'), inboundCode: candidate.sourceType === 'RETURN_CARTON' ? '仓库唛头库存' : (candidate.inboundCode || '—'),
availablePackages: candidate.availablePackages, availablePackages: Number.isFinite(availablePackages) ? availablePackages : 0,
}) })
} }
return [...grouped.values()] return [...grouped.values()]