|
|
@@ -14,7 +14,7 @@
|
|
|
type="text"
|
|
|
placeholder="请输入账户"
|
|
|
class="input"
|
|
|
- @blur="getOrgData"
|
|
|
+ @change="getOrgData"
|
|
|
@keyup.enter="loginFn"
|
|
|
v-model="account"
|
|
|
/>
|
|
|
@@ -31,9 +31,9 @@
|
|
|
<el-select class="input" :popper-append-to-body="false" v-model="org" placeholder="请选择">
|
|
|
<el-option
|
|
|
v-for="item in OrgOptions"
|
|
|
- :key="item.id"
|
|
|
+ :key="item.Uorg"
|
|
|
:label="item.name"
|
|
|
- :value="item.id">
|
|
|
+ :value="item.Uorg">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
@@ -92,6 +92,8 @@ export default {
|
|
|
let email = "";
|
|
|
const regEmail = new RegExp("^[A-Za-z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$");
|
|
|
let str = this.account.replace(/(^\s*)|(\s*$)/g, "");
|
|
|
+
|
|
|
+ // 判断用户输入账户带不带后缀
|
|
|
if (!regEmail.test(str)) {
|
|
|
email = str + orgValue;
|
|
|
} else {
|
|
|
@@ -147,6 +149,7 @@ export default {
|
|
|
// 输入账号获取组织
|
|
|
getOrgData(){
|
|
|
// console.log('111');
|
|
|
+
|
|
|
let params = [
|
|
|
{
|
|
|
functionName: API_CONFIG.ajax_liYuanOrg.functionName,
|
|
|
@@ -158,11 +161,14 @@ export default {
|
|
|
.post(API_CONFIG.baseUrl, params)
|
|
|
.then((res) => {
|
|
|
console.log('res',res);
|
|
|
+ this.org = ''
|
|
|
+ this.OrgOptions = ''
|
|
|
|
|
|
this.OrgOptions = res.data[0]
|
|
|
if (this.OrgOptions.length == 1) {
|
|
|
- this.org = this.OrgOptions[0].id
|
|
|
+ this.org = this.OrgOptions[0].Uorg
|
|
|
}
|
|
|
+
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
console.log(err);
|
|
|
@@ -254,6 +260,7 @@ export default {
|
|
|
.input >>> .el-input__inner{
|
|
|
border: none;
|
|
|
padding: 0;
|
|
|
+ border-radius: 15px;
|
|
|
}
|
|
|
/* 设置占位符文字颜色 */
|
|
|
.input::placeholder {
|
11wqe1