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

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -427,18 +427,19 @@ export default {
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
+        planStatus: '0',
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
         //展示的数据只能是未开始的
-        res.data.list.forEach(item => {
+        // res.data.list.forEach(item => {
-          if(item.planStatus === '0'){
+        //   if(item.planStatus === '0'){
-            this.standinfoList.push(item)
+        //     this.standinfoList.push(item)
-          }
+        //   }
-        })
+        // })
         this.total = this.standinfoList.length
       })
 

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3718,6 +3718,7 @@ export default {
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
+      sessionStorage.setItem('tableFlag', JSON.stringify(item))
       this.tableFlag = item
       item.page = 1
       this.getDomesticStandardTable(item)
@@ -4492,7 +4493,8 @@ export default {
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.getDomesticStandardTable(this.tableFlag)
+      let tabFlag  = JSON.parse(sessionStorage.getItem('tableFlag'))
+      this.getDomesticStandardTable(tabFlag)
       this.selectConfiguraStand()
       // 此处需要调用接口，修改个人配置
     },