From 0fd4eb053f571eb79d2978b0760f7e9df9facf97 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 14 Jul 2025 10:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=AF=BC=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/fee/roomFeeImportApi.js             |  4 ++--
 src/components/fee/doImportCreateFee.vue    |  2 +-
 src/components/fee/exportFeeImportExcel.vue |  2 +-
 src/components/fee/importRoomFee.vue        | 18 ++++++++++++------
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/api/fee/roomFeeImportApi.js b/src/api/fee/roomFeeImportApi.js
index feb847207..077b55021 100644
--- a/src/api/fee/roomFeeImportApi.js
+++ b/src/api/fee/roomFeeImportApi.js
@@ -48,10 +48,10 @@ export function importRoomFeeData(formData) {
       if (res.code === 0) {
         resolve(res.data)
       } else {
-        reject(new Error(res.msg))
+        reject(res.msg)
       }
     }).catch(error => {
-      reject(error)
+      reject(error.response.data)
     })
   })
 }
diff --git a/src/components/fee/doImportCreateFee.vue b/src/components/fee/doImportCreateFee.vue
index 035fae6e7..11d5bd224 100644
--- a/src/components/fee/doImportCreateFee.vue
+++ b/src/components/fee/doImportCreateFee.vue
@@ -83,7 +83,7 @@ export default {
           this.$message.error(res.msg)
         }
       }).catch(error => {
-        this.$message.error(error.message)
+        this.$message.error(error.response.data)
       })
     },
 
diff --git a/src/components/fee/exportFeeImportExcel.vue b/src/components/fee/exportFeeImportExcel.vue
index 8005c68dd..29c6e0ee9 100644
--- a/src/components/fee/exportFeeImportExcel.vue
+++ b/src/components/fee/exportFeeImportExcel.vue
@@ -108,7 +108,7 @@ export default {
       }
 
       exportData(params).then(response => {
-        this.$message.success(response.data.msg)
+        this.$message.success(response.msg)
         if (response.code === 0) {
           this.handleClose()
           this.$router.push('/pages/property/downloadTempFile?tab=下载中心')
diff --git a/src/components/fee/importRoomFee.vue b/src/components/fee/importRoomFee.vue
index 04fd6aa72..07b6cef49 100644
--- a/src/components/fee/importRoomFee.vue
+++ b/src/components/fee/importRoomFee.vue
@@ -113,14 +113,20 @@ export default {
           formData.append('objType', this.form.objType)
           formData.append('importAdapt', 'importRoomFee')
 
-          await importRoomFeeData(formData)
-          this.$message.success(this.$t('importRoomFee.message.importSuccess'))
-          this.$emit('success')
-          this.visible = false
+          const res = await importRoomFeeData(formData).catch(error => {
+            return error
+          })
+          if (res.code === 0) {
+            this.$message.success(this.$t('importRoomFee.message.importSuccess'))
+            this.$emit('success')
+            this.visible = false
+          } else {
+            this.$message.error(res)
+          }
         })
       } catch (error) {
-        console.error('导入失败:', error)
-        this.$message.error(error.response.data)
+        console.log('error:', error)
+        this.$message.error(error)
       } finally {
         this.loading = false
       }