|
@@ -357,6 +357,16 @@ import { getToken } from "@/utils/auth";
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
|
|
|
+//自定义校验规则
|
|
|
|
+var checkIdCard = (rule, value, cb) => {
|
|
|
|
+ const regIdCard = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{8,}$/;
|
|
|
|
+
|
|
|
|
+ if (regIdCard.test(value)) {
|
|
|
|
+ return cb();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ cb(new Error('用户密码长度必须不少于8位且至少包含大写字母、小写字母、数字和特殊符号'));
|
|
|
|
+}
|
|
export default {
|
|
export default {
|
|
name: "User",
|
|
name: "User",
|
|
dicts: ['sys_normal_disable', 'sys_user_sex','sys_user_type'],
|
|
dicts: ['sys_normal_disable', 'sys_user_sex','sys_user_type'],
|
|
@@ -444,7 +454,7 @@ export default {
|
|
],
|
|
],
|
|
password: [
|
|
password: [
|
|
{ required: true, message: "用户密码不能为空", trigger: "blur" },
|
|
{ required: true, message: "用户密码不能为空", trigger: "blur" },
|
|
- { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
|
|
|
|
|
|
+ { validator: checkIdCard, trigger: 'blur' },
|
|
],
|
|
],
|
|
userType: [
|
|
userType: [
|
|
{ required: true, message: "用户类型不能为空", trigger:"" }
|
|
{ required: true, message: "用户类型不能为空", trigger:"" }
|
|
@@ -605,8 +615,8 @@ export default {
|
|
confirmButtonText: "确定",
|
|
confirmButtonText: "确定",
|
|
cancelButtonText: "取消",
|
|
cancelButtonText: "取消",
|
|
closeOnClickModal: false,
|
|
closeOnClickModal: false,
|
|
- inputPattern: /^.{5,20}$/,
|
|
|
|
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
|
|
|
|
|
|
+ inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{8,}$/,
|
|
|
|
+ inputErrorMessage: "用户密码长度必须不少于8位且至少包含大写字母、小写字母、数字和特殊符号"
|
|
}).then(({ value }) => {
|
|
}).then(({ value }) => {
|
|
resetUserPwd(row.userId, value).then(response => {
|
|
resetUserPwd(row.userId, value).then(response => {
|
|
this.$modal.msgSuccess("修改成功,新密码是:" + value);
|
|
this.$modal.msgSuccess("修改成功,新密码是:" + value);
|