diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5a1bf6d34..5a8f941aa 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -40,7 +40,7 @@ v-for="(children, childrenIndex) in item.children" :key="childrenIndex" :index="children.path" - style="text-align: center;" + style="padding-right: 15px; padding-left: 30px;font-size: 14px" v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo > @@ -52,6 +52,9 @@ {{ children.title }} + +
{{children.title}}
+
{{ children.title }}
@@ -81,6 +84,7 @@ name: 'NavMenu', data () { return { + standardTranslation: 0, defaultActive: null, // 当前激活菜单的 index navMenuList: [ // { @@ -161,6 +165,11 @@ path: '/standQA', menuId: '2621269642ea4c6c8c42905863b2dc09' }, + { + title: '标准/译文获取申请管理', + path: '/standardTranslationAcquisitionRequest', + menuId: 'd7ad73e98162894d020aa993c08a4532' + }, // { // title: '零部件编号申请', // path: '/partCodeApply', @@ -550,6 +559,11 @@ } }, mounted () { + this.$http.get('/lawss/standardApplyFor/queryPendingApprovalCount', '', { _this: this }, res => { + if (res.ok) { + this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data) + } + }) }, methods: { handleSelect (key, keyPath) { @@ -573,7 +587,7 @@ // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png') return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') }, - ...mapGetters(['getDynamicTotal', 'isCollapse']) + ...mapGetters(['getDynamicTotal', 'isCollapse', 'getStandardTranslationTodo']) }, watch: { // 监听路由 重新渲染面包屑 @@ -606,6 +620,7 @@ width: 58px; height: 100%; overflow-y: auto; + overflow-x: hidden; user-select: none; box-sizing: border-box; position: absolute; @@ -785,7 +800,7 @@ } } .el-menu-item { - padding-left: 0 !important; + //padding-left: 0 !important; font-size: 16px; font-weight: normal; height: 40px; @@ -812,5 +827,10 @@ } } } - + .miniBadge{ + /deep/ .is-dot{ + left: -18px; + top: 14px; + } + } diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index bfa696419..46894effb 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -917,6 +917,7 @@ export default { res.data.forEach(item => { if (item.id && item.id == 'asdfadf') { item.disabled = true; + this.nodeList.push(item.id) // if (item.childNodes && item.childNodes.length !== 0) { // this.addAttr(item.childNodes); // } diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue index c6fdf27a4..d39f74488 100644 --- a/src/pages/config/pages/standLawsAttrManage/index.vue +++ b/src/pages/config/pages/standLawsAttrManage/index.vue @@ -390,12 +390,13 @@ export default { }, goNuwPage (item) { this.$store.commit('setDetailMap', this.$route.path) + console.log(item); const params = { id: item.id, dictionaryName: item.dictionaryName, dictionType: item.dictionType, isRelate: item.isRelate, - relateDicId: item.relateDicId + relateDicId: item.relateDicId || '1' } if(item.dictionType && item.dictionType === 'TREE'){ this.$router.push({ @@ -408,7 +409,6 @@ export default { params: params }) } - }, handleSelectone (data) { this.selectedList = [] diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue new file mode 100644 index 000000000..57a214440 --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue new file mode 100644 index 000000000..00c12fcc2 --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue new file mode 100644 index 000000000..c96204a9a --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue new file mode 100644 index 000000000..748f32e63 --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue new file mode 100644 index 000000000..5dd23956a --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -0,0 +1,619 @@ + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch/index.vue b/src/pages/searchCenter/pages/standardSearch/index.vue index 8015bb824..5b3136625 100644 --- a/src/pages/searchCenter/pages/standardSearch/index.vue +++ b/src/pages/searchCenter/pages/standardSearch/index.vue @@ -81,6 +81,7 @@
首页
+ 标准/译文获取申请
数据获取中 @@ -236,6 +237,15 @@ export default { this.getData() }, methods: { + toStandardTranslationAcquisitionRequest () { + let url = this.$router.resolve({ + name: 'standardTranslationAcquisitionRequest', + query: { + tag: 'fromSearchCenter' + } + }) + window.open(url.href, '_blank') + }, onSearch () { this.searchForm.page = 1 this.getData() diff --git a/src/router/index.js b/src/router/index.js index aa3b41ed3..1b93375e5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4112,6 +4112,16 @@ const routes = [ menuId: '' } }, + { + path: '/standardTranslationAcquisitionRequest', + name: 'standardTranslationAcquisitionRequest', + component: () => import('@/pages/regulatoryRepository/standardTranslationAcquisitionRequest'), + meta: { + requireAuth: true, + title: '标准/译文获取申请管理', + menuId: 'd7ad73e98162894d020aa993c08a4532' + } + }, // 本地产品/项目库详情页 { path: '/localProductDetail', diff --git a/src/store/getters/index.js b/src/store/getters/index.js index fbf6e9278..4c15374ea 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -182,5 +182,8 @@ export default { }, refreshFlag: state => { return state.refreshFlag + }, + getStandardTranslationTodo: state => { + return state.standardTranslationTodo } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index 3503672c8..1c3201b96 100644 --- a/src/store/mutations/index.js +++ b/src/store/mutations/index.js @@ -302,5 +302,8 @@ export default { try { localStorage.setItem('refreshFlag', flag) } catch (e) {} + }, + SET_STANDARD_TRANSLATION_TODO (state, value) { + state.standardTranslationTodo = value } } diff --git a/src/store/state/index.js b/src/store/state/index.js index b4ee9092f..e27c9dfdf 100644 --- a/src/store/state/index.js +++ b/src/store/state/index.js @@ -34,6 +34,7 @@ let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用) let accessStandRegRows = '' // 标准法规清单编辑 let accessStandRegTabName = '' // 标准法规清单页面当前页签 let refreshFlag = '' // 监听其他页面刷新 +let standardTranslationTodo = 0 // 标准/译文获取申请管理待办标记 try { if (localStorage.theme) { defaultTheme = localStorage.theme } if (localStorage.token) { defaultToken = localStorage.token } @@ -102,5 +103,6 @@ export default { rukuBaseInfo, accessStandRegRows, accessStandRegTabName, - refreshFlag + refreshFlag, + standardTranslationTodo }