|
@@ -210,7 +210,7 @@ export default {
|
|
|
|
|
|
let str = this.account.replace(/(^\s*)|(\s*$)/g, "");
|
|
|
|
|
|
- if (!regEmail.test(str)) {
|
|
|
+ if (!this.org) {
|
|
|
return this.$message.error(
|
|
|
"请在账号后添加组织后缀(账号@组织号.com 如:123456@cocorobo.com)"
|
|
|
);
|
|
@@ -219,8 +219,8 @@ export default {
|
|
|
if (this.allowOrgList.findIndex((i) => i.area) != -1) {
|
|
|
let _index = this.allowOrgList.findIndex((i) => i.area);
|
|
|
let _list = this.allowOrgList[_index].list;
|
|
|
- if (
|
|
|
- !_list.includes(this.OrgOptions.find((i) => i.Uorg == this.org).id)
|
|
|
+ console.log(this.OrgOptions)
|
|
|
+ if (this.OrgOptions.find((i) => i.Uorg == this.org) && !_list.includes(this.OrgOptions.find((i) => i.Uorg == this.org).id)
|
|
|
) {
|
|
|
return this.$message.error("该组织/学校不允许登录");
|
|
|
}
|
|
@@ -497,7 +497,7 @@ export default {
|
|
|
if (this.allowOrgList.findIndex((i) => i.area) != -1) {
|
|
|
let _index = this.allowOrgList.findIndex((i) => i.area);
|
|
|
let _list = this.allowOrgList[_index].list;
|
|
|
- if (
|
|
|
+ if (this.OrgOptions.find((i) => i.Uorg == this.org) &&
|
|
|
!_list.includes(
|
|
|
this.OrgOptions.find((i) => i.Uorg == this.org).id
|
|
|
)
|