diff --git a/src/api/fee/addProxyFeeApi.js b/src/api/fee/addProxyFeeApi.js index 7ed563aaa..cf5aeeef7 100644 --- a/src/api/fee/addProxyFeeApi.js +++ b/src/api/fee/addProxyFeeApi.js @@ -27,11 +27,7 @@ export function listFeeConfigs(params) { params }).then(response => { const res = response.data - if (res.code === 0) { resolve(res) - } else { - reject(new Error(res.msg || 'Failed to list fee configs')) - } }).catch(error => { reject(error) }) diff --git a/src/components/fee/addProxyFee.vue b/src/components/fee/addProxyFee.vue index 1796dfbc9..f5f6e8dd9 100644 --- a/src/components/fee/addProxyFee.vue +++ b/src/components/fee/addProxyFee.vue @@ -153,7 +153,7 @@ export default { computingFormula: '6006', valid: '1' }).then(response => { - this.feeConfigOptions = response.data.feeConfigs + this.feeConfigOptions = response.feeConfigs }) }, @@ -235,8 +235,8 @@ export default { saveProxyFee(params).then(() => { - this.$message.success(this.$t('addProxyFee.successMessage')) - this.$emit('success') + this.$message.success(this.$t('addProxyFee.successMessage')) + this.$emit('success') this.handleClose() }).catch(error => { this.$message.error(error.message) @@ -246,7 +246,7 @@ export default { resetForm() { if (this.$refs.form) { - this.$refs.form.resetFields() + //this.$refs.form.resetFields() } this.formData = { remark: '', diff --git a/src/utils/dateUtil.js b/src/utils/dateUtil.js index a2eb7bb24..14e93892f 100644 --- a/src/utils/dateUtil.js +++ b/src/utils/dateUtil.js @@ -24,6 +24,32 @@ export function getDateYYYYMMDDHHMISS (){ return year + "" + month + "" + day + "" + hour + "" + minute + "" + second; } +export function getDateStr() { + let date = new Date(); + let year = date.getFullYear(); + let month = date.getMonth() + 1; + let day = date.getDate(); + let hour = date.getHours(); + let minute = date.getMinutes(); + let second = date.getSeconds(); + if (month < 10) { + month = '0' + month; + } + if (day < 10) { + day = '0' + day; + } + if (hour < 10) { + hour = '0' + hour; + } + if (minute < 10) { + minute = '0' + minute; + } + if (second < 10) { + second = '0' + second; + } + return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second; +} + export function getDateYYYYMMDD() { let date = new Date(); let year = date.getFullYear(); diff --git a/src/views/fee/payFeeOrderList.vue b/src/views/fee/payFeeOrderList.vue index a8b88e054..1a9b506de 100644 --- a/src/views/fee/payFeeOrderList.vue +++ b/src/views/fee/payFeeOrderList.vue @@ -105,7 +105,7 @@ + :placeholder="$t('payFeeOrder.paymentTimePlaceholder')" style="width: 100%;"> @@ -213,9 +213,10 @@ import ViewRoomData from '@/components/fee/viewRoomData' import ViewFeeData from '@/components/fee/viewFeeData' import ViewFeeConfigData from '@/components/fee/viewFeeConfigData' import { listFeeObj } from '@/api/fee/payFeeOrderApi' -import { dateAdd, dateSub, addMonth } from '@/utils/dateUtil' +import { dateAdd, dateSub, addMonth,getDateStr } from '@/utils/dateUtil' import { copyObject } from '@/utils/vc' + export default { name: 'PayFeeOrderList', components: { @@ -266,7 +267,7 @@ export default { scale: 1, decimalPlace: 2, receivedAmountSwitch: '1', - createTime: new Date().toISOString().slice(0, 19).replace('T', ' '), + createTime: getDateStr(), accountAmount: 0.0, viewAccountAmount: 0.0, deductionAmount: 0.0, diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue index 1cc6ee1b2..3f680715a 100644 --- a/src/views/user/login/Login.vue +++ b/src/views/user/login/Login.vue @@ -44,8 +44,8 @@ export default { logo: '', companyName:'', loginForm: { - username: 'wuxw', - passwd: 'admin', + username: '', + passwd: '', validateCode: '' }, captchaUrl: '',