From 92921e8ce285ae0e1c6459e565f13109cb7cf3da Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 4 Feb 2026 20:46:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E8=A7=92=E8=89=B2=E5=8F=98=E6=9B=B4=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js          | 15 +++++++++++
 src/lang/en.js                  |  2 +-
 src/lang/en/system/user.js      |  5 +++-
 src/lang/zh/system/user.js      |  5 +++-
 src/views/system/user/index.vue | 55 ++++++++++++++++++++++++++++++++++++++---
 5 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 8099872..076095e 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -160,3 +160,18 @@ export function studyUser(query) {
     params: query
   })
 }
+
+export function roleChangeList(query) {
+  return request({
+    url: '/system/business/roleChange/list',
+    method: 'get',
+    params: query
+  })
+}
+export function roleChangeExport(data) {
+  return request({
+    url: '/system/business/roleChange/export',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/lang/en.js b/src/lang/en.js
index 4be12ee..df47bc5 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -102,7 +102,7 @@ export default {
     signerUser: 'Signed User',
     signerPsw: 'Password',
     qmyy: 'Meaning of Signature',
-    signTime: '签名时间',
+    signTime: 'Date',
     remark: 'Comment',
     reason: 'Reason',
     modify: 'Modify',
diff --git a/src/lang/en/system/user.js b/src/lang/en/system/user.js
index d30d1b1..8b2ed2a 100644
--- a/src/lang/en/system/user.js
+++ b/src/lang/en/system/user.js
@@ -17,5 +17,8 @@ export default {
   history: 'Role History',
 
   addUser: 'Create',
-  modifyUser: 'Edit'
+  modifyUser: 'Edit',
+
+  bgqjs: 'Role Before Change',
+  bghjs: 'Role After Change'
 }
diff --git a/src/lang/zh/system/user.js b/src/lang/zh/system/user.js
index 735f86d..d062f3d 100644
--- a/src/lang/zh/system/user.js
+++ b/src/lang/zh/system/user.js
@@ -18,5 +18,8 @@ export default {
 
   addUser: '新增角色',
   modifyUser: '编辑角色',
-  phoneError: '请输入正确的手机号码'
+  phoneError: '请输入正确的手机号码',
+
+  bgqjs: '变更前角色',
+  bghjs: '变更后角色'
 }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index acb691b..ca74c3d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -99,7 +99,7 @@
                    
                     type="text"
                     @click="handleStatusChange(scope.row)"
-                    v-hasPermi="['system:user:edit']"
+                    v-hasPermi="['system:user:enable']"
                     v-if="scope.row.status==='0'"
                   >{{$t('page.system.user.disable')}}</el-button>
 
@@ -107,7 +107,7 @@
                    
                     type="text"
                     @click="handleStatusChange(scope.row)"
-                    v-hasPermi="['system:user:edit']"
+                    v-hasPermi="['system:user:enable']"
                     v-if="scope.row.status==='1'"
                   >{{$t('page.system.user.enable')}}</el-button>
 
@@ -115,7 +115,7 @@
                    
                     type="text"
                     @click="showRoleChange(scope.row)"
-                    v-hasPermi="['system:user:edit']"
+                    v-hasPermi="['system:user:roleChange']"
                   >{{$t('page.system.user.history')}}</el-button>
                   
                   <el-button type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
@@ -261,11 +261,29 @@
     </el-dialog>
 
     <Sign ref="signRef" @callback="doUpdate" />
+
+
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t('page.system.user.history')" :visible.sync="changeDialog.visible" width="70%" append-to-body>
+      <el-table v-loading="changeDialog.loading" :data="changeDialog.list">
+        <el-table-column :label="$t('form.signer')" prop="qmrMc" width="150" />
+        <el-table-column :label="$t('form.qmyy')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="150" />
+        <el-table-column :label="$t('form.signTime')" prop="createTime" width="150" />
+        <el-table-column :label="$t('page.system.user.bgqjs')" prop="bgq" />
+        <el-table-column :label="$t('page.system.user.bgqjs')" prop="bgh" />
+      </el-table>
+      <pagination
+          v-show="changeDialog.total>0"
+          :total="changeDialog.total"
+          :page.sync="changeDialog.searchForm.pageNum"
+          :limit.sync="changeDialog.searchForm.pageSize"
+          @pagination="getChangeList"
+        />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList,roleChangeExport } from "@/api/system/user"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@@ -394,6 +412,19 @@ export default {
         // ]
       },
       oldRoleIdList:[],
+
+      changeDialog:{
+        visible:false,
+        searchForm:{
+          userId:'',
+          pageSize:10,
+          pageNum:1
+        },
+        loading:false,
+
+        total:0,
+        list:[]
+      }
     }
   },
   watch: {
@@ -669,6 +700,22 @@ export default {
     },
     showRoleChange(row){
       this.saveSimpleLog({name:row.nickName,nameEn:row.nickName,jcmc:this.$t('page.system.user.history','zh_CN'),jcmcEn:this.$t('page.system.user.history','en_US')})
+      this.changeDialog.searchForm = {
+        userId:row.userId,
+        pageNum:1,
+        pageSize:10
+      }
+      this.changeDialog.visible = true
+      this.getChangeList()
+    },
+    getChangeList(){
+      this.changeDialog.loading = true;
+      roleChangeList(this.changeDialog.searchForm).then(response => {
+        this.changeDialog.list = response.rows;
+        this.changeDialog.total = response.total;
+      }).finally(()=>{
+        this.changeDialog.loading = false;
+      })
     }
   }
 }