diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 608baaa01..9a38ead1b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -407,7 +407,6 @@ export default { }, //动态表单读取 getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { @@ -472,9 +471,13 @@ export default { }, //提交事件 handleSubmit() { + let dataChildren = [] let dataListChildren = [] this.dataList.forEach(item => { - dataListChildren.push(item.children) + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) }) this.isSubmit = true; this.listForm.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 376ac71f1..3de61a2a1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -873,6 +873,7 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue index ff8e46689..cb117b7a3 100644 --- a/src/pages/regulatoryRepository/dataStatis/index.vue +++ b/src/pages/regulatoryRepository/dataStatis/index.vue @@ -98,5 +98,30 @@ export default { background: #fff; display: flex; flex-direction: column; + + /deep/ .el-tabs { + flex: auto; + display: flex; + flex-direction: column; + + /deep/ .el-tabs__header { + margin: 0 !important; + } + + .el-tabs__content { + height: 100% !important; + flex: auto; + position: relative; + display: flex; + flex-direction: column; + + .el-tab-pane { + height: 100%; + flex: auto; + display: flex; + flex-direction: column; + } + } + } } diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue index 6bb6dc0db..4dd2132ab 100644 --- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -47,12 +47,13 @@ -