diff --git a/package.json b/package.json index a056811..d9cdca2 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "clipboard": "2.0.8", "core-js": "^3.26.0", "crypto-js": "^4.0.0", + "dayjs": "^1.11.12", "echarts": "5.4.0", "element-ui": "2.15.12", "file-saver": "2.0.5", diff --git a/src/views/base/company/form/CompanyForm.vue b/src/views/base/company/form/CompanyForm.vue index a230f78..cc4d33d 100644 --- a/src/views/base/company/form/CompanyForm.vue +++ b/src/views/base/company/form/CompanyForm.vue @@ -58,12 +58,12 @@ - + - + @@ -148,8 +148,18 @@ export default { { required: true, message: '联系方式不能为空', trigger: 'blur' }, { pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,message: '请输入正确的联系方式', trigger: ["blur", "change"] }, ], - loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }], - password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }] + loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }, { + min: 4, + max: 16, + message: '管理员登录账号长度在4到16个字符', + trigger: 'blur' + }], + password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }, { + min: 4, + max: 16, + message: '管理员登录密码长度在4到16个字符', + trigger: 'blur' + }] } } }, diff --git a/src/views/company/property/position/index.vue b/src/views/company/property/position/index.vue index 71cc58b..df0dcad 100644 --- a/src/views/company/property/position/index.vue +++ b/src/views/company/property/position/index.vue @@ -2,14 +2,6 @@
- diff --git a/src/views/company/staff/form/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue index 471071c..abe803b 100644 --- a/src/views/company/staff/form/StaffForm.vue +++ b/src/views/company/staff/form/StaffForm.vue @@ -60,12 +60,12 @@ - + - + @@ -169,8 +169,18 @@ export default { workYear: [{required: true, message: "工龄不能为空", trigger: 'blur'}], joinedYear: [{required: true, message: "司龄不能为空", trigger: 'blur'}], education: [{required: true, message: "学历不能为空", trigger: 'blur'}], - loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }], - password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }], + loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }, { + min: 4, + max: 16, + message: '登录账号长度在4到16个字符', + trigger: 'blur' + }], + password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }, { + min: 4, + max: 16, + message: '登录密码长度在4到16个字符', + trigger: 'blur' + }], workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }], joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }], }, diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index a5515da..6992d93 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -88,8 +88,8 @@ @pagination="getList"/> - - + + @@ -104,11 +104,11 @@ - - + + - - + + @@ -183,8 +183,18 @@ export default { accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }], expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }], website: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }], - username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }], - password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }], + username: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }, { + min: 4, + max: 16, + message: '管理员登录账号长度在4到16个字符', + trigger: 'blur' + }], + password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }, { + min: 4, + max: 16, + message: '管理员登录密码长度在4到16个字符', + trigger: 'blur' + }] } }; },