From cc2baf27eda873521bcc1f4bcb46d3f61067c32e Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 13 Mar 2026 10:11:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E8=A7=92=E8=89=B2=E8=AF=A6=E6=83=85=E7=AD=89=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ruoyi.scss               |  2 +-
 src/views/system/dept/index.vue            |  2 +-
 src/views/system/role/index.vue            |  5 ++---
 src/views/system/user/index.vue            |  9 ++++++++-
 src/views/system/user/profile/index.vue    | 10 +++++-----
 src/views/system/user/profile/resetPwd.vue |  3 +++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index c12876d..78bf408 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -174,7 +174,7 @@
 
 .list-group-item {
   border-bottom: 1px solid #e7eaec;
-  border-top: 1px solid #e7eaec;
+  // border-top: 1px solid #e7eaec;
   margin-bottom: -1px;
   padding: 11px 0px;
   font-size: 13px;
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 8bbab70..f9d72d4 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -359,7 +359,7 @@ export default {
       getDept(row.deptId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = this.$t('page.system.dept.modifyDept')
+        this.title = readonly? this.$t('form.detail'): this.$t('page.system.dept.modifyDept')
         listDeptExcludeChild(row.deptId).then(response => {
           this.deptOptions = this.handleTree(response.data, "deptId")
           if (this.deptOptions.length == 0) {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 275b5ac..9e8ecf8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -229,7 +229,7 @@
 
         </el-form-item>
          <el-form-item :label="$t('page.system.role.remark')+'：'">
-          <el-input v-model="form.remark" type="textarea" :placeholder="$t('form.placeholderSelect')" :readonly="readonly"></el-input>
+          <el-input v-model="form.remark" type="textarea" :placeholder="$t('form.placeholderSelect')" :readonly="readonly" :maxlength="200" show-word-limit></el-input>
         </el-form-item>
         <el-form-item :label="$t('page.system.role.permit')+'：'">
           <!-- <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
@@ -638,7 +638,7 @@ export default {
           })
         })
       })
-      this.title = this.$t('page.system.role.modifyRole')
+      this.title = readonly? this.$t('form.detail'): this.$t('page.system.role.modifyRole')
     },
     /** 选择角色权限范围触发 */
     dataScopeSelectChange(value) {
@@ -670,7 +670,6 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.$modal.loading()
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()
             this.operate = "update"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e518388..554d7ea 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -167,7 +167,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item :label="$t('page.system.user.department')+'：'" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" :placeholder="$t('form.placeholderSelect')" />
+              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" :placeholder="$t('form.placeholderSelect')" @input="handleChangeDept" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -596,6 +596,9 @@ export default {
         this.form.password = ""
       })
     },
+    handleChangeDept(){
+      this.$refs["form"].validate()
+    },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -734,6 +737,10 @@ export default {
       })
     },
     handleExportHistory(){
+      if(this.changeDialog.total<1){
+        this.$message.error(`暂无数据导出!`)
+        return
+      }
       this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色变更历史导出',jcmcEn:'Role History Export'})
       this.download('/system/business/roleChange/export', this.changeDialog.searchForm, `roleHistory_${new Date().getTime()}.xlsx`)
     },
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index c070cd1..f2e557d 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -7,9 +7,9 @@
             <span>个人信息</span>
           </div>
           <div>
-            <div class="text-center">
+            <!-- <div class="text-center">
               <userAvatar />
-            </div>
+            </div> -->
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
@@ -45,9 +45,9 @@
             <span>基本资料</span>
           </div>
           <el-tabs v-model="selectedTab">
-            <el-tab-pane label="基本资料" name="userinfo">
+            <!-- <el-tab-pane label="基本资料" name="userinfo">
               <userInfo :user="user" />
-            </el-tab-pane>
+            </el-tab-pane> -->
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd />
             </el-tab-pane>
@@ -72,7 +72,7 @@ export default {
       user: {},
       roleGroup: {},
       postGroup: {},
-      selectedTab: "userinfo"
+      selectedTab: "resetPwd"
     }
   },
   created() {
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 2614e31..399783c 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -57,6 +57,9 @@ export default {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功")
+            this.$store.dispatch('LogOut').then(() => {
+              location.href = '/'
+            })
           })
         }
       })