From f637f746cbdb2ec4df56351274e89b8c3f8fcf0b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 13:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/forgetpassword/index.vue            | 21 +++++++++++--------
 src/views/system/user/components/roleList.vue |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 1f18d6f4..d66f6c34 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -76,7 +76,8 @@
       >
         <!-- 用户名 -->
         <el-form-item :label="$t('passwordReset:form:userName')" prop="UserId">
-          <el-select
+          <el-input v-model="form.UserName" disabled />
+          <!-- <el-select
             v-model="form.UserId"
             clearable
             filterable
@@ -94,15 +95,15 @@
                 item.UserType
               }}</span>
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- 用户类型 -->
-        <el-form-item
+        <!-- <el-form-item
           v-if="form.UserId"
           :label="$t('passwordReset:form:userType')"
         >
           <el-input v-model="form.UserType" disabled />
-        </el-form-item>
+        </el-form-item> -->
         <!-- 新密码 -->
         <el-form-item
           class="my_new_pwd"
@@ -338,11 +339,13 @@ export default {
       )
         .then((res) => {
           this.formLoading = false
-          this.users = res.Result
-          if (this.users.length === 1) {
-            this.form.UserId = this.users[0].UserId
-            this.form.UserType = this.users[0].UserType
-          }
+          this.form.UserId = res.Result.Id
+          this.form.UserName = res.Result.UserName
+          // this.users = res.Result
+          // if (this.users.length === 1) {
+          //   this.form.UserId = this.users[0].UserId
+          //   this.form.UserType = this.users[0].UserType
+          // }
           // 验证成功
           this.$message.success(
             this.$t('passwordReset:message:verifiedSuccessfully')
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index d4138223..f8b14998 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -7,6 +7,7 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
+    :show-close="false"
     :title="$t('system:userlist:roleList:title')"
     :before-close="cancel"
   >