From 6e2656f9992a43a010bb0e6973868588a048e93e Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Wed, 21 Oct 2026 22:16:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=BA=E4=B8=B0=E6=9C=88=E7=BB=93?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A4=B1=E8=B4=A5=E6=97=B6=E5=8F=AA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=B8=80=E6=AC=A1=EF=BC=8C=E4=B8=94=E4=B8=8D=E6=8A=8A?= =?UTF-8?q?=E5=85=B6=E5=AE=83=E9=94=99=E8=AF=AF=E8=AF=B4=E6=88=90=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- web-admin/src/api/sf-express-settlement.ts | 3 ++- .../views/cell-storage/sf-express-settlement/index.vue | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/web-admin/src/api/sf-express-settlement.ts b/web-admin/src/api/sf-express-settlement.ts index d5e1d9c4..07b44202 100644 --- a/web-admin/src/api/sf-express-settlement.ts +++ b/web-admin/src/api/sf-express-settlement.ts @@ -22,7 +22,8 @@ export function fetchSfExpressSettlements(params: Record) { export function fetchSfExpressSettlementExport(params: Record) { return request.get<{ list: SfExpressSettlement[] }>({ url: '/web/admin/sample-freights/sf-settlements/export', - params + params, + showErrorMessage: false }) } diff --git a/web-admin/src/views/cell-storage/sf-express-settlement/index.vue b/web-admin/src/views/cell-storage/sf-express-settlement/index.vue index ae108a36..08483df4 100644 --- a/web-admin/src/views/cell-storage/sf-express-settlement/index.vue +++ b/web-admin/src/views/cell-storage/sf-express-settlement/index.vue @@ -412,11 +412,6 @@ async function handleExport() { try { const res = await fetchSfExpressSettlementExport(currentFilters()) - const code = (res as { code?: unknown })?.code - if (code != null && Number(code) !== 200) { - ElMessage.warning('没有可导出的数据') - return - } const body = (res as { data?: { list?: unknown } })?.data?.list ? (res as { data?: { list?: SfExpressSettlement[] } }).data : (res as { list?: SfExpressSettlement[] }) @@ -428,10 +423,11 @@ await saveSfExpressSettlementWorkbook(list as Array>) } catch (error: any) { const message = String(error?.message || '') - const code = error?.code - if (message.includes('没有可导出的数据') || (code != null && Number(code) !== 200)) { + if (message.includes('没有可导出的数据')) { ElMessage.warning('没有可导出的数据') + return } + ElMessage.error(message || '导出失败') } }