diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 8827ed2a8..8ec8655e0 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -107,12 +107,12 @@ // menuId: 'RAFQ4N4ARF' // }, { - title: '国内法规', + title: '国内标准', path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, { - title: '海外法规', + title: '海外标准', path: '/foreignStandardsAndRegulations', menuId: '18c1e5134ea0cf865e8960b26b81fd8c' }, @@ -213,34 +213,34 @@ // } ] }, - { - title: '政策法规库', - path: '/policyRegulation', - 'icon-class': 'el-icon-s-management', - menuId: 'asdzcfgk', - children: [ - { - title: '问题项管控', - path: '/problemControl', - menuId: '50d7a0c0af4740c486100c257ae6068e' - }, - { - title: '国内外政策', - path: '/nationalPolicy', - menuId: '6557e9c4ce672af71be5807052da126b' - }, - { - title: '标准跟踪清单', - path: '/standardTrackingList', - menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4' - }, - { - title: '政策工作组', - path: '/policyWorkGroup', - menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6' - } - ] - }, + // { + // title: '政策法规库', + // path: '/policyRegulation', + // 'icon-class': 'el-icon-s-management', + // menuId: 'asdzcfgk', + // children: [ + // { + // title: '问题项管控', + // path: '/problemControl', + // menuId: '50d7a0c0af4740c486100c257ae6068e' + // }, + // { + // title: '国内外政策', + // path: '/nationalPolicy', + // menuId: '6557e9c4ce672af71be5807052da126b' + // }, + // { + // title: '标准跟踪清单', + // path: '/standardTrackingList', + // menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4' + // }, + // { + // title: '政策工作组', + // path: '/policyWorkGroup', + // menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6' + // } + // ] + // }, { title: '工作中心', path: '/processCenter', diff --git a/src/components/treeSelect/treeSelectModule.vue b/src/components/treeSelect/treeSelectModule.vue index 84c382f81..1d27f11e1 100644 --- a/src/components/treeSelect/treeSelectModule.vue +++ b/src/components/treeSelect/treeSelectModule.vue @@ -323,4 +323,8 @@ // } //} + .common-tree{ + height: 100%; + overflow-y: auto; + } diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index c4b60cbf4..2cb47f94e 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -320,5 +320,8 @@ // display: none; // } //} - +.common-tree{ + height: 100%; + overflow-y: auto; +} diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue index 49f16915d..dc1cc9c4d 100644 --- a/src/components/workTree/index.vue +++ b/src/components/workTree/index.vue @@ -16,14 +16,15 @@ - + - + 查询 - + { - this.treeData1 = res.data + this.treeData1 = res + this.treeData1.forEach(item => { + this.defaultKey.push(item.id) + }) this.treeLoading = false }) + + + + + // this.$http.get('SarInstitution/institution/institutionAndUser', { + // userName: this.filterText + // }, {}, res => { + // this.treeData1 = res.data + // this.treeData1.forEach(item => { + // this.defaultKey.push(item.id) + // }) + // console.log(1); + // this.getChildren() + // this.treeLoading = false + // }) } else { this.open1 = true } - }), + }, checkChange2 (row, type, c) { if (this.checkBox) { } else { diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index b53e41680..30782f2dd 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -1048,6 +1048,8 @@ export default { batchDelete () { if (this.selectedList.length === 0) { this.$message.error('请选择要删除的数据') + } if(this.selectedList.length > 10){ + this.$message.error('批量删除仅支持10条以内') } else { this.$confirm('确认删除选择数据？', '确认删除', { confirmButtonText: '确定', diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 7d0f94a7e..052047fe6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -100,7 +100,7 @@
- +
@@ -125,7 +125,8 @@ v-model="form.dyhz" style="height: 150px" type="textarea" - :autosize="{ minRows: 1, maxRows: 20}" + :autosize="{ minRows: 1, maxRows: 5}" + resize='none' placeholder="请输入调研回执" clearable > diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 84aa9df3e..4bf35d46c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -462,6 +462,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.fjList = data.fjList || data.form.fjList this.form.title = data.title || data.form.title this.form.processName = data.processName || data.form.processName this.form.date = data.date || data.form.date diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index b94996be7..e95cff77b 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -79,21 +79,21 @@
-
- -
-
-
- -
-
-
政策征求意见流程
-
-
-
-
- -
+ + + + + + + + + + + + + + +
@@ -124,21 +124,21 @@
-
- -
-
-
- -
-
-
重点认证标准/政策合规性项目审查流程
-
-
-
-
- -
+ + + + + + + + + + + + + + +
@@ -154,21 +154,21 @@
-
- -
-
-
- -
-
-
政策入库流程
-
-
-
-
- -
+ + + + + + + + + + + + + + +
@@ -285,36 +285,36 @@

