diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 8790e7607..66e77cdf4 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -193,6 +193,11 @@ export default { title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 path: '/standInvolveProject', menuId: '8a9c87fe06244fb9d55e78fb281f625b' + }, + { + title: '企标制修订计划', + path: '/enterpriseStandardPlan', + // menuId: '8a9c87fe06244fb9d55e78fb281f625b' } // { // title: '动态信息', diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 134fb22ad..066759cb2 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -46,7 +46,7 @@

-

{{ sarStandardsInfoEO.standName || '-' }}

@@ -2408,7 +2408,6 @@ export default { .modular-content{ & > div{ border-bottom: 1px solid #E5E5E5; - height: 44px; .modular-content-p-name{ display: inline-block; width: 220px; @@ -2437,7 +2436,6 @@ export default { position: relative; display: inline-block; width: calc(~'100% - 225px'); - min-height: 50px; & > .files-title{ width: calc(~'100% - 120px'); min-height: 50px; diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index b8c468097..fa27d9fbc 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -1486,8 +1486,8 @@ export default { return true } // 缺少文件 - if (this.$hasPermission('43ae63abc1b64e6bd5cf3bb75b423bc2')) { - this.$http.get('lawss/sarBussStandFile/queryConvertAtt', { + if (this.$hasPermission('fd83032ae5f41a0021b00e93c88edbbg')) { + this.$http.get('lawss/sarLawsFile/queryConvertAtt', { attId: attId }, { _this: this @@ -2343,7 +2343,6 @@ export default { position: relative; display: inline-block; width: calc(~'100% - 225px'); - min-height: 50px; & > .files-title{ width: calc(~'100% - 120px'); min-height: 50px; diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6a5a8b72f..8557d1325 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -58,7 +58,7 @@

-

{{ @@ -3111,7 +3111,7 @@ } }) }) - + console.log(displayLocation) displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter ( item => item.label === '过程稿件'); @@ -3169,6 +3169,7 @@ location.half = half location.showAll = false }) + console.log(displayLocation) this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id @@ -3533,7 +3534,6 @@ border-bottom: 1px solid #E5E5E5; min-height: 43px; line-height: 43px; - height: 44px; .modular-content-p-name { display: inline-block; @@ -3565,7 +3565,6 @@ position: relative; display: inline-block; width: calc(~'100% - 225px'); - min-height: 50px; & > .files-title { width: calc(~'100% - 120px'); diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue new file mode 100644 index 000000000..80085724a --- /dev/null +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index bb4176af5..6b188da70 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -577,21 +577,57 @@ :visible.sync="addDrawer2" :before-close="addDrawerClose2">

-
- - - - - - - - +
+
+ + + + + + + + + + + + + + + + + + + + 查询 + + + + 清空 + + + +
@@ -624,6 +661,17 @@ + + + {{ scope.row.standName }} + + + + + + + + + + + + + + + + + + + + + @@ -693,6 +811,7 @@