密码修改

src/utils/params.js

@@ -119,7 +119,7 @@ const zdjbxx = [
   {
     name: "阵地经度:",
     id: "zdjd",
-    type: "textDt",
+    type: "text",
     value: "",
     prop: "checkEmpty",
     placeholder: "请输入",
@@ -128,7 +128,7 @@ const zdjbxx = [
   {
     name: "阵地纬度:",
     id: "zdwd",
-    type: "textDt",
+    type: "text",
     value: "",
     prop: "checkEmpty",
     placeholder: "请输入",
@@ -232,7 +232,7 @@ const zdglryxx = [
   {
     name: "证件号码:",
     id: "zjhm",
-    type: "textTqs",
+    type: "text",
     disabled: false,
     prop: "checkEmpty",
     value: "",
@@ -1215,7 +1215,7 @@ const xydx = [
     name: "证件号码:",
     id: "zjhm",
     // type: "text",
-    type: "textTq",
+    type: "text",
     prop: "emptyAbleIdentityBT",
     value: "",
     placeholder: "请输入",

src/utils/rules.js

 /*
 验证规则
 */
+const ma = (rule, value, callback) => {
+  let patter = /^\S*(?=\S{8,32})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/
+  if (!patter.test(value)) {
+    return callback(new Error("密码中必须包含大小写字母、数字、特殊字符，且长度在8-32位，请重新修改密码！"));
+  } else {
+    callback();//必须有此项回调，否则验证会一直不通过
+  }
+};
+
 const xsbk = (rule, value, callback) => {
   // let patter = new RegExp("/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/");//验证是否身份证号
   let patter1 = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/
@@ -198,6 +207,13 @@ export default {
       trigger: "blur"
     }
   ],
+  
+  maCheck: [{
+    validator: ma,
+    trigger: "blur",
+    message: "密码中必须包含大小写字母、数字、特殊字符，且长度在8-32位，请重新修改密码！",
+    required: true,
+  }],
   xsbkCheck: [{
     validator: xsbk,
     trigger: "blur",

src/views/userAuth/personalInfo.vue

@@ -22,7 +22,7 @@
           <div class="content">{{ userInfo.unitname }}</div>
         </div>
         <div class="bottom">
-          <span @click="editInfo" class="hbyps">信息修改</span> 
+          <span @click="editInfo" class="hbyps">信息修改</span>
           <span @click="editMm" class="hbyps">密码修改</span>
         </div>
       </div>
@@ -67,21 +67,21 @@
     </div>
     <el-dialog title="修改密码" :visible.sync="dialogVisibleMzxg" width="30%">
       <div class="name">
-        <el-form ref="form" :model="form" label-width="120px">
-          <el-form-item label="请输入旧密码: ">
+        <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+          <el-form-item label="请输入旧密码: " prop="oldPassword">
             <el-input
               placeholder="请输入旧密码"
               v-model="form.oldPassword"
             ></el-input>
           </el-form-item>
-          <el-form-item label="请输入新密码: ">
+          <el-form-item label="请输入新密码: " prop="newPassword">
             <el-input
               placeholder="请输入新密码"
               show-password
               v-model="form.newPassword"
             ></el-input>
           </el-form-item>
-          <el-form-item label="请确定新密码: ">
+          <el-form-item label="请确定新密码: " prop="newPassword1">
             <el-input
               placeholder="请确定新密码"
               show-password
@@ -103,6 +103,28 @@ import { getPersonInfo } from "@/api/userAuth/addUser.js";
 import { updateUserMm } from "@/api/userAuth/role.js";
 export default {
   data() {
+    const ma = (rule, value, callback) => {
+      let patter =
+        /^\S*(?=\S{8,32})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/;
+      if (!patter.test(value)) {
+        return callback(
+          new Error(
+            "密码中必须包含大小写字母、数字、特殊字符，且长度在8-32位，请重新修改密码！"
+          )
+        );
+      } else {
+        callback(); //必须有此项回调，否则验证会一直不通过
+      }
+    };
+    var validatePass2 = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请再次输入密码"));
+      } else if (value !== this.form.newPassword) {
+        callback(new Error("两次输入密码不一致!"));
+      } else {
+        callback();
+      }
+    };
     return {
       header: "用户管理",
       userInfo: {},
@@ -209,6 +231,15 @@ export default {
         newPassword: "",
         newPassword1: "",
       },
+      rules: {
+        oldPassword: [
+          { required: true, message: "请输入旧密码", trigger: "blur" },
+        ],
+        newPassword: [{ validator: ma, required: true, trigger: "blur" }],
+        newPassword1: [
+          { validator: validatePass2, required: true, trigger: "blur" },
+        ],
+      },
     };
   },
 
@@ -237,27 +268,27 @@ export default {
       this.$set(this.form, "id", this.userInfo.id);
     },
     submitMaa() {
-      if (this.form.newPassword == this.form.newPassword1) {
-        this.form.type = "1"
-        updateUserMm(this.form).then((res) => {
-          if (res.code == 200) {
-            this.dialogVisibleMzxg = false;
-            this.$message.success("密码修改成功!");
-            this.form = {};
-          } else {
-            this.$message.error(res.message);
-          }
-        });
-      } else {
-        this.$message.error("两次密码输入不一样,请重新确定密码!");
-        this.form.newPassword1 = "";
-      }
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          updateUserMm(this.form).then((res) => {
+            if (res.code == 200) {
+              this.dialogVisibleMzxg = false;
+              this.$message.success("密码修改成功!");
+              this.form = {};
+            } else {
+              this.$message.error(res.message);
+            }
+          });
+        }
+      });
     },
     getData() {
       var self = this;
       getPersonInfo().then((res) => {
         self.userInfo = res.data.info;
-        self.rolesArr = res.data.info.syRolesStr ? res.data.info.syRolesStr.split(",") : ''
+        self.rolesArr = res.data.info.syRolesStr
+          ? res.data.info.syRolesStr.split(",")
+          : "";
         self.userArr = res.data.info.userRolesStr.split(",");
       });
     },
@@ -395,5 +426,8 @@ export default {
       }
     }
   }
+  /deep/ .el-form-item{
+    margin-bottom: 28px !important;
+  }
 }
 </style>
\ No newline at end of file

src/views/userAuth/user/editXg.vue

@@ -78,16 +78,6 @@ export default {
               col: "2",
             },
             {
-              name: "密码:",
-              id: "password",
-              type: "text",
-              prop: "checkEmpty",
-              passflag: true,
-              value: "",
-              placeholder: "请输入",
-              col: "2",
-            },
-            {
               name: "电话:",
               id: "telephone",
               type: "text",
@@ -115,7 +105,7 @@ export default {
               prop: "checkEmpty",
               value: "",
               placeholder: "请输入",
-              col: "3",
+              col: "1",
               radioData: [
                 { name: "省级", value: "S" },
                 { name: "地市级", value: "D" },