Commit 35126b43cbc5668ce5aea85a083bfe099431b5a7
1 parent
0e21fc69
v1.9 修复车辆导入 报错提示不明显的bug
Showing
11 changed files
with
13 additions
and
13 deletions
src/api/car/listOwnerCarApi.js
| @@ -94,10 +94,10 @@ export function importData(data) { | @@ -94,10 +94,10 @@ export function importData(data) { | ||
| 94 | if (res.code === 0) { | 94 | if (res.code === 0) { |
| 95 | resolve(res) | 95 | resolve(res) |
| 96 | } else { | 96 | } else { |
| 97 | - reject(new Error(res.msg || '导入失败')) | 97 | + reject(res.msg) |
| 98 | } | 98 | } |
| 99 | }).catch(error => { | 99 | }).catch(error => { |
| 100 | - reject(error) | 100 | + reject(error.response.data) |
| 101 | }) | 101 | }) |
| 102 | }) | 102 | }) |
| 103 | } | 103 | } |
src/api/fee/carCreateFeeApi.js
| @@ -130,7 +130,7 @@ export function importCustomFee(data) { | @@ -130,7 +130,7 @@ export function importCustomFee(data) { | ||
| 130 | reject(new Error(res.msg || '导入自定义费用失败')) | 130 | reject(new Error(res.msg || '导入自定义费用失败')) |
| 131 | } | 131 | } |
| 132 | }).catch(error => { | 132 | }).catch(error => { |
| 133 | - reject(error) | 133 | + reject(error.response.data) |
| 134 | }) | 134 | }) |
| 135 | }) | 135 | }) |
| 136 | } | 136 | } |
| 137 | \ No newline at end of file | 137 | \ No newline at end of file |
src/api/fee/doImportCreateFeeApi.js
| @@ -14,10 +14,10 @@ export function importData(data) { | @@ -14,10 +14,10 @@ export function importData(data) { | ||
| 14 | if (res.code === 0) { | 14 | if (res.code === 0) { |
| 15 | resolve(res) | 15 | resolve(res) |
| 16 | } else { | 16 | } else { |
| 17 | - reject(new Error(res.msg || 'Failed to import data')) | 17 | + reject(res.msg) |
| 18 | } | 18 | } |
| 19 | }).catch(error => { | 19 | }).catch(error => { |
| 20 | - reject(error) | 20 | + reject(error.response.data) |
| 21 | }) | 21 | }) |
| 22 | }) | 22 | }) |
| 23 | } | 23 | } |
| 24 | \ No newline at end of file | 24 | \ No newline at end of file |
src/api/fee/meterWaterManageApi.js
| @@ -216,7 +216,7 @@ export function importMeterWaterData(data) { | @@ -216,7 +216,7 @@ export function importMeterWaterData(data) { | ||
| 216 | const res = response.data | 216 | const res = response.data |
| 217 | resolve(res) | 217 | resolve(res) |
| 218 | }).catch(error => { | 218 | }).catch(error => { |
| 219 | - reject(error) | 219 | + reject(error.response.data) |
| 220 | }) | 220 | }) |
| 221 | }) | 221 | }) |
| 222 | } | 222 | } |
src/api/system/historyFeeDetailImportApi.js
| @@ -17,7 +17,7 @@ export function importData(formData) { | @@ -17,7 +17,7 @@ export function importData(formData) { | ||
| 17 | }).then(response => { | 17 | }).then(response => { |
| 18 | resolve(response.data) | 18 | resolve(response.data) |
| 19 | }).catch(error => { | 19 | }).catch(error => { |
| 20 | - reject(error) | 20 | + reject(error.response.data) |
| 21 | }) | 21 | }) |
| 22 | }) | 22 | }) |
| 23 | } | 23 | } |
src/components/car/importOwnerCar.vue
| @@ -83,7 +83,7 @@ export default { | @@ -83,7 +83,7 @@ export default { | ||
| 83 | this.$router.push(`/views/system/assetImportLogDetail?logId=${response.logId}&logType=importOwnerCar`) | 83 | this.$router.push(`/views/system/assetImportLogDetail?logId=${response.logId}&logType=importOwnerCar`) |
| 84 | } catch (error) { | 84 | } catch (error) { |
| 85 | console.error('导入失败:', error) | 85 | console.error('导入失败:', error) |
| 86 | - this.$message.error(error.message || this.$t('listOwnerCar.importError')) | 86 | + this.$message.error(error ) |
| 87 | } finally { | 87 | } finally { |
| 88 | this.loading = false | 88 | this.loading = false |
| 89 | } | 89 | } |
src/components/fee/doImportCreateFee.vue
src/components/fee/importMeterWaterFee.vue
| @@ -192,7 +192,7 @@ export default { | @@ -192,7 +192,7 @@ export default { | ||
| 192 | this.dialogVisible = false | 192 | this.dialogVisible = false |
| 193 | this.$emit('success', res.logId) | 193 | this.$emit('success', res.logId) |
| 194 | } catch (error) { | 194 | } catch (error) { |
| 195 | - this.$message.error(error.response.data|| this.$t('common.importFailed')) | 195 | + this.$message.error(error) |
| 196 | } | 196 | } |
| 197 | }) | 197 | }) |
| 198 | } | 198 | } |
src/components/fee/importMeterWaterFee2.vue
| @@ -193,7 +193,7 @@ export default { | @@ -193,7 +193,7 @@ export default { | ||
| 193 | this.dialogVisible = false | 193 | this.dialogVisible = false |
| 194 | this.$emit('success', res.logId) | 194 | this.$emit('success', res.logId) |
| 195 | } catch (error) { | 195 | } catch (error) { |
| 196 | - this.$message.error(error.response.data || this.$t('common.importFailed')) | 196 | + this.$message.error(error) |
| 197 | } | 197 | } |
| 198 | }) | 198 | }) |
| 199 | } | 199 | } |
src/components/resource/importResourceStore.vue
| @@ -130,7 +130,7 @@ export default { | @@ -130,7 +130,7 @@ export default { | ||
| 130 | } | 130 | } |
| 131 | } catch (error) { | 131 | } catch (error) { |
| 132 | console.error('导入物品失败:', error) | 132 | console.error('导入物品失败:', error) |
| 133 | - this.$message.error(error.message || this.$t('resourceStoreManage.importFailed')) | 133 | + this.$message.error(error) |
| 134 | } finally { | 134 | } finally { |
| 135 | this.importing = false | 135 | this.importing = false |
| 136 | } | 136 | } |
src/views/system/historyFeeDetailImportList.vue
| @@ -121,7 +121,7 @@ export default { | @@ -121,7 +121,7 @@ export default { | ||
| 121 | this.$message.error(res.msg) | 121 | this.$message.error(res.msg) |
| 122 | } | 122 | } |
| 123 | } catch (error) { | 123 | } catch (error) { |
| 124 | - this.$message.error(this.$t('historyFeeDetailImport.importError')) | 124 | + this.$message.error(error) |
| 125 | } | 125 | } |
| 126 | }, | 126 | }, |
| 127 | validateForm() { | 127 | validateForm() { |