Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -193,6 +193,11 @@ export default {
               title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
               path: '/standInvolveProject',
               menuId: '8a9c87fe06244fb9d55e78fb281f625b'
+            },
+            {
+              title: '企标制修订计划',
+              path: '/enterpriseStandardPlan',
+              // menuId: '8a9c87fe06244fb9d55e78fb281f625b'
             }
             // {
             //   title: '动态信息',

src/pages/home2/components/empennage/index.vue

@@ -80,11 +80,13 @@
 
 <style lang="less" scoped>
     .link {
+        margin-right: 10px;
         display: flex;
         border-radius: 3px;
         height: 100%;
         align-items: center;
         justify-content: space-around;
+        box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
         .borderRight {
             padding-right: 30px;
             margin-right: 30px;

src/pages/home2/components/navMenu/index.vue

@@ -1,7 +1,7 @@
 <!-- 右侧导航 -->
 <template>
     <div class="nav-menu">
-        <div class="lattice">
+        <div class="lattice" style=" box-shadow:1px 1px 10px rgba(0,0,0,0.1);" >
             <div class="title"><i class="el-icon-s-promotion"></i> 快捷入口</div>
             <div class="menu-wrap">
                 <enter-card v-for="(item, index) in list"
@@ -67,8 +67,10 @@
 <style lang="less" scoped>
     .nav-menu {
         .lattice {
+          margin-right: 10px;
             background: #fff;
             margin-bottom: 10px;
+            border-radius: 3px;
             .title {
                 margin-bottom: 10px;
                 padding-left: 10px;
@@ -77,6 +79,7 @@
                 background: #fff;
                 font-size: 16px;
                 font-weight: bold;
+              border-radius: 10px;
             }
             .menu-wrap {
                 height: 240px;

src/pages/home2/components/searchGroup/index.vue

@@ -22,8 +22,8 @@
         placeholder="请输入关键词"
         clearable
       ></el-input>
-      <el-button  type="primary" @click="search">搜索</el-button>
+      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;" type="primary" @click="search">一般检索</el-button>
-      <el-button style="margin-left: 5px;"  type="primary" @click="seniorSearch">高级搜索</el-button>
+      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;" type="primary" @click="seniorSearch">高级检索</el-button>
     </div>
   </div>
 </template>
@@ -91,7 +91,7 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
+<style  lang="less" scoped>
 .search-group {
   display: flex;
   width: 100%;
@@ -105,10 +105,11 @@ export default {
         width: 18vm;
         height: 40px;
         color: #333333;
-        font-size: 16px;
+        font-size: 13px;
         border: 0;
         border-radius: 3px;
        background-color: #FFFFFF;
+        box-shadow:1px -2px 10px rgba(0,0,0,0.1);
       }
     }
   }
@@ -118,11 +119,12 @@ export default {
     ::v-deep {
       .el-input__inner {
         height: 40px;
-        font-size: 16px;
+        font-size: 14px;
         color: #333333;
         border: 0;
         border-radius: 3px;
         background: #FFFFFF;
+        box-shadow:1px -2px 10px rgba(0,0,0,0.1);
       }
     }
   }
@@ -132,6 +134,7 @@ export default {
     border: 0;
     border-radius: 3px;
     background-color: #5ea9f6;
+
   }
 }
 </style>

src/pages/home2/components/todoList/index.vue

@@ -1274,10 +1274,12 @@ export default {
 
 <style lang="less" scoped>
 .to-do-list {
+  margin-right: 10px;
   border-radius: 3px;
   height: calc(~'100% - 310px');
   overflow: hidden;
   background: #FFFFFF;
+  box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
   .task {
     display: inline-block;
     margin: 15px;

src/pages/home2/index.vue

@@ -3,7 +3,7 @@
   <div class="home_main">
      <div class="left_wrapper">
         <search-group></search-group>
-       <div class="main-tabs" style="border-radius: 3px;">
+       <div class="main-tabs" style="box-shadow:1px 1px 10px rgba(0,0,0,0.1);border-radius: 3px;" >
          <div class="main-left-wrap" >
 <!--           <el-button type="text" style="font-size: 14px" class="more" @click="MORE">MORE</el-button>-->
            <el-tabs
@@ -142,7 +142,7 @@ export default {
         }
         ::v-deep {
           .el-tabs__item {
-            font-size: 16px;
+            font-size: 14px;
             font-weight: 600;
             /*color: #333333;*/
           }

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

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue

@@ -22,13 +22,14 @@
           </ProcessTitle>
           <div class="tableTitle">
             <div class="tableButton">
-              <el-button plain class="common-button-primary" size="mini" @click="">调取</el-button>
+              <el-button plain class="common-button-primary" size="mini" @click="handleSearchStandard">调取</el-button>
               <el-button plain class="common-button-primary" size="mini" @click="">删除</el-button>
             </div>
           </div>
           <div class="content">
             <div class="table-wrap">
               <el-table
+                  :data="infoTableDatas"
                   ref="multipleTable"
                   tooltip-effect="dark"
                   border
@@ -42,41 +43,36 @@
                     width="55"
                     align="center">
                 </el-table-column>
-                <el-table-column
-                    label="序号"
-                    type="index"
-                    align="center"
-                    width="100">
-                </el-table-column>
                 <el-table-column
                     label="标准编号/政策编号"
+                    prop="lawId"
                     align="center"
                     width="300"
                 >
                 </el-table-column>
                 <el-table-column
                     show-overflow-tooltip
-                    prop="standName"
+                    prop="lawName"
                     label="标准名称/政策名称"
                     align="center"
                 >
                 </el-table-column>
                 <el-table-column
-                    prop="issueTime"
+                    prop="productType"
                     sortable="custom"
                     width="200px"
                     align="center"
                     label="产品类型">
                 </el-table-column>
                 <el-table-column
-                    prop="SSRQ"
+                    prop="implTime"
                     sortable="custom"
                     align="center"
                     width="200px"
                     label="实施日期">
                 </el-table-column>
                 <el-table-column
-                    prop="SSRQ"
+                    prop="implRequire"
                     sortable="custom"
                     align="center"
                     width="200px"
@@ -210,6 +206,149 @@
         @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 选择标准的弹框 -->
+    <el-drawer
+        ref="standard"
+        title="查询结果"
+        size="1000px"
+        :visible.sync="standardDrawer"
+        direction="rtl"
+        :before-close="handleReviseDrawerClose">
+      <div class="standard-content">
+        <div class="content">
+          <div class="standard-table-search">
+            <el-form :model="standardSearchForm" inline class="label-input-form search-area">
+              <el-form-item label="标准编号/政策编号" style="margin-right:10px" prop="lawsNumber" class="search-item">
+                <el-input
+                    v-model="standardSearchForm.lawId"
+                    clearable placeholder="根据编号查找"
+                    :maxlength="100"
+                    @keyup.enter.native="getDomesticStandardTable"/>
+              </el-form-item>
+              <el-form-item label="标准名称/政策名称" style="margin-right:10px" prop="lawsName" class="search-item">
+                <el-input
+                    v-model="standardSearchForm.lawName"
+                    placeholder="根据名称查找"
+                    clearable
+                    :maxlength="100"></el-input>
+              </el-form-item>
+              <el-form-item label="产品类型" style="margin-right:10px" prop="productType" class="search-item">
+                <el-select v-model="standardSearchForm.productType" filterable clearable>
+                  <el-option
+                      v-for="item in productTypeOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                    icon="el-icon-search"
+                    type="primary"
+                    class="common-button-primary"
+                    @click="getDomesticStandardTable"
+                    round>
+                </el-button>
+                <el-button
+                    class="common-button-default"
+                    icon="el-icon-refresh-left"
+                    @click="handleResetSearch"
+                    round>
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="standard-table-wrap">
+            <el-table
+                ref="reviseDrawerTable"
+                :data="tableData.standardData"
+                tooltip-effect="dark"
+                style="width: 100%;"
+                :height="tableHeight.standardTableHeight"
+                border
+                class="drag-table"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                @selection-change="standSelectChange">
+              <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+              </el-table-column>
+              <el-table-column
+                  prop="lawId"
+                  width="200"
+                  label="标准编号/政策编号"
+                  align="center">
+              </el-table-column>
+              <el-table-column
+                  prop="lawName"
+                  label="标准名称/政策名称"
+                  align="center"
+                  width="220px"
+              >
+              </el-table-column>
+              <el-table-column
+                  prop="productType"
+                  label="产品类型"
+                  align="center">
+              </el-table-column>
+              <el-table-column
+                  prop="implTime"
+                  sortable
+                  label="实施时间"
+                  width="150"
+                  align="center">
+              </el-table-column>
+              <el-table-column
+                  prop="implRequire"
+                  label="实施要求"
+                  align="center">
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="80">
+                <template slot-scope="scope">
+                  <el-button
+                      class="opera-btn"
+                      size="mini"
+                      type="primary"
+                      @click="handlePreview(scope.row)">查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+              :page="standardSearchForm.page"
+              :total="standardSearchForm.total"
+              @pageChange="handleStandardPageChange"
+              @pageSizeChange="handleStandardPageSizeChange"></pagination>
+          <loading :loading="loadSarStandard">数据获取中</loading>
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <!--        <el-button-->
+        <!--            round-->
+        <!--            class="common-button-primary"-->
+        <!--            icon="el-icon-check"-->
+        <!--            type="primary"-->
+        <!--            @click="handleProcessStandardNext(1)">新增-->
+        <!--        </el-button>-->
+        <el-button
+            round
+            class="common-button-primary"
+            icon="el-icon-check"
+            type="primary"
+            @click="handleProcessStandardNext(2)">带入
+        </el-button>
+        <el-button
+            round
+            class="common-button-default"
+            icon="el-icon-close"
+            @click="handleProcessStandardNext(3)">取消
+        </el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -228,6 +367,32 @@ export default {
   },
   data() {
     return {
+      infoTableDatas: [],
+      productTypeOptions: [{label: '树形结构', value: 'TREE'}, {label: '下拉选项', value: 'SEL_OPTION'}],
+      loadSarStandard: false,
+      tableHeight: {
+        standardTableHeight: null
+      },
+      tableData: {
+        // 标准表格数据
+        standardData: [],
+        // 任务分解单数据
+        taskTableData: []
+      },
+      standardSearchForm: {
+        lawId: '',
+        lawName: '',
+        productType: '',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'INLAND',
+        standSort: '',
+        standName: '',
+        standEnName: '',
+        standNumber: ''
+      },
+      standardDrawer: false,
       isSubmit: false,
       active: "1", //默认显示基础信息页面
       // 基础信息form表单
@@ -312,6 +477,108 @@ export default {
     }
   },
   methods: {
+    handleProcessStandardNext(status) {
+      switch (status) {
+          // 新增
+        case 1:
+          this.selectedList = []
+          this.standardCheckedList = []
+          this.standardDrawer = false
+          this.verifySarStandard = true
+          this.clearFormData(this.form)
+          break
+          // 带入
+        case 2:
+          if (this.standardCheckedList && this.standardCheckedList.length >= 1) {
+            console.log('504',this.standardCheckedList)
+            this.infoTableDatas = this.standardCheckedList
+            console.log('505',this.infoTableDatas)
+            this.standardDrawer = false
+          } else {
+            this.$message.warning('请选择要带入的数据')
+          }
+          break
+          // 取消
+        case 3:
+          this.selectedList = []
+          this.standardCheckedList = []
+          this.standardDrawer = false
+          break
+      }
+    },
+    handleStandardPageChange(page) {
+      this.standardSearchForm.page = page
+      this.getDomesticStandardTable()
+    },
+    handleStandardPageSizeChange(pageSize) {
+      this.standardSearchForm.page = 1
+      this.standardSearchForm.pageSize = this.$store.getters.userInfo.configContent
+      this.getDomesticStandardTable()
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherLawsStandDetails',
+        params: {
+          id: item.id,
+          pageType: 'LAWS_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    standSelectChange(data) {
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
+      this.standardCheckedList = data
+    },
+    //清空搜索条件
+    handleResetSearch() {
+      this.standardSearchForm.lawId = ''
+      this.standardSearchForm.lawName = ''
+      this.standardSearchForm.productType = ''
+      this.standardSearchForm.standType = 'INLAND'
+      this.standardSearchForm.standNumber = ''
+      this.standardSearchForm.standSort = ''
+      this.standardSearchForm.standName = ''
+      this.standardSearchForm.standEnName = ''
+      this.getDomesticStandardTable()
+    },
+    getDomesticStandardTable() {
+      this.loadSarStandard = true
+      this.$http.get('sarIssueTrack/issueTrack', this.standardSearchForm, {_this: this}, res => {
+        this.loadSarStandard = false
+        if (res.ok) {
+          this.tableData.standardData = res.data.records
+          this.standardSearchForm.total = res.data.total
+          if ((this.tableData.standardData.length === 0 || this.tableData.standardData === []) && this.standardSearchForm.page !== 1) {
+            this.handleStandardPageChange(1)
+          }
+        }
+      }, e => {
+        this.loadSarStandard = false
+      })
+    },
+    handleSearchStandard() {
+      this.handleResetSearch()
+      this.standardDrawer = true
+      this.$nextTick(() => {
+        // 动态设置表格高度
+        this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+        window.onresize = () => {
+          this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+        }
+      })
+      this.getDomesticStandardTable()
+    },
+    /**
+     * 关闭修订 Drawer 的监听
+     * @param done
+     */
+    handleReviseDrawerClose(done) {
+      done()
+    },
     //基础信息/人员信息
     handleTabs(type) {
       this.active = type;
@@ -429,6 +696,32 @@ export default {
 
 
 .zdrzbzORzchgxxmsc-step1 {
+  .standard-content {
+    height: 100%;
+    padding: 10px 0 0;
+    .content {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding: 0 10px;
+      .standard-table-wrap {
+        flex: auto;
+        overflow-y: auto;
+      }
+      .pagination {
+        position: static;
+        /deep/ .pagination-slot {
+          padding: 0;
+        }
+      }
+      .search-area {
+        display: flex;
+        justify-content: left;
+        background: #FFF;
+        padding: 10px 10px 0;
+      }
+    }
+  }
   .myForm {
     /deep/ .el-form-item__content {
       line-height: 10px;

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -208,44 +208,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-<!--          <el-form-item-->
-<!--              label="是否关联其他类别"-->
-<!--              title="是否关联其他类别"-->
-<!--              prop="isRelate"-->
-<!--              class="add-form-item"-->
-<!--          >-->
-<!--            <el-select-->
-<!--                placeholder="请选择类别"-->
-<!--                v-model="attributeEO.isRelate"-->
-<!--                filterable-->
-<!--            >-->
-<!--              <el-option-->
-<!--                  v-for="item in isRelateOptions"-->
-<!--                  :value="item.value"-->
-<!--                  :key="item.value"-->
-<!--                  :label="item.label"-->
-<!--              ></el-option>-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item-->
-<!--              label="关联类别"-->
-<!--              prop="relateDicId"-->
-<!--              v-if="attributeEO.isRelate === '0'"-->
-<!--              class="add-form-item"-->
-<!--          >-->
-<!--            <el-select-->
-<!--                v-model="attributeEO.relateDicId"-->
-<!--                placeholder="请选择类别"-->
-<!--            >-->
-<!--              <el-option-->
-<!--                  v-for="opt in relateDicIdOptions"-->
-<!--                  :value="opt.value"-->
-<!--                  :key="opt.value"-->
-<!--                  :label="opt.label"-->
-<!--              >{{ opt.label }}</el-option-->
-<!--              >-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
         </el-form>
       </div>
       <div id="roleFormButton" class="demo-drawer-footer">
@@ -633,6 +595,9 @@ export default {
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.handleSelectPageChange(1)
+            }
           }else {
             this.$message.error(res.message)
           }
@@ -649,6 +614,9 @@ export default {
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.handleSelectPageChange(1)
+            }
           }else {
             this.$message.error(res.message)
           }
@@ -665,6 +633,9 @@ export default {
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.handleSelectPageChange(1)
+            }
           }else {
             this.$message.error(res.message)
           }
@@ -681,6 +652,9 @@ export default {
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.handleSelectPageChange(1)
+            }
           }else {
             this.$message.error(res.message)
           }
@@ -712,6 +686,7 @@ export default {
     handleSelect() {
       this.selectModal = true
       this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.clearLawBtn()
       this.searchLawBtn()
     },
     saveInfo () {

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -0,0 +1,157 @@
+<template>
+    <div id="enterpriseStandardPlan">
+        <div class="action-bar">
+            <el-button type="primary"
+                       class="common-button-primary add-button"
+                       size="mini"
+                       @click=""><i class="el-icon-plus"></i>新增
+            </el-button>
+            <el-button class="common-button-default in-button"
+                       size="mini"
+                       @click=""><i class="iconfont">&#xe6de;</i>导入
+            </el-button>
+            <el-button class="common-button-default export-button"
+                       size="mini"
+                       @click=""><i class="iconfont">&#xe6e9;</i>导出
+            </el-button>
+            <el-button class="common-button-default"
+                       size="mini" @click=""><i class="iconfont">&#xe669;</i>下载
+            </el-button>
+            <el-button class="common-button-default"
+                       size="mini"
+                       @click=""><i class="iconfont">&#xe611;</i>删除
+            </el-button>
+        </div>
+        <div class="content">
+            <div class="table-wrap">
+                <el-table
+                        ref="multipleTable"
+                        :data="data"
+                        tooltip-effect="dark"
+                        border
+                        style="width: 100%; flex: auto;"
+                        class="drag-table"
+                        height="100%"
+                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+                    <el-table-column
+                            label="计划状态"
+                            width="120">
+                    </el-table-column>
+                    <el-table-column
+                            prop="standName"
+                            label="计划类型"
+                            width="350">
+                    </el-table-column>
+                    <el-table-column
+                            prop="issueTime"
+                            width="150"
+                            label="企标类别">
+                    </el-table-column>
+                    <el-table-column
+                            prop="SSRQ"
+                            width="150"
+                            label="企业编号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="XCXSSRQ"
+                            width="150"
+                            label="代替企标编号">
+                    </el-table-column>
+                    <el-table-column
+                            prop="ZCCSSRQ"
+                            width="150"
+                            label="企标名称">
+                    </el-table-column>
+                    <el-table-column
+                            prop="textStatus"
+                            width="120"
+                            label="英文名称">
+                    </el-table-column>
+                    <el-table-column
+                            prop="textStatus"
+                            label="主要起草人">
+                    </el-table-column>
+<!--                    <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100">-->
+                    <el-table-column fixed="right" label="操作" align="center" width="60">
+                        <template slot-scope="scope">
+                            <div @click.stop style="display: inline-block">
+                                <el-dropdown trigger="click" @command="handleCommand">
+                                    <i class="iconfont">&#xe61e;</i>
+                                    <el-dropdown-menu slot="dropdown">
+                                        <el-dropdown-item :command="[scope.row, '编辑']">
+                                            编辑
+                                        </el-dropdown-item>
+                                        <el-dropdown-item :command="[scope.row, '删除']">
+                                            删除
+                                        </el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </el-dropdown>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <pagination :page="form.page" :total="total"
+                        @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "enterpriseStandardPlan",
+        components: {},
+        data() {
+            return {
+                form: {
+                    page: 1,
+                    pageSize: '',
+                },
+                total: 0,
+
+                data: []
+            }
+        },
+        props: {},
+        watch: {},
+        methods: {
+            pageChange () {},
+            pageSizeChange () {},
+            handleCommand () {},
+            getData () {
+                this.$http.get('esRevisePlan/es-revise-plan/getAllPlans', {}, {
+                    _this: this
+                }, res => {
+                    if (res.ok) {
+                        this.data = res.data
+                    }
+                })
+            },
+        },
+        computed: {},
+        mounted() {
+            this.getData()
+        },
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/mixins';
+    @import '~@/assets/styles/style';
+    #enterpriseStandardPlan {
+        height: 100%;
+        .content {
+            height: calc(~'100% - 53px');
+            .table-wrap {
+                height: calc(~'100% - 56px');
+            }
+            .pagination {
+                position: static;
+                /deep/ .pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
+    }
+</style>

src/router/index.js

@@ -1857,6 +1857,17 @@ const routes = [
           requireAuth: true,
           title: '工作组',
         }
+      },
+        // 企标制修订计划
+      {
+        path: '/enterpriseStandardPlan',
+        name: 'enterpriseStandardPlan',
+        component: () =>
+            import('@/pages/regulatoryRepository/enterpriseStandardPlan/index'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划',
+        }
       },
       // 标准涉及项目
       {