diff --git a/oms_web/oms_vue/src/views/login.vue b/oms_web/oms_vue/src/views/login.vue index 38bbc9e7..996992f2 100644 --- a/oms_web/oms_vue/src/views/login.vue +++ b/oms_web/oms_vue/src/views/login.vue @@ -88,7 +88,7 @@ export default { }, loading: false, // 验证码开关 - captchaEnabled: true, + captchaEnabled: false, // 注册开关 register: false, redirect: undefined @@ -103,7 +103,7 @@ export default { } }, created() { - this.getCode() + // this.getCode() this.getCookie() }, methods: { diff --git a/oms_web/oms_vue/src/views/system/partner/index.vue b/oms_web/oms_vue/src/views/system/partner/index.vue index a0bf9b33..7c81ab15 100644 --- a/oms_web/oms_vue/src/views/system/partner/index.vue +++ b/oms_web/oms_vue/src/views/system/partner/index.vue @@ -300,7 +300,19 @@ export default { { required: true, message: "系统用户不能为空", trigger: "blur" } ], contactEmail: [ - { required: true, message: "邮件不能为空", trigger: "blur" } + { + validator: (rule, value, callback) => { + if (this.form.level === '04') { + callback(); + } else { + if (!value) { + callback(new Error("邮件不能为空")); + } else { + callback(); + } + } + }, trigger: "blur" + } ], province: [ { required: true, message: "省份不能为空", trigger: "change" } @@ -465,6 +477,9 @@ export default { handleUserSelected(user) { this.form.systemUserName = user.userName; this.form.systemUserId = user.userId; + this.$set(this.form, 'contactPerson', this.form.contactPerson || user.userName || '') + this.form.contactPhone = this.form.contactPhone || user.phonenumber || ''; + this.form.contactEmail = this.form.contactEmail || user.email || ''; this.selectUserVisible = false; } }