Commit f57bd13c authored by cx49085's avatar cx49085
Browse files

fix conflict

parent a64ffdaf
...@@ -89,7 +89,7 @@ export function bankAccountValid(rule, value, callback) { ...@@ -89,7 +89,7 @@ export function bankAccountValid(rule, value, callback) {
// 电话号码验证 // 电话号码验证
export function checkPhone(rule, value, callback) { export function checkPhone(rule, value, callback) {
if (!value) { if (!value) {
console.log(1) // console.log(1)
return callback(new Error('手机号不能为空')); return callback(new Error('手机号不能为空'));
} else { } else {
const reg = /(^1\d{10}$)|(^[0-9]\d{7}$)/ const reg = /(^1\d{10}$)|(^[0-9]\d{7}$)/
......
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
} else { } else {
this.$router.back() this.$router.back()
} }
console.log(1) // console.log(1)
}, },
methods: { methods: {
back(){ back(){
......
...@@ -181,6 +181,7 @@ export default { ...@@ -181,6 +181,7 @@ export default {
this.checkedRow = { ...data } this.checkedRow = { ...data }
} else { } else {
this.checkedRow = {} this.checkedRow = {}
this.$refs.dialogForm.resetFields()
} }
if (dialogVisible === 'drawerVisible') { if (dialogVisible === 'drawerVisible') {
this.drawerVisible = true this.drawerVisible = true
...@@ -188,7 +189,6 @@ export default { ...@@ -188,7 +189,6 @@ export default {
return return
} }
this.dialogVisible = dialogVisible this.dialogVisible = dialogVisible
this.$refs.dialogForm.resetFields()
}, },
getRepayDetailList() { getRepayDetailList() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment