From 1d31b2fe3cbfc75f9e1495a66a745afde081ce76 Mon Sep 17 00:00:00 2001
From: jiang <jiang@bonus>
Date: Thu, 7 Nov 2024 16:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js                  | 13 +++++++++
 src/views/system/user/index.vue         | 32 +++++++++++++++++++---
 src/views/system/user/profile/index.vue | 35 ++++++++++++++++++++++---
 3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 07c7190d..fa78c0e3 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -154,3 +154,16 @@ export function checkPasswordStatus(data) {
   })
 }
 
+export function confirmPassword(password) {
+  const data = {
+    password
+  }
+  return request({
+    url: '/system/user/confirmPassword',
+    method: 'post',
+    data:data
+  })
+}
+
+
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d1bd9de8..ba4e99ee 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -56,7 +56,7 @@
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="confirmPassword"
                        v-hasPermi="['system:user:edit']"
             >修改
             </el-button>
@@ -124,7 +124,7 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="confirmPassword(scope.row)"
                          v-hasPermi="['system:user:edit']"
               >修改
               </el-button>
@@ -321,7 +321,7 @@ import {
   updateUser,
   resetUserPwd,
   changeUserStatus,
-  deptTreeSelect, approvalStatus
+  deptTreeSelect, approvalStatus, confirmPassword
 } from '@/api/system/user'
 import { getToken } from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
@@ -627,6 +627,32 @@ export default {
         this.form.password = ''
       })
     },
+    confirmPassword(row){
+      this.$prompt('请输入密码,鉴别用户', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal: false,
+        inputPattern: /^.{8,16}$/,
+        inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+        inputValidator: (value) => {
+          // 调用 validateNewPassword 校验
+          const errorMessage=function(error) {
+            if (error) {
+              return error.message;
+            } else {
+              console.log('验证通过');
+            }
+          };
+          validateNewPassword(null, value, errorMessage);
+        }
+      }).then(({ value }) => {
+        confirmPassword(value).then(response => {
+          this.$modal.msgSuccess('验证成功')
+          this.handleUpdate(row)
+        })
+      }).catch(() => {
+      })
+    },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 529c5644..c230c32f 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -62,7 +62,8 @@
 import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
-import { getUserProfile } from "@/api/system/user";
+import { confirmPassword, getUserProfile } from '@/api/system/user'
+import { validateNewPassword } from '@/utils/validate'
 
 export default {
   name: "Profile",
@@ -76,7 +77,8 @@ export default {
     };
   },
   created() {
-    this.getUser();
+    this.confirmPassword();
+    //this.getUser();
   },
   methods: {
     getUser() {
@@ -85,7 +87,34 @@ export default {
         this.roleGroup = response.roleGroup;
         this.postGroup = response.postGroup;
       });
-    }
+    },
+    confirmPassword(){
+      this.$prompt('请输入密码,鉴别用户', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal: false,
+        inputPattern: /^.{8,16}$/,
+        inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+        inputValidator: (value) => {
+          // 调用 validateNewPassword 校验
+          const errorMessage=function(error) {
+            if (error) {
+              return error.message;
+            } else {
+              console.log('验证通过');
+            }
+          };
+          validateNewPassword(null, value, errorMessage);
+        }
+      }).then(({ value }) => {
+        confirmPassword(value).then(response => {
+          this.$modal.msgSuccess('验证成功')
+          this.getUser()
+        })
+      }).catch(() => {
+        this.$tab.closePage();
+      })
+    },
   }
 };
 </script>