|
@@ -623,7 +623,7 @@ export default {
|
|
|
}, 300),
|
|
}, 300),
|
|
|
async loginFn() {
|
|
async loginFn() {
|
|
|
if (this.loading) return;
|
|
if (this.loading) return;
|
|
|
- if (this.inpGetAccOrgNameloading && this.loginType == 'default') return this.$message.error(this.lang.waitfororg);
|
|
|
|
|
|
|
+ if (this.inpGetAccOrgNameloading && (this.loginType == 'default' || this.loginType == 'bind')) return this.$message.error(this.lang.waitfororg);
|
|
|
|
|
|
|
|
// loginType == orgL为组织号登录
|
|
// loginType == orgL为组织号登录
|
|
|
let str = this.account.replace(/(^\s*)|(\s*$)/g, "");
|
|
let str = this.account.replace(/(^\s*)|(\s*$)/g, "");
|
|
@@ -688,7 +688,7 @@ export default {
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- 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)) {
|
|
|
|
|
|
|
+ if ((this.loginType == 'default' || this.loginType == 'bind') && !_list.includes(this.accOrgName.find((i) => i.Uorg == this.org)) && !_list.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
|
// 账号不可登录，请使用您的专属网址
|
|
// 账号不可登录，请使用您的专属网址
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
@@ -728,7 +728,7 @@ export default {
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (this.loginType == 'default' && this.accOrgName.find((i) => i.Uorg == this.org) && mergedList.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
|
|
|
|
+ if ((this.loginType == 'default' || this.loginType == 'bind') && this.accOrgName.find((i) => i.Uorg == this.org) && mergedList.includes(this.accOrgName.find((i) => i.Uorg == this.org).id)) {
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
|
// 账号不可登录，请使用您的专属网址
|
|
// 账号不可登录，请使用您的专属网址
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
@@ -930,9 +930,9 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
this.accOrgName = data
|
|
this.accOrgName = data
|
|
|
this.org = data.length === 1 ? data[0].Uorg : '';
|
|
this.org = data.length === 1 ? data[0].Uorg : '';
|
|
|
|
|
+ this.inpGetAccOrgNameloading = false
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- this.inpGetAccOrgNameloading = false
|
|
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
this.inpGetAccOrgNameloading = false
|
|
this.inpGetAccOrgNameloading = false
|
|
|
}
|
|
}
|
11wqe1