diff --git a/public/api_address_config.js b/public/api_address_config.js index b057135a..159a102d 100644 --- a/public/api_address_config.js +++ b/public/api_address_config.js @@ -14,3 +14,5 @@ window._CONFIG.onlinePreviewDomainURL = 'http://127.0.0.1:8012/onlinePreview' window._CONFIG.onlyOfficeUrl = 'http://127.0.0.1:8080' // onlyOffice下载文件地址(暂时没用) window._CONFIG.onlyOfficeDownloadFileUrl = 'http://localhost:8184/sys/common/download' +// 管理员角色code,英文逗号拼接 +window._CONFIG.adminRoleCode = 'admin' diff --git a/src/views/documentTool/documentComparison/DocumentComparison.vue b/src/views/documentTool/documentComparison/DocumentComparison.vue index 13309f3e..e7fc1f5a 100644 --- a/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -233,8 +233,9 @@ export default { computed: { ...mapGetters(['userInfo']), administrators () { + const adminRoleList = window._CONFIG.adminRoleCode.split(',') const userRoleList = this.userInfo.roleCode.split(',') - return userRoleList.some(tt => tt === 'admin') + return userRoleList.some(tt => adminRoleList.includes(tt)) } }, created () { diff --git a/src/views/documentTool/documentSplit/DocumentSplit.vue b/src/views/documentTool/documentSplit/DocumentSplit.vue index 19d9d441..ec48e78c 100644 --- a/src/views/documentTool/documentSplit/DocumentSplit.vue +++ b/src/views/documentTool/documentSplit/DocumentSplit.vue @@ -102,14 +102,22 @@ import { releaseSplitStandard, changePermission, withdraw } from '@api/documentT import ImportSplitResultModal from './modules/ImportSplitResultModal.vue' import UserSelectModal from '../../../components/selection/UserSelectModal.vue' import { SplitStatus, StandardSource } from '@/enums/commonEnums' +import { mapGetters } from 'vuex' export default { name: 'DocumentSplit', components: { JTable, SplitText, ImportSplitResultModal, UserSelectModal }, mixins: [JeroListMixin], + computed: { + ...mapGetters(['userInfo']), + administrators () { + const adminRoleList = window._CONFIG.adminRoleCode.split(',') + const userRoleList = this.userInfo.roleCode.split(',') + return userRoleList.some(tt => adminRoleList.includes(tt)) + } + }, data () { return { - userInfo: this.$store.getters.userInfo, operationList: [ // 发布 { @@ -154,7 +162,7 @@ export default { has: 'split:sarFileSplitInfo:delete', show: (record) => { // 创建人(更改权限更改的是这个字段)是当前登录人或用户为管理员,且状态为编辑中可以删除 - return (record.createBy === this.userInfo.id || this.userInfo.roleCode.split(',').some(tt => tt === 'admin')) + return (record.createBy === this.userInfo.id || this.administrators) } } ], diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index af41a995..8db1f148 100644 --- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -238,7 +238,6 @@ export default { moveUpFlag: false, fullWidth: '', parameter: {}, - administrators: false, showAction: false, flag: '4', // 查询要用到 operateSlotName: 'action', @@ -297,7 +296,12 @@ export default { */ return `calc(100vh - ${this.defaultHeight['user-info-height']} - ${this.defaultHeight['breadcrumb-height']} - ${this.defaultHeight.oneLineOperationHeight} - 48px - 48px - 54px - ${this.isBackTitle ? '56px' : '0px'})` }, - ...mapGetters(['userInfo']) + ...mapGetters(['userInfo']), + administrators () { + const adminRoleList = window._CONFIG.adminRoleCode.split(',') + const userRoleList = this.userInfo.roleCode.split(',') + return userRoleList.some(tt => adminRoleList.includes(tt)) + } }, mounted () { this.operateColumn.scopedSlots.customRender = 'action' @@ -313,14 +317,6 @@ export default { if (this.needFilterTableBtn) { this.operationList = this.operationList.filter(item => !item.has || isHasPermission(item.has)) } - this.administrators = false - if (this.userInfo.userRoleList && this.userInfo.userRoleList.length > 0) { - this.userInfo.userRoleList.forEach(res => { - if (res.roleCode === 'admin') { - this.administrators = true - } - }) - } this.infoId = this.$route.query.infoId this.loadMenuData() }, diff --git a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue index 52d848ee..2a32125c 100644 --- a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue +++ b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue @@ -77,11 +77,9 @@ export default { ...mapGetters(['userInfo']), // 是否管理员 isAdmin () { - const roleList = this.userInfo.roleCode.split(',') - if (roleList && roleList.length > 0 && roleList.some(tt => tt === 'admin')) { - return true - } - return false + const adminRoleList = window._CONFIG.adminRoleCode.split(',') + const userRoleList = this.userInfo.roleCode.split(',') + return userRoleList.some(tt => adminRoleList.includes(tt)) } }, data () {