Browse Source

荔园登录修改

11wqe1 2 days ago
parent
commit
1b4656b2c7
1 changed files with 10 additions and 10 deletions
  1. 10 10
      src/views/login/loginPage.vue

+ 10 - 10
src/views/login/loginPage.vue

@@ -479,19 +479,19 @@ export default {
 						if (this.OrgOptions.length == 1) {
 							this.org = this.OrgOptions[0].Uorg;
 						} else if (this.OrgOptions.length > 0) {
-							this.$message.error("该账号须使用“组织号登陆”");
-							this.loginType = 'orgL'
+							
 							// liyuan走这里
-							// if(this.allowOrgList.findIndex((i) => i.area) != -1){
-							// 	console.log('1111');
+							if(this.allowOrgList.findIndex((i) => i.area) != -1){
+								console.log('1111');
 								
-							// 	let _index = this.allowOrgList.findIndex((i) => i.area);
-							// 	let _list = this.allowOrgList[_index].list;
-							// 	this.org = this.OrgOptions.filter(i=>_list.includes(i.id))[0].Uorg;
-							// }else{
+								let _index = this.allowOrgList.findIndex((i) => i.area);
+								let _list = this.allowOrgList[_index].list;
+								this.org = this.OrgOptions.filter(i=>_list.includes(i.id))[0].Uorg;
+							}else{
 							// 	// admin走这里
 							// 	console.log('2222');
-
+								this.$message.error("该账号须使用“组织号登陆”");
+								this.loginType = 'orgL'
 							// 	let mergedList = this.allowOrgList.reduce((acc, curr) => {
 							// 	return [...acc, ...curr.list];
 							// 	}, []);
@@ -504,7 +504,7 @@ export default {
 							// 	this.org = "@cocorobo.cc";
 							// } else {
 							// 	this.org = this.OrgOptions[0].Uorg;
-							// }
+							}
 						}
 						resolve();
 					})