邮箱校验修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
2b820a114b
commit
3b14944671
|
@ -275,6 +275,13 @@ async function VueInit() {
|
|||
}
|
||||
return companyName;
|
||||
}
|
||||
Vue.prototype.$reg = () => {
|
||||
if (localStorage.getItem('CompanyInfo')) {
|
||||
let { EmailRegexStr } = JSON.parse(localStorage.getItem('CompanyInfo'))
|
||||
return { EmailRegexStr }
|
||||
}
|
||||
return { EmailRegexStr: '/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/' };
|
||||
}
|
||||
Vue.prototype.$updateDictionary = function () {
|
||||
Vue.prototype.$d = function (code) {
|
||||
var dictInfo = res.Result
|
||||
|
|
|
@ -179,7 +179,8 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
{
|
||||
type: 'email',
|
||||
// type: 'email',
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: 'Please input the correct email address',
|
||||
trigger: ['blur'],
|
||||
},
|
||||
|
|
|
@ -164,6 +164,14 @@ export default {
|
|||
},
|
||||
},
|
||||
],
|
||||
Email: [
|
||||
{
|
||||
// type: 'email',
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: this.$t('rules:email'),
|
||||
trigger: 'blur,change',
|
||||
},
|
||||
]
|
||||
},
|
||||
userId: null,
|
||||
loading: false,
|
||||
|
|
|
@ -125,6 +125,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
|
|
@ -172,6 +172,13 @@ export default {
|
|||
],
|
||||
Phone: [
|
||||
{ required: true, validator: checkPhone, trigger: 'blur' }
|
||||
],
|
||||
Email: [
|
||||
{
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: 'Please input the correct email address',
|
||||
trigger: 'blur,change',
|
||||
}
|
||||
]
|
||||
},
|
||||
siteOptions: [],
|
||||
|
|
|
@ -117,6 +117,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.Email && reg.test(this.form.Email)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
|
|
@ -136,6 +136,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.Email && reg.test(this.form.Email)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
|
|
@ -158,6 +158,9 @@ export default {
|
|||
callback(new Error(this.$t('trials:researchForm:formRule:specify')))
|
||||
} else {
|
||||
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
|
||||
callback()
|
||||
} else {
|
||||
|
@ -170,6 +173,9 @@ export default {
|
|||
callback(new Error(this.$t('trials:researchForm:formRule:specify')))
|
||||
} else {
|
||||
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
|
||||
callback()
|
||||
} else {
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
<el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
|
||||
</el-form-item>
|
||||
<!-- 联系邮箱 -->
|
||||
<el-form-item :label="$t('trials:researchForm:form:contactorEmail')">
|
||||
<el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="Email">
|
||||
<el-input v-model="form.Email" disabled />
|
||||
</el-form-item>
|
||||
|
||||
|
@ -183,6 +183,13 @@ export default {
|
|||
],
|
||||
Phone: [
|
||||
{ required: true, validator: checkPhone, trigger: 'blur' }
|
||||
],
|
||||
Email: [
|
||||
{
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: 'Please input the correct email address',
|
||||
trigger: 'blur,change',
|
||||
}
|
||||
]
|
||||
},
|
||||
siteOptions: [],
|
||||
|
|
|
@ -108,6 +108,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.Email && reg.test(this.form.Email)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
|
|
@ -139,6 +139,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.Email && reg.test(this.form.Email)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
|
|
@ -131,6 +131,9 @@ export default {
|
|||
callback(new Error(this.$t('trials:researchForm:formRule:specify')))
|
||||
} else {
|
||||
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
|
||||
// this.sendDisabled = false
|
||||
callback()
|
||||
|
@ -145,6 +148,9 @@ export default {
|
|||
callback(new Error(this.$t('trials:researchForm:formRule:specify')))
|
||||
} else {
|
||||
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
|
||||
callback()
|
||||
} else {
|
||||
|
|
|
@ -110,6 +110,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
@ -125,6 +128,9 @@ export default {
|
|||
} else {
|
||||
var reg =
|
||||
/^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (
|
||||
this.form.ReplaceUserEmailOrPhone &&
|
||||
reg.test(this.form.ReplaceUserEmailOrPhone)
|
||||
|
|
|
@ -285,7 +285,8 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
{
|
||||
type: 'email',
|
||||
// type: 'email',
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: 'Please input the correct email address',
|
||||
trigger: 'blur,change',
|
||||
},
|
||||
|
|
|
@ -548,7 +548,8 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
{
|
||||
type: 'email',
|
||||
// type: 'email',
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: this.$t('rules:email'),
|
||||
trigger: 'blur,change',
|
||||
},
|
||||
|
|
|
@ -530,6 +530,9 @@ export default {
|
|||
emailList.forEach((item) => {
|
||||
var pattern =
|
||||
/^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
pattern = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (!pattern.test(item)) {
|
||||
isError = true
|
||||
}
|
||||
|
|
|
@ -439,7 +439,8 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
{
|
||||
type: 'email',
|
||||
// type: 'email',
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: 'Please input the correct email address',
|
||||
trigger: ['blur'],
|
||||
},
|
||||
|
|
|
@ -290,11 +290,8 @@ export default {
|
|||
handleEmailChange() {
|
||||
var reg =
|
||||
/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
|
||||
if (localStorage.getItem('CompanyInfo')) {
|
||||
let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'));
|
||||
if (CompanyInfo.EmailRegexStr) {
|
||||
reg = new RegExp(CompanyInfo.EmailRegexStr)
|
||||
}
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
|
||||
this.sendDisabled = false
|
||||
|
|
|
@ -535,7 +535,8 @@ export default {
|
|||
trigger: 'blur',
|
||||
},
|
||||
{
|
||||
type: 'email',
|
||||
// type: 'email',
|
||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||
message: this.$t('rules:email'),
|
||||
trigger: 'blur,change',
|
||||
},
|
||||
|
@ -610,6 +611,9 @@ export default {
|
|||
emailList.forEach((item) => {
|
||||
var pattern =
|
||||
/^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
pattern = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (!pattern.test(item)) {
|
||||
isError = true
|
||||
}
|
||||
|
|
|
@ -114,6 +114,9 @@ export default {
|
|||
callback(new Error(this.$t('common:ruleMessage:specify')))
|
||||
} else {
|
||||
var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.form.Email && reg.test(this.form.Email)) {
|
||||
this.sendDisabled = false
|
||||
callback()
|
||||
|
|
|
@ -438,11 +438,8 @@ export default {
|
|||
handleEmailChange() {
|
||||
var reg =
|
||||
/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
|
||||
if (localStorage.getItem('CompanyInfo')) {
|
||||
let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'));
|
||||
if (CompanyInfo.EmailRegexStr) {
|
||||
reg = new RegExp(CompanyInfo.EmailRegexStr)
|
||||
}
|
||||
if (this.$reg().EmailRegexStr) {
|
||||
reg = new RegExp(this.$reg().EmailRegexStr)
|
||||
}
|
||||
if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
|
||||
this.sendDisabled = false
|
||||
|
|
Loading…
Reference in New Issue