用户历史显示状态变更

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -273,6 +273,7 @@ public class SysUserController extends BaseController
         jsonObject.put("contractExpire", "合同期满");
         jsonObject.put("roleIds", "角色");
         jsonObject.put("postIds", "岗位");
+        jsonObject.put("status", "状态");
         return jsonObject.getString(fieldName);
     }
 

oa-ui/src/views/oa/staff/changeRecord.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-20 14:39:09
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-02-25 12:17:11
 -->
 <template>
   <div>
@@ -38,7 +38,7 @@
 import { parseTime } from "@/utils/ruoyi";
 import { getUserChangeInfo } from "@/api/system/user";
 export default {
-  dicts: ['sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
+  dicts: ['sys_user_titles', 'sys_post_status', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
   data() {
     return {
       // 遮罩层
@@ -101,6 +101,10 @@ export default {
       this.currentPage = 1; // 重置当前页码为第一页
     },
     formatRow(row, key) {
+      if (row.field == '状态') {
+        row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_post_status, row.before, ',');
+        row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_post_status, row.after, ',');
+      }
       if (row.field == '执业证书') {
         row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.before, ',');
         row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.after, ',');