|
|
@@ -615,6 +615,7 @@ export default {
|
|
|
}, 300),
|
|
|
async loginFn() {
|
|
|
if (this.loading) return;
|
|
|
+ if (this.inpGetAccOrgNameloading) return this.$message.error('请等待组织识别');
|
|
|
|
|
|
// loginType == orgL为组织号登录
|
|
|
let str = this.account.replace(/(^\s*)|(\s*$)/g, "");
|
|
|
@@ -624,7 +625,7 @@ export default {
|
|
|
const regEmail = new RegExp(
|
|
|
"^[A-Za-z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"
|
|
|
);
|
|
|
- if (this.loginType == "default" && !this.org) {
|
|
|
+ if (this.loginType == "default" && !this.org && !regEmail.test(str)) {
|
|
|
this.loading = false;
|
|
|
// 请输入组织号
|
|
|
if (this.accOrgName.length == 0) {
|
|
|
@@ -679,7 +680,7 @@ export default {
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
|
}
|
|
|
|
|
|
- if (this.loginType == 'default' && !_list.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
+ if (this.loginType == 'default' && !_list.includes(this.accOrgName.find((i) => i.Uorg == this.org)) && !_list.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
this.loading = false;
|
|
|
// 账号不可登录，请使用您的专属网址
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
|
@@ -719,7 +720,7 @@ export default {
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
|
}
|
|
|
}
|
|
|
- if (this.loginType == 'default' && mergedList.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
+ if (this.loginType == 'default' && this.accOrgName.find((i) => i.Uorg == this.org) && mergedList.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
this.loading = false;
|
|
|
// 账号不可登录，请使用您的专属网址
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
11wqe1