修改样式

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;

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) {

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;
+      }
+    }
+  }
 }
 </style>

src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
     <!--     表格-->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -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 {
 
 <style  lang="less" scoped>
 .child2{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
     <!--     表格-->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -295,7 +296,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           name:this.formLabelAlign.name,
@@ -314,7 +315,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -332,9 +333,7 @@ export default {
     //编辑（修改）
     drawer2:function (index,row) {
       this.formLabelAlign2=Object.assign({},row);
-      _index=index;
       console.log(index);
-      console.log(_index);
     },
     //点击确定（编辑）(没出)
     editSubForm(){
@@ -380,6 +379,25 @@ export default {
 
 <style  lang="less" scoped>
 .child1{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue

@@ -108,5 +108,37 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.listOf-Cost{
+  height: 100%;
+  padding: 0 10px;
+  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;
+      }
+    }
+  }
+}
 
 </style>

src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue

@@ -50,12 +50,13 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: 100%"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -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 {
 
 <style  lang="less" scoped>
 .child3{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue

@@ -49,12 +49,13 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: 100%"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -365,7 +366,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           unitName:this.formLabelAlign.unitName,
@@ -395,7 +396,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -432,6 +433,25 @@ export default {
 
 <style  lang="less" scoped>
 .child2{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue

@@ -49,12 +49,13 @@
     </el-form>
   </div>
 <!-- 表格 -->
-  <div class="">
+  <div class="container">
     <el-table
         :data="tableData"
         tooltip-effect="dark"
         style="width: auto"
         border
+        height="100%"
         :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
         @selection-change="handleSelectionChange">
@@ -462,6 +463,7 @@ export default {
         nature:'',
         state:''
       },
+      formInline2: {},
       tableData:[{
         totalName: '1',
         branchName:'1',
@@ -535,14 +537,11 @@ export default {
 
   },
   methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
     //新增方法
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           totalName:this.formLabelAlign.totalName,
@@ -582,7 +581,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -622,6 +621,25 @@ export default {
 
 <style  lang="less" scoped>
 .child1{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  flex: auto;
+  width: 100%;
+  height: calc(100% - 110px) !important;
+
+  .pagination {
+    position: static;
+
+    /deep/ .pagination-slot {
+      padding: 0;
+    }
+  }
+}
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue

@@ -49,12 +49,13 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: 100%"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -107,7 +108,6 @@
             width="150"
         >
         </el-table-column>
-        </el-table-column>
         <el-table-column
             align="center"
             prop="standardType"
@@ -467,7 +467,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           stage:this.formLabelAlign.stage,
@@ -502,7 +502,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -517,14 +517,6 @@ export default {
         })
       })
     },
-    //清空
-    resetForm(formName) {
-      this[formName] = {};
-
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
-    },
     /*增加行和删除行*/
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
@@ -545,6 +537,25 @@ export default {
 
 <style  lang="less" scoped>
 .child4{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -267,7 +268,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           type:this.formLabelAlign.type,
@@ -286,7 +287,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -327,6 +328,25 @@ export default {
 
 <style  lang="less" scoped>
 .child3{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
     <!--     表格-->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -286,7 +287,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           type:this.formLabelAlign.type,
@@ -305,7 +306,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -342,6 +343,25 @@ export default {
 
 <style  lang="less" scoped>
 .child4{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
 <!--     表格-->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -307,7 +308,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           holdUnit:this.formLabelAlign.holdUnit,
@@ -327,7 +328,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -363,6 +364,25 @@ export default {
 
 <style  lang="less" scoped>
 .child2{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -299,7 +300,7 @@ export default {
     submit: function(){
       this.$confirm('确认进行添加','是否继续？','提示',{
         confirmButtonText: '确定',
-        confirmButtonText: '取消',
+        cancelButtonText: '取消',
       }).then(()=>{
         this.tableData.push({
           totalName:this.formLabelAlign.totalName,
@@ -320,7 +321,7 @@ export default {
     deleteDetail: function(index,rows) {
       this.$confirm('此操作将删除数据,','是否继续?','提示',{
         confirmButtonText:'确定',
-        confirmButtonText:'取消',
+        cancelButtonText:'取消',
         type:'warning'
       }).then(()=>{
         this.tableData.splice(index,1)
@@ -361,6 +362,25 @@ export default {
 
 <style  lang="less" scoped>
 .child1{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px

src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue

@@ -46,5 +46,37 @@ export default {
 </script>
 
 <style  lang="less" scoped>
+.subsidy-Cost{
+  height: 100%;
+  padding: 0 10px;
+  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;
+      }
+    }
+  }
+}
 
 </style>

src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue

@@ -47,12 +47,13 @@
       </el-form>
     </div>
     <!--     表格-->
-    <div class="">
+    <div class="container">
       <el-table
           :data="tableData"
           tooltip-effect="dark"
           style="width: auto"
           border
+          height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="handleSelectionChange">
@@ -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 {
 
 <style  lang="less" scoped>
 .children{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .container {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    flex: auto;
+    width: 100%;
+    height: calc(100% - 110px) !important;
+
+    .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
   .leading-in{
     width: 400px;
     height: 200px