Browse Source

用户历史显示状态变更

lamphua 4 months ago
parent
commit
e924e79855

+ 1
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java View File

273
         jsonObject.put("contractExpire", "合同期满");
273
         jsonObject.put("contractExpire", "合同期满");
274
         jsonObject.put("roleIds", "角色");
274
         jsonObject.put("roleIds", "角色");
275
         jsonObject.put("postIds", "岗位");
275
         jsonObject.put("postIds", "岗位");
276
+        jsonObject.put("status", "状态");
276
         return jsonObject.getString(fieldName);
277
         return jsonObject.getString(fieldName);
277
     }
278
     }
278
 
279
 

+ 7
- 3
oa-ui/src/views/oa/staff/changeRecord.vue View File

1
 <!--
1
 <!--
2
  * @Author: wrh
2
  * @Author: wrh
3
  * @Date: 2024-03-25 17:38:39
3
  * @Date: 2024-03-25 17:38:39
4
- * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-05-20 14:39:09
4
+ * @LastEditors: wrh
5
+ * @LastEditTime: 2025-02-25 12:17:11
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div>
8
   <div>
38
 import { parseTime } from "@/utils/ruoyi";
38
 import { parseTime } from "@/utils/ruoyi";
39
 import { getUserChangeInfo } from "@/api/system/user";
39
 import { getUserChangeInfo } from "@/api/system/user";
40
 export default {
40
 export default {
41
-  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'],
41
+  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'],
42
   data() {
42
   data() {
43
     return {
43
     return {
44
       // 遮罩层
44
       // 遮罩层
101
       this.currentPage = 1; // 重置当前页码为第一页
101
       this.currentPage = 1; // 重置当前页码为第一页
102
     },
102
     },
103
     formatRow(row, key) {
103
     formatRow(row, key) {
104
+      if (row.field == '状态') {
105
+        row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_post_status, row.before, ',');
106
+        row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_post_status, row.after, ',');
107
+      }
104
       if (row.field == '执业证书') {
108
       if (row.field == '执业证书') {
105
         row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.before, ',');
109
         row.before = row.before == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.before, ',');
106
         row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.after, ',');
110
         row.after = row.after == null ? '' : this.selectDictLabels(this.dict.type.sys_user_certificates, row.after, ',');

Loading…
Cancel
Save