From 5b3f08940226c8f6d2137b67d03f0c259f34e490 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Tue, 11 Jul 2023 19:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 51 ++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 840df881..db5d0dfb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -114,7 +114,7 @@
       width="35%"
       v-if="isVisible"
     >
-      <el-form :model="inputQuery" label-width="100px" :rules="rules" ref="inputQuery">
+      <el-form :model="inputQuery" label-width="100px" :rules="formRules" ref="dataForm">
         <el-row :gutter="20">
           <el-col :span="20">
             <el-form-item prop="userName" label="用户账号:">
@@ -130,7 +130,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item prop="locInvCode" label="当前密码:">
+            <el-form-item prop="passWord" label="当前密码:">
               <el-input
                 size="small"
                 placeholder="请输入当前密码"
@@ -143,7 +143,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item prop="locInvCode" label="新密码:">
+            <el-form-item prop="newPassword" label="新密码:">
               <el-input
                 size="small"
                 placeholder="请输入新密码"
@@ -157,7 +157,7 @@
 
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item prop="locInvCode" label="确认密码:">
+            <el-form-item prop="confirmPassword" label="确认密码:">
               <el-input
                 size="small"
                 placeholder="请输入确认密码"
@@ -171,8 +171,8 @@
 
 
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button type="primary" @click="onSubmit('inputQuery')">修改密码</el-button>
-          <el-button type="primary" @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="onSubmit">修改密码</el-button>
+          <el-button @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-dialog>
@@ -199,15 +199,15 @@ import router from "@/router";
 
 export default {
   data() {
-    let validatePass2 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"));
-      } else if (value !== this.inputQuery.passWord) {
-        callback(new Error("两次输入密码不一致!"));
-      } else {
-        callback();
-      }
-    };
+    // let validatePass2 = (rule, value, callback) => {
+    //   if (value === "") {
+    //     callback(new Error("请再次输入密码"));
+    //   } else if (value !== this.inputQuery.passWord) {
+    //     callback(new Error("两次输入密码不一致!"));
+    //   } else {
+    //     callback();
+    //   }
+    // };
     return {
       inv: store.getters.locInvName,
       deptName: store.getters.locDeptName,
@@ -231,13 +231,18 @@ export default {
         locInvCode: [
           {required: true, message: "请选择当前仓库", trigger: "blur"}
         ],
-
+        password: [{required: true, message: "请输入密码", trigger: "blur"}],
+        newPassword: [{required: true, message: "请输入密码", trigger: "blur"}],
+        confirmPassword: [
+          {required: true, message: "请确认密码", trigger: "blur"},
+          // {validator: validatePass2, trigger: "blur"},
+        ],
       },
       rules: {
         password: [{required: true, message: "请输入密码", trigger: "blur"}],
         confirmPassword: [
           {required: true, message: "请确认密码", trigger: "blur"},
-          {validator: validatePass2, trigger: "blur"},
+          // {validator: validatePass2, trigger: "blur"},
         ],
 
       },
@@ -277,8 +282,16 @@ export default {
     }
   },
   methods: {
-    onSubmit(formName) {
-      this.$refs[formName].validate((valid) => {
+    onSubmit() {
+      if (this.inputQuery.newPassword != this.inputQuery.confirmPassword) {
+        this.$message.error("新密码与确认密码不一致！！！！");
+        return
+      }
+      if (this.inputQuery.passWord == this.inputQuery.newPassword) {
+        this.$message.error("旧密码与新密码不能相同！！！！");
+        return
+      }
+      this.$refs["dataForm"].validate((valid) => {
         if (valid) {
           this.loading = true;
           modifyPasswd(this.inputQuery).then((response) => {