diff --git a/yudao-ui-admin/src/components/DictTag/index.vue b/yudao-ui-admin/src/components/DictTag/index.vue index a63820ccf..17d5d5421 100644 --- a/yudao-ui-admin/src/components/DictTag/index.vue +++ b/yudao-ui-admin/src/components/DictTag/index.vue @@ -1,15 +1,15 @@ - + - {{ dict.label }} {{ dict.label }} - + diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue index d77d4d56e..22d3d8356 100644 --- a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue +++ b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue @@ -39,7 +39,11 @@ - + + + + + {{ parseTime(scope.row.startTime) }} @@ -50,7 +54,11 @@ {{ parseTime(scope.row.endTime) }} - + + + + + diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue index 94d315ddc..27229cada 100644 --- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue +++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue @@ -76,20 +76,7 @@ - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - + diff --git a/yudao-ui-admin/src/views/bpm/task/done.vue b/yudao-ui-admin/src/views/bpm/task/done.vue index 8c7e7e89c..926260b2f 100644 --- a/yudao-ui-admin/src/views/bpm/task/done.vue +++ b/yudao-ui-admin/src/views/bpm/task/done.vue @@ -24,20 +24,7 @@ - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - - {{ getDictDataLabel(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, scope.row.result) }} - - + diff --git a/yudao-ui-admin/src/views/system/dept/index.vue b/yudao-ui-admin/src/views/system/dept/index.vue index 8fac1182a..c83c09f63 100644 --- a/yudao-ui-admin/src/views/system/dept/index.vue +++ b/yudao-ui-admin/src/views/system/dept/index.vue @@ -25,9 +25,13 @@ - + - + + + + + {{ parseTime(scope.row.createTime) }} @@ -105,7 +109,7 @@ import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import {CommonStatusEnum} from '@/utils/constants' -import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict' +import { getDictDatas, DICT_TYPE } from '@/utils/dict' import {listSimpleUsers} from "@/api/system/user"; export default { @@ -199,10 +203,6 @@ export default { children: node.children }; }, - // 字典状态字典翻译 - statusFormat(row, column) { - return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status) - }, // 用户昵称展示 userNicknameFormat(row, column) { if (!row.leaderUserId) { diff --git a/yudao-ui-admin/src/views/system/dict/data.vue b/yudao-ui-admin/src/views/system/dict/data.vue index f2562f0a9..9309b5a4a 100644 --- a/yudao-ui-admin/src/views/system/dict/data.vue +++ b/yudao-ui-admin/src/views/system/dict/data.vue @@ -108,7 +108,7 @@ import { listData, getData, delData, addData, updateData, exportData } from "@/a import { listAllSimple, getType } from "@/api/system/dict/type"; import { CommonStatusEnum } from '@/utils/constants' -import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict' +import { getDictDatas, DICT_TYPE } from '@/utils/dict' export default { name: "Data", diff --git a/yudao-ui-admin/src/views/system/dict/index.vue b/yudao-ui-admin/src/views/system/dict/index.vue index 9a35ceaf8..7af5c218f 100644 --- a/yudao-ui-admin/src/views/system/dict/index.vue +++ b/yudao-ui-admin/src/views/system/dict/index.vue @@ -44,7 +44,11 @@ - + + + + + @@ -94,7 +98,7 @@ import { listType, getType, delType, addType, updateType, exportType } from "@/api/system/dict/type"; import { CommonStatusEnum } from '@/utils/constants' -import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict' +import { getDictDatas, DICT_TYPE } from '@/utils/dict' export default { name: "Dict", @@ -161,10 +165,6 @@ export default { this.loading = false; }); }, - // 字典状态字典翻译 - statusFormat(row, column) { - return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status) - }, // 取消按钮 cancel() { this.open = false; diff --git a/yudao-ui-admin/src/views/system/loginlog/index.vue b/yudao-ui-admin/src/views/system/loginlog/index.vue index 52a5dd72e..87c309755 100644 --- a/yudao-ui-admin/src/views/system/loginlog/index.vue +++ b/yudao-ui-admin/src/views/system/loginlog/index.vue @@ -37,7 +37,7 @@ - {{ getDictDataLabel(DICT_TYPE.SYSTEM_LOGIN_TYPE, scope.row.logType) }} + @@ -45,8 +45,7 @@ - 成功 - 失败:{{ getDictDataLabel(DICT_TYPE.SYSTEM_LOGIN_RESULT, scope.row.result) }} + @@ -109,10 +108,6 @@ export default { } ); }, - // 登录状态字典翻译 - statusFormat(row, column) { - return this.selectDictLabel(this.statusOptions, row.status); - }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNo = 1; diff --git a/yudao-ui-admin/src/views/system/menu/index.vue b/yudao-ui-admin/src/views/system/menu/index.vue index ca4bbe7f9..00b7d984d 100644 --- a/yudao-ui-admin/src/views/system/menu/index.vue +++ b/yudao-ui-admin/src/views/system/menu/index.vue @@ -34,7 +34,11 @@ - + + + + + {{ parseTime(scope.row.createTime) }} @@ -132,7 +136,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import IconSelect from "@/components/IconSelect"; import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants' -import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict' +import { getDictDatas, DICT_TYPE } from '@/utils/dict' export default { name: "Menu", @@ -218,10 +222,6 @@ export default { this.menuOptions.push(menu); }); }, - // 菜单状态字典翻译 - statusFormat(row, column) { - return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status) - }, // 取消按钮 cancel() { this.open = false; diff --git a/yudao-ui-admin/src/views/system/notice/index.vue b/yudao-ui-admin/src/views/system/notice/index.vue index 2033eb147..797d205ed 100644 --- a/yudao-ui-admin/src/views/system/notice/index.vue +++ b/yudao-ui-admin/src/views/system/notice/index.vue @@ -29,8 +29,16 @@ - - + + + + + + + + + + @@ -102,7 +110,7 @@ import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api import Editor from '@/components/Editor'; import {CommonStatusEnum} from '@/utils/constants' -import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict' +import { getDictDatas, DICT_TYPE } from '@/utils/dict' export default { name: "Notice", @@ -163,14 +171,6 @@ export default { this.loading = false; }); }, - // 公告状态字典翻译 - statusFormat(row, column) { - return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status) - }, - // 公告状态字典翻译 - typeFormat(row, column) { - return getDictDataLabel(DICT_TYPE.SYSTEM_NOTICE_TYPE, row.type) - }, // 取消按钮 cancel() { this.open = false; diff --git a/yudao-ui-admin/src/views/system/operatelog/index.vue b/yudao-ui-admin/src/views/system/operatelog/index.vue index 65ee68cf1..6fb1bca54 100644 --- a/yudao-ui-admin/src/views/system/operatelog/index.vue +++ b/yudao-ui-admin/src/views/system/operatelog/index.vue @@ -45,7 +45,7 @@ - {{ getDictDataLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, scope.row.type) }} + @@ -72,13 +72,8 @@ - + @@ -95,7 +90,8 @@ - {{ form.module }} | {{ form.name }} | {{ getDictDataLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, form.type) }} + {{ form.module }} | {{ form.name }} + {{ form.content }} {{ form.exts }} @@ -184,14 +180,6 @@ export default { } ); }, - // 操作日志状态字典翻译 - statusFormat(row, column) { - return this.selectDictLabel(this.statusOptions, row.status); - }, - // 操作日志类型字典翻译 - typeFormat(row, column) { - return this.selectDictLabel(this.typeOptions, row.businessType); - }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNo = 1; diff --git a/yudao-ui-admin/src/views/system/post/index.vue b/yudao-ui-admin/src/views/system/post/index.vue index 380101dc9..ef409f035 100644 --- a/yudao-ui-admin/src/views/system/post/index.vue +++ b/yudao-ui-admin/src/views/system/post/index.vue @@ -35,7 +35,11 @@ - + + + + + {{ parseTime(scope.row.createTime) }} @@ -88,7 +92,7 @@ import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post"; import {CommonStatusEnum} from '@/utils/constants' -import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict' +import { getDictDatas, DICT_TYPE } from '@/utils/dict' export default { name: "Post", @@ -152,10 +156,6 @@ export default { this.loading = false; }); }, - // 岗位状态字典翻译 - statusFormat(row, column) { - return getDictDataLabel(DICT_TYPE.COMMON_STATUS, row.status) - }, // 取消按钮 cancel() { this.open = false; diff --git a/yudao-ui-admin/src/views/system/role/index.vue b/yudao-ui-admin/src/views/system/role/index.vue index 53b19890b..9eada2f12 100644 --- a/yudao-ui-admin/src/views/system/role/index.vue +++ b/yudao-ui-admin/src/views/system/role/index.vue @@ -40,7 +40,11 @@ - + + + + + @@ -180,7 +184,7 @@ import {listSimpleMenus} from "@/api/system/menu"; import {assignRoleMenu, listRoleMenus, assignRoleDataScope} from "@/api/system/permission"; import {listSimpleDepts} from "@/api/system/dept"; import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants"; -import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"; +import {DICT_TYPE, getDictDatas} from "@/utils/dict"; export default { name: "Role", @@ -287,10 +291,6 @@ export default { : CommonStatusEnum.ENABLE; }); }, - // 角色类型字典翻译 - typeFormat(row, column) { - return getDictDataLabel(DICT_TYPE.SYSTEM_ROLE_TYPE, row.type) - }, // 取消按钮 cancel() { this.open = false; diff --git a/yudao-ui-admin/src/views/system/sms/smsChannel.vue b/yudao-ui-admin/src/views/system/sms/smsChannel.vue index d57f4872d..b96cd8d35 100644 --- a/yudao-ui-admin/src/views/system/sms/smsChannel.vue +++ b/yudao-ui-admin/src/views/system/sms/smsChannel.vue @@ -37,12 +37,12 @@ - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.code) }} + > - {{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }} + > diff --git a/yudao-ui-admin/src/views/system/sms/smsLog.vue b/yudao-ui-admin/src/views/system/sms/smsLog.vue index 0e65b60e1..ebc3a89bd 100644 --- a/yudao-ui-admin/src/views/system/sms/smsLog.vue +++ b/yudao-ui-admin/src/views/system/sms/smsLog.vue @@ -67,33 +67,33 @@ {{ scope.row.mobile }} - {{ getDictDataLabel(DICT_TYPE.USER_TYPE, scope.row.userType) + '(' + scope.row.userId + ')' }} + {{ '(' + scope.row.userId + ')' }} - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_SEND_STATUS, scope.row.sendStatus) }} + {{ parseTime(scope.row.sendTime) }} - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, scope.row.receiveStatus) }} + {{ parseTime(scope.row.receiveTime) }} {{ formatChannelSignature(scope.row.channelId) }} - 【{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.channelCode) }}】 + - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, scope.row.templateType) }} + @@ -116,15 +116,14 @@ - {{ - formatChannelSignature(form.channelId) - }}【{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, form.channelCode) }}】 + {{formatChannelSignature(form.channelId) }} + - {{ form.templateId }} | {{ form.templateCode }} | - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, form.templateType) }} + {{ form.templateId }} | {{ form.templateCode }} + @@ -132,7 +131,9 @@ {{ form.mobile }} - | {{ getDictDataLabel(DICT_TYPE.USER_TYPE, form.userType) }} | {{ form.userId }} + + ({{ form.userId }}) + @@ -145,7 +146,9 @@ {{ parseTime(form.createTime) }} - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_SEND_STATUS, form.sendStatus) }} + + + {{ parseTime(form.sendTime) }} @@ -164,7 +167,9 @@ {{ form.apiRequestId }} - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, form.receiveStatus) }} + + + {{ parseTime(form.receiveTime) }} diff --git a/yudao-ui-admin/src/views/system/sms/smsTemplate.vue b/yudao-ui-admin/src/views/system/sms/smsTemplate.vue index 548984f9b..ad1e8d88d 100644 --- a/yudao-ui-admin/src/views/system/sms/smsTemplate.vue +++ b/yudao-ui-admin/src/views/system/sms/smsTemplate.vue @@ -58,12 +58,12 @@ - {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, scope.row.type) }} + - {{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }} + @@ -71,7 +71,7 @@ {{ formatChannelSignature(scope.row.channelId) }} - 【{{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.channelCode) }}】 + diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue index 7796280fe..64874ebd5 100755 --- a/yudao-ui-admin/src/views/system/tenant/index.vue +++ b/yudao-ui-admin/src/views/system/tenant/index.vue @@ -49,7 +49,7 @@ - {{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }} + diff --git a/更新日志.md b/更新日志.md index 21e79cdd3..0be8cfc94 100644 --- a/更新日志.md +++ b/更新日志.md @@ -35,6 +35,7 @@ * 【新增】前端的表格右侧工具栏组件支持显隐列,具体可见【用户管理】功能 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/20e34e35a3bdc48e6a4c58e3849aa729bd18efe5) * 【新增】前端的菜单导航显示风格 TopNav(false 为 左侧导航菜单,true 为顶部导航菜单),支持布局的保存与重置 [commit1](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/4bf5b04d542014a49c5a41b20935cef35033a518) [commit2](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/cff4391f2d7830770731c0034085c0f77ea8c68e) * 【新增】前端的网页标题支持根据选择的菜单,动态展示标题 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/7bf9a85263e0c44b2bc88485b83557c129583f5c) +* 【新增】字典标签样式回显,例如说开启的状态展示为 primary 蓝色,禁用的状态为 info 灰色 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/986d1328e0a0d37e2de2fb9d937faeed9d9bee7b) * 【新增】前端的 iframe 组件,方便内嵌网页 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/4a8129bffa9e3928c56333e29f5874f55a079764) ### 🐞 Bug Fixes