Commit fb7bc2c7b910beef6c5e667f6c78ed581f8d3044
1 parent
6e130fda
代码暂存
Showing
3 changed files
with
12 additions
and
9 deletions
src/api/fee/roomFeeImportApi.js
| @@ -45,11 +45,7 @@ export function importRoomFeeData(formData) { | @@ -45,11 +45,7 @@ export function importRoomFeeData(formData) { | ||
| 45 | } | 45 | } |
| 46 | }).then(response => { | 46 | }).then(response => { |
| 47 | const res = response.data | 47 | const res = response.data |
| 48 | - if (res.code === 0) { | ||
| 49 | - resolve(res.data) | ||
| 50 | - } else { | ||
| 51 | - reject(res.msg) | ||
| 52 | - } | 48 | + resolve(res) |
| 53 | }).catch(error => { | 49 | }).catch(error => { |
| 54 | reject(error.response.data) | 50 | reject(error.response.data) |
| 55 | }) | 51 | }) |
src/components/fee/importRoomFee.vue
| @@ -118,10 +118,17 @@ export default { | @@ -118,10 +118,17 @@ export default { | ||
| 118 | }) | 118 | }) |
| 119 | if (res.code === 0) { | 119 | if (res.code === 0) { |
| 120 | this.$message.success(this.$t('importRoomFee.message.importSuccess')) | 120 | this.$message.success(this.$t('importRoomFee.message.importSuccess')) |
| 121 | - this.$emit('success') | ||
| 122 | this.visible = false | 121 | this.visible = false |
| 122 | + this.$emit('success') | ||
| 123 | + this.$router.push({ | ||
| 124 | + path: '/views/system/assetImportLogDetail', | ||
| 125 | + query: { | ||
| 126 | + logId: res.data.logId, | ||
| 127 | + logType: 'importRoomFee' | ||
| 128 | + } | ||
| 129 | + }) | ||
| 123 | } else { | 130 | } else { |
| 124 | - this.$message.error(res) | 131 | + this.$message.error(res.msg) |
| 125 | } | 132 | } |
| 126 | }) | 133 | }) |
| 127 | } catch (error) { | 134 | } catch (error) { |
src/views/user/login/Login.vue
| @@ -44,8 +44,8 @@ export default { | @@ -44,8 +44,8 @@ export default { | ||
| 44 | logo: '', | 44 | logo: '', |
| 45 | companyName:'', | 45 | companyName:'', |
| 46 | loginForm: { | 46 | loginForm: { |
| 47 | - username: 'wuxw', | ||
| 48 | - passwd: 'admin', | 47 | + username: '', |
| 48 | + passwd: '', | ||
| 49 | validateCode: '' | 49 | validateCode: '' |
| 50 | }, | 50 | }, |
| 51 | captchaUrl: '', | 51 | captchaUrl: '', |