|
@@ -336,7 +336,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div
|
|
<div
|
|
|
- @click="(loginType = 'default'), ((SuffixData = ''), (org = ''))"
|
|
|
|
|
|
|
+ @click="Seldefault"
|
|
|
v-if="['default', 'weChat', 'orgL', 'code'].includes(loginType)"
|
|
v-if="['default', 'weChat', 'orgL', 'code'].includes(loginType)"
|
|
|
>
|
|
>
|
|
|
<el-tooltip
|
|
<el-tooltip
|
|
@@ -532,6 +532,14 @@ export default {
|
|
|
this.SuffixData = '';
|
|
this.SuffixData = '';
|
|
|
this.icode = '';
|
|
this.icode = '';
|
|
|
this.logIdentity = 0;
|
|
this.logIdentity = 0;
|
|
|
|
|
+ this.accOrgName = []
|
|
|
|
|
+ },
|
|
|
|
|
+ Seldefault(){
|
|
|
|
|
+ this.loginType = 'default'
|
|
|
|
|
+ this.SuffixData = ''
|
|
|
|
|
+ this.org = ''
|
|
|
|
|
+ this.account=''
|
|
|
|
|
+ this.accOrgName = []
|
|
|
},
|
|
},
|
|
|
somp(val){
|
|
somp(val){
|
|
|
const element = document.getElementById(`group-${val}`);
|
|
const element = document.getElementById(`group-${val}`);
|
|
@@ -615,7 +623,7 @@ export default {
|
|
|
}, 300),
|
|
}, 300),
|
|
|
async loginFn() {
|
|
async loginFn() {
|
|
|
if (this.loading) return;
|
|
if (this.loading) return;
|
|
|
- if (this.inpGetAccOrgNameloading) return this.$message.error('请等待组织识别');
|
|
|
|
|
|
|
+ if (this.inpGetAccOrgNameloading && this.loginType == 'default') 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, "");
|
|
@@ -629,9 +637,9 @@ export default {
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
|
// 请输入组织号
|
|
// 请输入组织号
|
|
|
if (this.accOrgName.length == 0) {
|
|
if (this.accOrgName.length == 0) {
|
|
|
- return this.$message.error('请输入完整账号');
|
|
|
|
|
|
|
+ return this.$message.error(this.lang.completeaccountnumber);
|
|
|
}
|
|
}
|
|
|
- return this.$message.error('请选择登录组织');
|
|
|
|
|
|
|
+ return this.$message.error(this.lang.selectlogorg);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -894,6 +902,8 @@ export default {
|
|
|
},
|
|
},
|
|
|
// async inpGetAccOrgName(){
|
|
// async inpGetAccOrgName(){
|
|
|
inpGetAccOrgName: _.debounce(async function() {
|
|
inpGetAccOrgName: _.debounce(async function() {
|
|
|
|
|
+ if (this.loginType != 'default' && this.loginType != 'bind') return
|
|
|
|
|
+
|
|
|
if (!this.account) {
|
|
if (!this.account) {
|
|
|
this.accOrgName = []
|
|
this.accOrgName = []
|
|
|
}
|
|
}
|