From 3c9c5b91cbf4f6fb503e268d7f33da7acf868f4a Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 5 Feb 2026 15:50:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E5=AF=BC=E5=87=BA]=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=94=AF=E6=8C=81=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js          |  7 -------
 src/utils/request.js            |  1 +
 src/views/system/role/index.vue | 22 ++++++++++++----------
 src/views/system/user/index.vue | 13 ++++++++++---
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 076095e..1577c9b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -168,10 +168,3 @@ export function roleChangeList(query) {
     params: query
   })
 }
-export function roleChangeExport(data) {
-  return request({
-    url: '/system/business/roleChange/export',
-    method: 'post',
-    data
-  })
-}
diff --git a/src/utils/request.js b/src/utils/request.js
index 65106e2..e45eb0e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -24,6 +24,7 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(
   (config) => {
+    config.headers['lang'] = store.getters.language
     // 是否需要设置 token
     const isToken = (config.headers || {}).isToken === false
     // 是否需要防止数据重复提交
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index a968699..fbe0f2a 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -58,6 +58,16 @@
           v-hasPermi="['system:role:add']"
         >{{$t('form.add')}}</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+         
+          @click="handleExport"
+          v-hasPermi="['system:role:export']"
+        >{{$t('form.export')}}</el-button>
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="success"
@@ -80,16 +90,7 @@
           v-hasPermi="['system:role:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-         
-          @click="handleExport"
-          v-hasPermi="['system:role:export']"
-        >导出</el-button>
-      </el-col>
+      
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
@@ -694,6 +695,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色导出',jcmcEn:'Role Export'})
       this.download('system/role/export', {
         ...this.queryParams
       }, `role_${new Date().getTime()}.xlsx`)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ca74c3d..ddbf235 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -264,12 +264,14 @@
 
 
     <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-button type="warning" plain icon="el-icon-download" @click="handleExportHistory" v-hasPermi="['system:user:roleChange:export']" style="margin-bottom:10px">{{$t('form.export')}}</el-button>
+      
       <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.qmyy')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="180" />
         <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-column :label="$t('page.system.user.bghjs')" prop="bgh" />
       </el-table>
       <pagination
           v-show="changeDialog.total>0"
@@ -283,7 +285,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList,roleChangeExport } from "@/api/system/user"
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList } from "@/api/system/user"
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@@ -657,6 +659,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.saveSimpleLog({name:'',nameEn:'',jcmc:'用户导出',jcmcEn:'User Export'})
       this.download('system/user/export', {
         ...this.queryParams
       }, `user_${new Date().getTime()}.xlsx`)
@@ -716,6 +719,10 @@ export default {
       }).finally(()=>{
         this.changeDialog.loading = false;
       })
+    },
+    handleExportHistory(){
+      this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色变更历史导出',jcmcEn:'Role History Export'})
+      this.download('/system/business/roleChange/export', this.changeDialog.searchForm, `roleHistory_${new Date().getTime()}.xlsx`)
     }
   }
 }