From ce1e6030fc33d66ca78916c0904ef67baee2620f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 10 Mar 2025 14:30:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:excel=E6=8A=A5=E9=94=99=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/Excel.vue                  |  9 ++++++---
 src/views/wallet/wallet-recharge-apply/index.vue | 10 +++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/Upload/Excel.vue b/src/components/Upload/Excel.vue
index eb7cb1e..8ba036f 100644
--- a/src/components/Upload/Excel.vue
+++ b/src/components/Upload/Excel.vue
@@ -40,10 +40,10 @@
 	<!--校验失败错误数据-->
 	<el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible" :close-on-click-modal="false" draggable>
 		<el-table :data="state.errorData">
-			<el-table-column property="row" align="center" :label="$t('excel.lineNumbers')" width="100" />
-			<el-table-column property="reasons" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
+			<el-table-column property="lineNum" align="center" :label="$t('excel.lineNumbers')" width="100" />
+			<el-table-column property="errors" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
 				<template v-slot="scope">
-					<el-tag type="danger" v-for="error in scope.row.reasons" :key="error">{{ error }}</el-tag>
+					<el-tag type="danger" v-for="error in scope.row.errors" :key="error">{{ error }}</el-tag>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -123,6 +123,9 @@ const handleFileSuccess = (response: any) => {
 		useMessage().error(response.msg ? response.msg : "导入失败，以下数据不合法")
 		state.errorVisible = true
 		state.errorData = response.data?.errors
+		if (!state.errorData && response.data) {
+			state.errorData = response.data
+		}
 		uploadRef.value.clearFiles()
 		// 刷新表格
 		emit?.("refreshDataList")
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 7dc45c4..639a8fa 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -78,7 +78,15 @@
 				<el-table-column prop="createTime" width="200" label="创建时间" />
 				<el-table-column label="操作" width="300" fixed="right">
 					<template #default="{ row }">
-						<el-button icon="Document" text type="primary" v-auth="'wallet_walletRechargeApply_edit'" @click="doInfo(row)">数据</el-button>
+						<el-button
+							v-if="row.importTime"
+							icon="Document"
+							text
+							type="primary"
+							v-auth="'wallet_walletRechargeApply_edit'"
+							@click="doInfo(row)"
+							>数据</el-button
+						>
 						<el-button
 							v-if="row.importTime && !row.processId"
 							icon="Connection"