修改table页的过滤及展示

src/pages/processCenter/pages/creatProcess/bzpg/step4.vue

@@ -86,7 +86,7 @@
           </el-button>
         </div>
       </div>
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane
           v-for="(item, index) in projectTabName"
           :key="index"
@@ -380,7 +380,6 @@ export default {
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.resDats
-        this.oldDataList = item.resDats
         item.resDats.forEach(item => {
           if(!this.projectTabName.includes(item.projectName)){
             this.projectTabName.push(item.projectName)
@@ -671,8 +670,8 @@ export default {
       }
     }
   }
-  /deep/.el-tabs__header{
+  /deep/.el-tabs--border-card>.el-tabs__content{
-    margin: 0;
+    padding: 0;
   }
   .demo-drawer-content {
     margin-top: 10px;

src/pages/processCenter/pages/creatProcess/bzpg/step7.vue

@@ -135,7 +135,7 @@
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane
           v-for="(item, index) in projectTabName"
           :key="index"
@@ -146,7 +146,7 @@
       </el-tabs>
       <el-table
         ref="multipleTable"
-        :data="dataList"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
         tooltip-effect="dark"
         style="width: 100%"
         border
@@ -396,7 +396,7 @@ export default {
   data() {
     return {
       //折叠的标志，true为折叠，false为不折叠
-      activeName: 'first',
+      activeName: '',
       foldFormFlag: false,
       projectTabName: [],
       comFlag: 0,
@@ -460,25 +460,19 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      newDataList: [],
       countryOptions: [], //适用区域下拉框数据
       user1: "",
       user2: "",
       user3: "",
       user4: "",
       user5: "",
+      projectName: "",
       standMap: new Map()
     };
   },
   methods: {
     handleClick(tab) {
-      let projectData = this.dataList
+      this.projectName = tab.name
-      this.dataList = []
-      projectData.forEach(item => {
-        if(item.projectName === tab.name){
-          this.dataList.push(item)
-        }
-      })
     },
     //折叠/展开基础信息方法
     foldForm() {
@@ -604,13 +598,13 @@ export default {
           this.listForm.prcNum = this.prcNum
           this.listForm.prcName = this.prcName
           this.listForm['id'] = item.id
-          this.newDataList = item.dataList
           this.dataList = item.dataList
           item.dataList.forEach(item => {
             if(!this.projectTabName.includes(item.projectName)){
               this.projectTabName.push(item.projectName)
             }
           })
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
@@ -621,7 +615,7 @@ export default {
 
     //提交事件
     handleSubmit() {
-      this.listForm.dataList = this.newDataList
+      this.listForm.dataList = this.dataList
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
@@ -754,6 +748,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-tabs--border-card>.el-tabs__content{
+    padding: 0;
+  }
   /deep/.el-table th > .cell{
     font-size: 14px;
   }

src/pages/processCenter/pages/creatProcess/bzpg/step8.vue

@@ -135,7 +135,7 @@
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane
           v-for="(item, index) in projectTabName"
           :key="index"
@@ -146,7 +146,7 @@
       </el-tabs>
       <el-table
         ref="multipleTable"
-        :data="dataList"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
         tooltip-effect="dark"
         style="width: 100%"
         border
@@ -396,7 +396,7 @@ export default {
   data() {
     return {
       //折叠的标志，true为折叠，false为不折叠
-      activeName: 'first',
+      activeName: '',
       foldFormFlag: false,
       projectTabName: [],
       comFlag: 0,
@@ -460,9 +460,9 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      newDataList: [],
       countryOptions: [], //适用区域下拉框数据
       user1: "",
+      projectName: "",
       user2: "",
       user3: "",
       user4: "",
@@ -472,13 +472,7 @@ export default {
   },
   methods: {
     handleClick(tab) {
-      let projectData = this.dataList
+      this.projectName = tab.name
-      this.dataList = []
-      projectData.forEach(item => {
-        if(item.projectName === tab.name){
-          this.dataList.push(item)
-        }
-      })
     },
     //折叠/展开基础信息方法
     foldForm() {
@@ -604,13 +598,13 @@ export default {
           this.listForm.prcNum = this.prcNum
           this.listForm.prcName = this.prcName
           this.listForm['id'] = item.id
-          this.newDataList = item.dataList
           this.dataList = item.dataList
           item.dataList.forEach(item => {
             if(!this.projectTabName.includes(item.projectName)){
               this.projectTabName.push(item.projectName)
             }
           })
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
@@ -621,7 +615,7 @@ export default {
 
     //提交事件
     handleSubmit() {
-      this.listForm.dataList = this.newDataList
+      this.listForm.dataList = this.dataList
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
@@ -754,6 +748,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-tabs--border-card>.el-tabs__content{
+    padding: 0;
+  }
   /deep/.el-table th > .cell{
     font-size: 14px;
   }