From 5561d924ab1949983309a3a2b025b6a8b38d78e5 Mon Sep 17 00:00:00 2001
From: lai <10633968+laiyujun1@user.noreply.gitee.com>
Date: Wed, 19 Feb 2025 14:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/api/user.ts                       |  4 +-
 .../_builtin/login/modules/pwd-login.vue      |  2 +-
 src/views/manage/user/index.vue               | 40 +++++--------------
 3 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/src/service/api/user.ts b/src/service/api/user.ts
index ba400c2..a60262c 100644
--- a/src/service/api/user.ts
+++ b/src/service/api/user.ts
@@ -62,8 +62,8 @@ export function doGetUserDeptTree() {
 }
 
 export function doUpdatePwd(pwdJson: any) {
-  var url= `/system/user/profile/updatePwd?oldPassword=${pwdJson.oldPassword}&newPassword=${pwdJson.newPassword}`;
-  return request({ url, method: 'put'});
+  var url= `/system/user/resetPwd`;
+  return request({ url, method: 'put',data:pwdJson });
 
 }
 
diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
index 5645676..420a418 100644
--- a/src/views/_builtin/login/modules/pwd-login.vue
+++ b/src/views/_builtin/login/modules/pwd-login.vue
@@ -21,7 +21,7 @@ getCheckCode();
 
 const model = reactive({
   username: 'admin',
-  password: 'admin123',
+  password: 'Admin123.',
   code: '',
   uuid: '',
   authType: 'sys'
diff --git a/src/views/manage/user/index.vue b/src/views/manage/user/index.vue
index 08beafc..1bed535 100644
--- a/src/views/manage/user/index.vue
+++ b/src/views/manage/user/index.vue
@@ -176,8 +176,8 @@ let modalState: any = reactive({
   title: '用户',
   from: {
     userName: '',
-    newPassword: '',
-    oldPassword: '',
+    password: '',
+    userId:'',
   },
   confirmLoading: false,
 });
@@ -186,20 +186,13 @@ let modalState: any = reactive({
 const modalStateFrom = Form.useForm(
   modalState.from,
   reactive({
-    newPassword: [
+    password: [
       {
         required: true,
         pattern: /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{6,}$/,
         message: $t('form.pwd.invalid'),
       },
-    ],
-    oldPassword: [
-      {
-        required: true,
-        pattern: /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{6,}$/,
-        message: $t('form.pwd.invalid'),
-      },
-    ],
+    ]
   })
 );
 
@@ -219,6 +212,8 @@ function fnModalOkResetPwd(){
             key,
             duration: 2,
           });
+          modalState.openByResetPwd = false;
+          modalStateFrom.resetFields();
         }
         getData();
         })
@@ -246,6 +241,7 @@ function fnModalOkResetPwd(){
  */
  function fnRecordResetPwd(row: Record<string, string>) {
   modalStateFrom.resetFields();
+  modalState.from.userId = row.userId;
   modalState.from.userName = row.userName;
   modalState.title = $t('page.login.resetPwd.title');
   modalState.openByResetPwd = true;
@@ -321,7 +317,6 @@ function fnModalOkResetPwd(){
         <a-form-item
           :label="$t('page.manage.user.userName')"
           name="userName"
-          v-bind="modalStateFrom.validateInfos.userName"
         >
           <a-input :value="modalState.from.userName" disabled :maxlength="30">
             <template #prefix>
@@ -330,12 +325,12 @@ function fnModalOkResetPwd(){
           </a-input>
         </a-form-item>
         <a-form-item
-          :label="$t('page.login.register.oldPassword')"
+          :label="$t('page.login.register.password')"
           name="password"
-          v-bind="modalStateFrom.validateInfos.oldPassword"
+          v-bind="modalStateFrom.validateInfos.password"
         >
           <a-input-password
-            v-model:value="modalState.from.oldPassword"
+            v-model:value="modalState.from.password"
             :maxlength="26"
           >
             <template #prefix>
@@ -343,21 +338,6 @@ function fnModalOkResetPwd(){
             </template>
           </a-input-password>
         </a-form-item>
-        <a-form-item
-          :label="$t('page.login.register.newPassword')"
-          name="password"
-          v-bind="modalStateFrom.validateInfos.newPassword"
-        >
-          <a-input-password
-            v-model:value="modalState.from.newPassword"
-            :maxlength="26"
-          >
-            <template #prefix>
-              <LockOutlined />
-            </template>
-          </a-input-password>
-        </a-form-item>
-
       </a-form>
     </a-modal>