项目评估流程bug

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -190,6 +191,14 @@
             label="责任人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -292,6 +301,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -392,11 +404,36 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
     //驳回事件
     beforeBack() {
       if(this.commentText === null || this.commentText === undefined || this.commentText === ''){

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -195,6 +196,14 @@
             label="责任人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -318,6 +327,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -462,9 +474,30 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -511,7 +544,11 @@ export default {
         this.isSubmit = false;
       }, e => {
       });
-    }
+    },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -195,6 +196,14 @@
             label="责任人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -316,6 +325,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -455,15 +467,37 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //提交事件
@@ -486,7 +520,11 @@ export default {
         this.isSubmit = false;
       }, e => {
       });
-    }
+    },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
   },
 
   computed: {

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -195,6 +196,14 @@
             label="责任人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -318,6 +327,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -462,9 +474,30 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -510,7 +543,11 @@ export default {
         this.isSubmit = false;
       }, e => {
       });
-    }
+    },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -706,8 +706,6 @@ export default {
     //批量编辑确定按钮事件
     saveBatchEditForm() {
       this.selectList = JSON.parse(localStorage.getItem("selectList"));
-      console.log("datalist", this.dataList);
-      console.log("select", this.selectList);
       this.dataList.forEach(item => {
         this.selectList.forEach(items => {
           if (item.id === items) {
@@ -873,27 +871,59 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
+          let dataChildren = []
+          let dataListChildren = []
           this.listForm.prcNum = this.prcNum;
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
-          // this.listForm.dataList = item.dataList;
+          this.listForm.dataList = item.dataList;
-          this.dataList = this.listForm.dataList[0].children;
+          this.listForm.dataList.forEach(item => {
-          this.dataList.map(item => {
+              item.children.forEach(items=> {
-            this.$set(item, "standName", this.listForm.dataList[0].standName);
+                if(items.key === item.standId){
-            this.$set(item, "standEnName", this.listForm.dataList[0].standEnName);
+                  this.$set(items, "standName", item.standName);
-            this.$set(item, "standYear", this.listForm.dataList[0].standYear);
+                  this.$set(items, "standEnName", item.standEnName);
-            this.$set(item, "standSort", this.listForm.dataList[0].standSort);
+                  this.$set(items, "standYear", item.standYear);
-            this.$set(item, "standNumber", this.listForm.dataList[0].standNumber);
+                  this.$set(items, "standSort", item.standSort);
-          });
+                  this.$set(items, "standNumber", item.standNumber);
-          this.total = this.listForm.dataList[0].children.length;
+                }
+              })
+          })
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
         } else {
           this.listForm = item.form;
-          this.dataList = item.form.dataList[0].children;
+          let dataChildren = []
-          this.total = item.form.dataList[0].children.length;
+          let dataListChildren = []
+          this.listForm.dataList.forEach(item => {
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
+          })
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
+          // this.dataList = item.form.dataList[0].children;
+          // this.total = item.form.dataList[0].children.length;
         }
 
       });

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

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -195,6 +196,14 @@
             label="责任人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -318,6 +327,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -389,7 +401,6 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      console.log(item);
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -447,7 +458,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -464,9 +474,30 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -511,7 +542,11 @@ export default {
         }
         this.isSubmit = false;
       });
-    }
+    },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
   },
   computed: {
     listNoDataText() {

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

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-                :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-                style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
-                row-key="standId"
+          row-key="standId"
-                height="70%"
+          height="70%"
-                border
+          border
+          highlight-current-row
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -193,6 +194,14 @@
                     label="责任人">
             </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -316,6 +325,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -460,9 +472,30 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -509,6 +542,10 @@ export default {
         }, e => {
         });
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -43,11 +43,12 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-          :data="dataList"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
-          style="width: 100%; border: 1px solid #cccccc"
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
         >
@@ -195,6 +196,14 @@
             label="责任人">
           </el-table-column>
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -318,6 +327,9 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -462,9 +474,30 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        this.dataList = item.dataList;
+        let dataChildren = []
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        let dataListChildren = []
-        this.listForm.breakdownList = item.breakdownList;
+        this.listForm.dataList.forEach(item => {
+          item.children.forEach(items=> {
+            if(items.key === item.standId){
+              this.$set(items, "standName", item.standName);
+              this.$set(items, "standEnName", item.standEnName);
+              this.$set(items, "standYear", item.standYear);
+              this.$set(items, "standSort", item.standSort);
+              this.$set(items, "standNumber", item.standNumber);
+            }
+          })
+        })
+        this.listForm.dataList.forEach(item => {
+          dataChildren.push(item.children)
+        })
+        dataChildren.forEach((item,index) => {
+          dataListChildren = dataListChildren.concat(item)
+        })
+        this.dataList = dataListChildren
+        this.total = this.dataList.length;
+        // this.dataList = item.dataList;
+        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -510,7 +543,11 @@ export default {
         this.isSubmit = false;
       }, e => {
       });
-    }
+    },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
   },
   computed: {
     listNoDataText() {