标准化活动相关流程
-
- -
-
-
- -
-
-
政策课题入会流程
-
-
-
-
- -
-
- -
-
-
- -
-
-
政策课题参会流程
-
-
-
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index 691171e79..13e64dd10 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
审批历史
@@ -85,6 +85,11 @@ label="责任人" align="center"> + + diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 233a7d49c..01a5f0c7d 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -283,12 +283,12 @@ - + - + -->
- + diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 9da6a0b75..624b7616d 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -247,6 +247,25 @@ label-width="130px" v-if="showInfoModal" > + + + + + + + + { - if (valid && this.attributeEO.attachFileId !== '') { + if (valid) { if (this.attributeTitle === '新增'){ this.$http.postData( 'fileMaterialCenter/file-material', @@ -777,9 +809,7 @@ export default { } ) } - - } else { - this.$message.error('附件不能为空') + }else{ this.submitLoading = false } }) @@ -792,6 +822,8 @@ export default { dataType: '', dataTitle: '', attachFileId: '', + treeId: '', + treeName: '' } }) this.showInfoModal = false @@ -1007,4 +1039,20 @@ export default { background: url('~@/assets/images/shangqi/img/tree.png'); background-size: 100% 100%; } +.upload-demo{ + /deep/.el-upload-list{ + height: 60vh; + overflow-y: auto; + } +} +.tree-select{ + .el-select-dropdown__item{ + height: auto; + line-height: normal; + } +} +.tree-select-option{ + height: auto; + padding: 0; +} diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 71f9b323c..fca85967f 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -68,12 +68,11 @@ + :total="questionSerach.total" + @pageChange="pageChangeFun" + @pageSizeChange="pageSizeChangeFun">
{ - this.answerList = res.data - }, e => { - }) - }, //提问按钮 queBtn(){ this.fileList = [] @@ -963,9 +943,18 @@ export default { problemDescription: '', //关键词/问题描述 page:1, pageSize:this.$store.getters.userInfo.configContent, + total: 0 } this.searchBtn() }, + pageChangeFun(page) { + this.questionSerach.page = page + this.searchBtn() + }, + pageSizeChangeFun(pageSize) { + this.questionSerach.pageSize = pageSize + this.searchBtn() + }, searchBtn(){ this.questionSerach.questioner = '' this.tableLoading = true @@ -975,44 +964,10 @@ export default { _this: this }, res => { this.tableData = res.data.records - this.tableTotal = res.total + this.questionSerach.total = res.data.total this.tableLoading = false }) }, - //问题查询 - queSearch(){ - this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{ - standardId: this.activestand, - classification: this.activeName, - problemDescription: this.questionSerach.problemDescription - },{ - _this: this - }, res => { - this.questionsList = res.data - }) - }, - //查询提问标准 - standSearch2(){ - let qId = this.$route.query.standId - let queNumber = 0 - this.standList = [] - this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{ - _this: this - }, res =>{ - res.data.forEach(item => { - if(item.standardId === qId){ - this.standList.push(item) - queNumber++ - } - }) - if(queNumber === 0){ - this.standList = res.data - this.refreshStandMap() - } - }, e => { - - }) - }, //文件上传前 beforeUploadTheme(file){ console.log(file);