Compare commits

..

No commits in common. "fe64feac80ab9754acdc81cbb17cd91938f037bd" and "6187c585ad1945215f3023d6cad99d15d742d3cf" have entirely different histories.

2 changed files with 20 additions and 25 deletions

View File

@ -92,13 +92,8 @@ router.beforeEach(async (to, from, next) => {
await store.dispatch('user/getUserInfo')
const accessRoutes = await store.dispatch('permission/generateRoutes')
resetRouter()
if (accessRoutes.length > 0) {
router.addRoutes(accessRoutes)
next({ ...to, replace: true })
} else {
next()
}
router.addRoutes(accessRoutes)
next({ ...to, replace: true })
} catch (error) {
console.log(error)
// 删除token并进入登录页面以重新登录

View File

@ -178,7 +178,7 @@ export default {
updateUser(this.user)
.then((res) => {
this.isDisabled = false
this.$message.success(this.$t("common:message:updatedSuccessfully"))
this.$message.success('Updated successfully')
})
.catch(() => {
this.isDisabled = false
@ -190,7 +190,7 @@ export default {
this.user.Id = res.Result.Id
this.user.UserCode = res.Result.UserCode
this.$emit('getUserId', res.Result.Id)
this.$message.success(this.$t("common:message:addedSuccessfully"))
this.$message.success('Added successfully')
this.$router.push({ path: '/system/user/list' })
})
.catch(() => {
@ -308,63 +308,63 @@ export default {
UserWorkLanguage: [
{
required: true,
message: this.$t("common:ruleMessage:select"),
message: 'Please Select',
trigger: ['blur', 'change'],
},
],
Roles: [
{
required: true,
message: this.$t("common:ruleMessage:select"),
message: 'Please Select',
trigger: ['blur', 'change'],
},
],
IsZhiZhun: [
{
required: true,
message: this.$t("common:ruleMessage:select"),
message: 'Please Select',
trigger: ['blur', 'change'],
},
],
OrganizationName: [
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
{ required: true, message: 'Please specify', trigger: 'blur' },
],
LastName: [
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
{ required: true, message: 'Please specify', trigger: 'blur' },
{ max: 50, message: 'The maximum length is 50' },
],
FirstName: [
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
{ required: true, message: 'Please specify', trigger: 'blur' },
{ max: 50, message: 'The maximum length is 50' },
],
Phone: [
{
max: 20,
min: 7,
message: this.$t("system:userInfo:ruleMessage:length7to20"),
message: 'The length is 7 to 20',
trigger: ['blur'],
},
],
EMail: [
{
required: true,
message: this.$t("common:ruleMessage:specify"),
message: 'Please input the email address',
trigger: 'blur',
},
{
// type: 'email',
pattern: new RegExp(this.$reg().EmailRegexStr),
message: this.$t("trials:site:ruleMessage:correctEmail"),
message: 'Please input the correct email address',
trigger: ['blur'],
},
{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
{ max: 50, message: 'The maximum length is 50' },
],
Sex: [{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' }],
Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
Status: [
{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
{ required: true, message: 'Please specify', trigger: 'blur' },
],
DepartmentName: [{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") }],
PositionName: [{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") }],
DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
PositionName: [{ max: 50, message: 'The maximum length is 50' }],
},
userTypeOptions: [],
isDisabled: false,