diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index d720898e..fa8d00e1 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -263,6 +263,7 @@ import { previewPdf } from '@/utils/previewPdf' import { kkFilePreview } from '@/utils/kkFilePreview' import { getFileInfo } from '@api/api' import { mapGetters } from 'vuex' +import { isHasPermission } from '@/utils/hasPermission' export default { name: 'EnterpriseStandardList', @@ -328,12 +329,10 @@ export default { expandedKeys: [], // 体系展开的节点 defaultSearchParams: { standard_state: `${EnterpriseStandardStatus.CURRENTLY_EFFECTIVE.value},${EnterpriseStandardStatus.TRIAL_OPERATION.value},${EnterpriseStandardStatus.RELEASE.value}` - } + }, + disabledMixinsCreate: true } }, - mounted () { - this.initTreeData() - }, computed: { ...mapGetters(['userInfo']), // 当前用户是否管理员 @@ -343,6 +342,20 @@ export default { return userRoleList.some(tt => adminRoleList.includes(tt)) } }, + created () { + // 从消息跳转进来带企业编号 + const { standardNumber } = this.$route.query + this.$set(this.defaultSearchParams, 'standard_number', standardNumber) + this.searchParams = Object.assign({}, this.defaultSearchParams) + this.getTableHeader() + this.loadData() + // 过滤没有权限的按钮 + if (this.needFilterTableBtn) { + this.operationList = this.operationList.filter(item => !item.has || isHasPermission(item.has)) + console.log(this.operationList) + } + this.initTreeData() + }, methods: { // 获取左侧树数据 initTreeData (params) { diff --git a/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue b/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue index e0c71218..ff1af05b 100644 --- a/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue +++ b/src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue @@ -274,9 +274,14 @@ export default { has: 'specialProjectLibrary:edit' } ], - standardSourceOptions: [] + standardSourceOptions: [], + disableMixinCreated: true } }, + created () { + this.queryParam.standardId = this.$route.query.standardId + this.loadData() + }, methods: { initDictConfig () { ajaxGetDictItems('standard_source').then(res => { diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index ffe659c7..19044af5 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -93,6 +93,7 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import JTable from '@comp/jero/JTable' import { ReadFlag } from '@/enums/commonEnums' +import { getMsgDetail } from '@api/personCenter' export default { name: 'UserAnnouncementList', @@ -196,12 +197,18 @@ export default { }, // 跳转详情 handleGoDetail (record) { - this.$router.push({ - path: '/isps/userAnnouncementDetail', - query: { - id: record.id - } - }) + if (record.openType === 'url') { + this.$router.push({ path: record.openPage }) + // 如果是跳转其他页面请求详情(作用是为了标记已读) + getMsgDetail({ id: record.id }) + } else { + this.$router.push({ + path: '/isps/userAnnouncementDetail', + query: { + id: record.id + } + }) + } }, expandIcon (props) { if (props.expanded) { diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 66000472..4e08fc76 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -268,10 +268,22 @@ export default { [ProcessType.STANDARD_PROMOTION.value]: [StandardPromotion.initiate.value], // 会后管理流程 [ProcessType.POST_MEETING_MANAGE.value]: [PostMeetingManage.initiate.value] - } + }, + disableMixinCreated: true } }, + mounted () { + // 初始化查询参数 + this.initQueryParam() + }, methods: { + // 初始化查询参数 + initQueryParam () { + const { prcName, prcNum, prcType } = this.$route.query + this.$set(this.queryParam, 'prcName', prcName) + this.$set(this.queryParam, 'prcNum', prcNum) + this.$set(this.queryParam, 'prcType', prcType) + }, loadData (arg) { if (!this.url.list) { this.$message.warning('请设置url.list属性!')