From 486d5163b272838fa0c1667b09748f4b6f2939ea Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Sun, 20 Sep 2026 16:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components.d.ts | 2 -- .../overseas-warehouse/views/WarehouseServiceView.vue | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components.d.ts b/src/components.d.ts index bcd7883..c3c224a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -22,8 +22,6 @@ declare module 'vue' { ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] 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'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue index fd5addf..9f77cf2 100644 --- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue +++ b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue @@ -173,12 +173,13 @@ const relabelInboundOptions = computed(() => { for (const candidate of relabelCandidates.value) { const value = candidate.sourceType === 'RETURN_CARTON' ? `RETURN_CARTON:${candidate.returnCartonId}` : String(candidate.inboundOrderId) 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, { value, inboundOrderNo: candidate.sourceType === 'RETURN_CARTON' ? `退货合箱 ${candidate.cartonMark || '—'}` : (candidate.inboundOrderNo || '—'), inboundCode: candidate.sourceType === 'RETURN_CARTON' ? '仓库唛头库存' : (candidate.inboundCode || '—'), - availablePackages: candidate.availablePackages, + availablePackages: Number.isFinite(availablePackages) ? availablePackages : 0, }) } return [...grouped.values()]