From faf043f76e46f3613393dbf998d40c30468baf21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 12 Nov 2021 17:38:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step5.vue | 7 ++-- .../pages/creatProcess/xmpg2/step6.vue | 1 + .../regulatoryRepository/dataStatis/index.vue | 25 +++++++++++++ .../dataStatis/miniPages/expendSubsidy.vue | 26 ++++++++++++-- .../dataStatis/miniPages/inComeSubsidy.vue | 28 ++++++++++++--- .../dataStatis/page/listOfCost.vue | 32 +++++++++++++++++ .../dataStatis/page/listOfMeeting.vue | 26 ++++++++++++-- .../dataStatis/page/listOfMember.vue | 26 ++++++++++++-- .../dataStatis/page/listOfSociety.vue | 30 ++++++++++++---- .../dataStatis/page/listOfStandard.vue | 35 ++++++++++++------- .../dataStatis/pages/attendCost.vue | 26 ++++++++++++-- .../dataStatis/pages/purchaseCost.vue | 26 ++++++++++++-- .../dataStatis/pages/reviseCost.vue | 26 ++++++++++++-- .../dataStatis/pages/societyCost.vue | 26 ++++++++++++-- .../dataStatis/pages/subsidyCost.vue | 32 +++++++++++++++++ .../dataStatis/pages/translateCost.vue | 26 ++++++++++++-- 16 files changed, 349 insertions(+), 49 deletions(-) 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 @@ -
+
@@ -248,7 +249,7 @@ export default { submit: function(){ this.$confirm('确认进行添加','是否继续？','提示',{ confirmButtonText: '确定', - confirmButtonText: '取消', + cancelButtonText: '取消', }).then(()=>{ this.tableData.push({ name:this.formLabelAlign.name, @@ -266,7 +267,7 @@ export default { deleteDetail: function(index,rows) { this.$confirm('此操作将删除数据,','是否继续?','提示',{ confirmButtonText:'确定', - confirmButtonText:'取消', + cancelButtonText:'取消', type:'warning' }).then(()=>{ this.tableData.splice(index,1) @@ -299,6 +300,25 @@ export default { diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue index 4e804c728..96bb78946 100644 --- a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue @@ -50,12 +50,13 @@
-
+
@@ -352,7 +353,7 @@ export default { submit: function(){ this.$confirm('确认进行添加','是否继续？','提示',{ confirmButtonText: '确定', - confirmButtonText: '取消', + cancelButtonText: '取消', }).then(()=>{ this.tableData.push({ holdUnit:this.formLabelAlign.holdUnit, @@ -379,7 +380,7 @@ export default { deleteDetail: function(index,rows) { this.$confirm('此操作将删除数据,','是否继续?','提示',{ confirmButtonText:'确定', - confirmButtonText:'取消', + cancelButtonText:'取消', type:'warning' }).then(()=>{ this.tableData.splice(index,1) @@ -415,6 +416,25 @@ export default { diff --git a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue index e6379a0c8..6409bdc52 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue @@ -47,12 +47,13 @@
-
+
@@ -325,7 +326,7 @@ export default { submit: function(){ this.$confirm('确认进行添加','是否继续？','提示',{ confirmButtonText: '确定', - confirmButtonText: '取消', + cancelButtonText: '取消', }).then(()=>{ this.tableData.push({ type:this.formLabelAlign.type, @@ -346,7 +347,7 @@ export default { deleteDetail: function(index,rows) { this.$confirm('此操作将删除数据,','是否继续?','提示',{ confirmButtonText:'确定', - confirmButtonText:'取消', + cancelButtonText:'取消', type:'warning' }).then(()=>{ this.tableData.splice(index,1) @@ -382,6 +383,25 @@ export default {