|
@@ -1062,14 +1062,27 @@ export default {
|
|
});
|
|
});
|
|
return; // 终止函数执行
|
|
return; // 终止函数执行
|
|
}
|
|
}
|
|
- this.person.account = this.person.account + this.SuffixData
|
|
|
|
- if (!/\S+@\S+\.\S+/.test(this.person.account)) {
|
|
|
|
|
|
+ let emailData = this.getEmailWithAt(this.person.account)
|
|
|
|
+
|
|
|
|
+ let zSuffix = ''
|
|
|
|
+
|
|
|
|
+ if (this.SuffixData && emailData) {
|
|
|
|
+ zSuffix = this.person.account.split('@')[0] + this.SuffixData
|
|
|
|
+ }else{
|
|
|
|
+ zSuffix = this.person.account + this.SuffixData
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ console.log('zSuffix',zSuffix);
|
|
|
|
+ // this.person.account
|
|
|
|
+
|
|
|
|
+ if (!/\S+@\S+\.\S+/.test(zSuffix)) {
|
|
this.$message.error("账号要填写邮箱格式");
|
|
this.$message.error("账号要填写邮箱格式");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
let params = {
|
|
let params = {
|
|
alias: this.person.name,
|
|
alias: this.person.name,
|
|
- username: this.person.account,
|
|
|
|
|
|
+ username: zSuffix,
|
|
org: this.person.selectedOrg,
|
|
org: this.person.selectedOrg,
|
|
oid: this.person.selectedSchool,
|
|
oid: this.person.selectedSchool,
|
|
ph: "",
|
|
ph: "",
|
|
@@ -1086,7 +1099,7 @@ export default {
|
|
uid: this.userid,
|
|
uid: this.userid,
|
|
cid: "",
|
|
cid: "",
|
|
type: "user_op",
|
|
type: "user_op",
|
|
- content: `添加了${this.person.name} 账号为${this.person.account}`,
|
|
|
|
|
|
+ content: `添加了${this.person.name} 账号为${zSuffix}`,
|
|
});
|
|
});
|
|
this.$message({
|
|
this.$message({
|
|
type: "success",
|
|
type: "success",
|