|
|
@@ -518,6 +518,7 @@ export default {
|
|
|
"^[A-Za-z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"
|
|
|
);
|
|
|
|
|
|
+
|
|
|
// 组织号页面，没有账号后缀提示需要添加组织号
|
|
|
if (this.loginType == "orgL" && !this.org && !regEmail.test(str)) {
|
|
|
this.loading = false;
|
|
|
@@ -526,27 +527,24 @@ export default {
|
|
|
}
|
|
|
|
|
|
this.loading = true;
|
|
|
-
|
|
|
- // if (this.loginType != 'orgL') {
|
|
|
- // 返回2就是多账户,荔园提示联系管理员关闭多余账户，非荔园跳转组织号登录
|
|
|
- if ((await this.getOrgData()) == 2) {
|
|
|
- this.loading = false;
|
|
|
- return
|
|
|
- // return (this.loginType = "orgL");
|
|
|
- }
|
|
|
- // }
|
|
|
-
|
|
|
if (this.account.length <= 0) {
|
|
|
this.$message.error(this.lang.enteraccount);
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
if (this.password.length < 6 || /[\u4e00-\u9fa5]/.test(this.password)) {
|
|
|
this.$message.error(this.lang.passwordlength);
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|
|
|
+ // if (this.loginType != 'orgL') {
|
|
|
+ // 返回2就是多账户,荔园提示联系管理员关闭多余账户，非荔园跳转组织号登录
|
|
|
+ if ((await this.getOrgData()) == 2) {
|
|
|
+ this.loading = false;
|
|
|
+ return
|
|
|
+ // return (this.loginType = "orgL");
|
|
|
+ }
|
|
|
+ // }
|
|
|
|
|
|
// 荔园平台登录账号进行判断
|
|
|
if (this.allowOrgList.findIndex((i) => i.area) != -1) {
|
|
|
@@ -810,9 +808,22 @@ export default {
|
|
|
let _index = this.allowOrgList.findIndex((i) => i.area);
|
|
|
let _list = this.allowOrgList[_index].list;
|
|
|
// 赋值后缀
|
|
|
- this.org = this.OrgOptions.filter((i) =>
|
|
|
+ let liyuanAcc = this.OrgOptions.filter((i) =>
|
|
|
_list.includes(i.id)
|
|
|
- )[0].Uorg;
|
|
|
+ );
|
|
|
+
|
|
|
+ if(liyuanAcc.findIndex(e => e.rrole == 1)){
|
|
|
+ this.org = liyuanAcc.filter((i) =>
|
|
|
+ i.rrole == 1
|
|
|
+ )[0].Uorg
|
|
|
+ }else{
|
|
|
+ this.$message.error(
|
|
|
+ this.lang.liyuanAccMore
|
|
|
+ );
|
|
|
+ return resolve(2);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
|
this.loading = false
|
11wqe1