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

src/assets/styles/drawer.less

@@ -14,7 +14,7 @@
     }
     .el-drawer__body{
       height: 100%;
-      overflow-y: auto;
+      //overflow-y: auto;
       display: flex;
       flex-direction: column;
       // 底部带 提交、取消按钮

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

@@ -291,12 +291,13 @@
                 </el-form-item>
               </el-form>
             </div>
+            <div style="height: calc(100% - 65px); overflow: auto">
               <el-table
                 :data="sarAccessListDatas"
                 tooltip-effect="dark"
                 style="width: 100%"
                 border
-              class="table-height"
+                height="100%"
                 :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
                 @selection-change="selectListChange"
@@ -347,6 +348,7 @@
                 </el-table-column>
               </el-table>
             </div>
+          </div>
           <pagination
             :page="page"
             :pageSize="pageSize"