Compare commits
33 Commits
303fb22e11
...
b0fcf37835
| Author | SHA1 | Date |
|---|---|---|
|
|
b0fcf37835 | |
|
|
22ac496d7b | |
|
|
45c0e5030b | |
|
|
36e23b8135 | |
|
|
b530f68446 | |
|
|
383bfabae8 | |
|
|
196ed7f993 | |
|
|
70cc0027cd | |
|
|
975b7d39a7 | |
|
|
21bcd1fddb | |
|
|
04bbde8583 | |
|
|
f3c4bedbfd | |
|
|
835aedc800 | |
|
|
9026b1d7fd | |
|
|
b8f96efa66 | |
|
|
4c4f68dbd0 | |
|
|
11c56d2f7a | |
|
|
a72521304e | |
|
|
8baf6cb88f | |
|
|
71e04c3bf1 | |
|
|
1af9b48622 | |
|
|
447b74fa55 | |
|
|
c633fbcf87 | |
|
|
1cc57ad1d6 | |
|
|
f282fdfabc | |
|
|
d77c6ecf03 | |
|
|
1db75cf4f7 | |
|
|
7bc70bfd6c | |
|
|
69ba30e5a9 | |
|
|
18482ddaa9 | |
|
|
14e2afcfee | |
|
|
39dadbbf47 | |
|
|
d0ba340fea |
|
|
@ -178,7 +178,7 @@ export default {
|
||||||
updateUser(this.user)
|
updateUser(this.user)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
this.isDisabled = false
|
this.isDisabled = false
|
||||||
this.$message.success('Updated successfully')
|
this.$message.success(this.$t("common:message:updatedSuccessfully"))
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
this.isDisabled = false
|
this.isDisabled = false
|
||||||
|
|
@ -190,7 +190,7 @@ export default {
|
||||||
this.user.Id = res.Result.Id
|
this.user.Id = res.Result.Id
|
||||||
this.user.UserCode = res.Result.UserCode
|
this.user.UserCode = res.Result.UserCode
|
||||||
this.$emit('getUserId', res.Result.Id)
|
this.$emit('getUserId', res.Result.Id)
|
||||||
this.$message.success('Added successfully')
|
this.$message.success(this.$t("common:message:addedSuccessfully"))
|
||||||
this.$router.push({ path: '/system/user/list' })
|
this.$router.push({ path: '/system/user/list' })
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
|
|
@ -308,63 +308,63 @@ export default {
|
||||||
UserWorkLanguage: [
|
UserWorkLanguage: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: 'Please Select',
|
message: this.$t("common:ruleMessage:select"),
|
||||||
trigger: ['blur', 'change'],
|
trigger: ['blur', 'change'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
Roles: [
|
Roles: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: 'Please Select',
|
message: this.$t("common:ruleMessage:select"),
|
||||||
trigger: ['blur', 'change'],
|
trigger: ['blur', 'change'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
IsZhiZhun: [
|
IsZhiZhun: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: 'Please Select',
|
message: this.$t("common:ruleMessage:select"),
|
||||||
trigger: ['blur', 'change'],
|
trigger: ['blur', 'change'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
OrganizationName: [
|
OrganizationName: [
|
||||||
{ required: true, message: 'Please specify', trigger: 'blur' },
|
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
|
||||||
],
|
],
|
||||||
LastName: [
|
LastName: [
|
||||||
{ required: true, message: 'Please specify', trigger: 'blur' },
|
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
|
||||||
{ max: 50, message: 'The maximum length is 50' },
|
{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
|
||||||
],
|
],
|
||||||
FirstName: [
|
FirstName: [
|
||||||
{ required: true, message: 'Please specify', trigger: 'blur' },
|
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
|
||||||
{ max: 50, message: 'The maximum length is 50' },
|
{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
|
||||||
],
|
],
|
||||||
Phone: [
|
Phone: [
|
||||||
{
|
{
|
||||||
max: 20,
|
max: 20,
|
||||||
min: 7,
|
min: 7,
|
||||||
message: 'The length is 7 to 20',
|
message: this.$t("system:userInfo:ruleMessage:length7to20"),
|
||||||
trigger: ['blur'],
|
trigger: ['blur'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
EMail: [
|
EMail: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: 'Please input the email address',
|
message: this.$t("common:ruleMessage:specify"),
|
||||||
trigger: 'blur',
|
trigger: 'blur',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// type: 'email',
|
// type: 'email',
|
||||||
pattern: new RegExp(this.$reg().EmailRegexStr),
|
pattern: new RegExp(this.$reg().EmailRegexStr),
|
||||||
message: 'Please input the correct email address',
|
message: this.$t("trials:site:ruleMessage:correctEmail"),
|
||||||
trigger: ['blur'],
|
trigger: ['blur'],
|
||||||
},
|
},
|
||||||
{ max: 50, message: 'The maximum length is 50' },
|
{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
|
||||||
],
|
],
|
||||||
Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
|
Sex: [{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' }],
|
||||||
Status: [
|
Status: [
|
||||||
{ required: true, message: 'Please specify', trigger: 'blur' },
|
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
|
||||||
],
|
],
|
||||||
DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
|
DepartmentName: [{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") }],
|
||||||
PositionName: [{ max: 50, message: 'The maximum length is 50' }],
|
PositionName: [{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") }],
|
||||||
},
|
},
|
||||||
userTypeOptions: [],
|
userTypeOptions: [],
|
||||||
isDisabled: false,
|
isDisabled: false,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue