Commit 0fd4eb053f571eb79d2978b0760f7e9df9facf97
1 parent
ac99dc05
费用导入功能测试完成
Showing
4 changed files
with
16 additions
and
10 deletions
src/api/fee/roomFeeImportApi.js
| @@ -48,10 +48,10 @@ export function importRoomFeeData(formData) { | @@ -48,10 +48,10 @@ export function importRoomFeeData(formData) { | ||
| 48 | if (res.code === 0) { | 48 | if (res.code === 0) { |
| 49 | resolve(res.data) | 49 | resolve(res.data) |
| 50 | } else { | 50 | } else { |
| 51 | - reject(new Error(res.msg)) | 51 | + reject(res.msg) |
| 52 | } | 52 | } |
| 53 | }).catch(error => { | 53 | }).catch(error => { |
| 54 | - reject(error) | 54 | + reject(error.response.data) |
| 55 | }) | 55 | }) |
| 56 | }) | 56 | }) |
| 57 | } | 57 | } |
src/components/fee/doImportCreateFee.vue
| @@ -83,7 +83,7 @@ export default { | @@ -83,7 +83,7 @@ export default { | ||
| 83 | this.$message.error(res.msg) | 83 | this.$message.error(res.msg) |
| 84 | } | 84 | } |
| 85 | }).catch(error => { | 85 | }).catch(error => { |
| 86 | - this.$message.error(error.message) | 86 | + this.$message.error(error.response.data) |
| 87 | }) | 87 | }) |
| 88 | }, | 88 | }, |
| 89 | 89 |
src/components/fee/exportFeeImportExcel.vue
| @@ -108,7 +108,7 @@ export default { | @@ -108,7 +108,7 @@ export default { | ||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | exportData(params).then(response => { | 110 | exportData(params).then(response => { |
| 111 | - this.$message.success(response.data.msg) | 111 | + this.$message.success(response.msg) |
| 112 | if (response.code === 0) { | 112 | if (response.code === 0) { |
| 113 | this.handleClose() | 113 | this.handleClose() |
| 114 | this.$router.push('/pages/property/downloadTempFile?tab=下载中心') | 114 | this.$router.push('/pages/property/downloadTempFile?tab=下载中心') |
src/components/fee/importRoomFee.vue
| @@ -113,14 +113,20 @@ export default { | @@ -113,14 +113,20 @@ export default { | ||
| 113 | formData.append('objType', this.form.objType) | 113 | formData.append('objType', this.form.objType) |
| 114 | formData.append('importAdapt', 'importRoomFee') | 114 | formData.append('importAdapt', 'importRoomFee') |
| 115 | 115 | ||
| 116 | - await importRoomFeeData(formData) | ||
| 117 | - this.$message.success(this.$t('importRoomFee.message.importSuccess')) | ||
| 118 | - this.$emit('success') | ||
| 119 | - this.visible = false | 116 | + const res = await importRoomFeeData(formData).catch(error => { |
| 117 | + return error | ||
| 118 | + }) | ||
| 119 | + if (res.code === 0) { | ||
| 120 | + this.$message.success(this.$t('importRoomFee.message.importSuccess')) | ||
| 121 | + this.$emit('success') | ||
| 122 | + this.visible = false | ||
| 123 | + } else { | ||
| 124 | + this.$message.error(res) | ||
| 125 | + } | ||
| 120 | }) | 126 | }) |
| 121 | } catch (error) { | 127 | } catch (error) { |
| 122 | - console.error('导入失败:', error) | ||
| 123 | - this.$message.error(error.response.data) | 128 | + console.log('error:', error) |
| 129 | + this.$message.error(error) | ||
| 124 | } finally { | 130 | } finally { |
| 125 | this.loading = false | 131 | this.loading = false |
| 126 | } | 132 | } |