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

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

@@ -125,15 +125,6 @@
           </el-table-column>
         </el-table>
       </div>
-      <ProcessFooter
-        show-save
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        @save="handleSave"
-        @submit="handleSubmit"
-      >
-      </ProcessFooter>
     </div>
     <div class="content" v-if="active == '2'">
       <div class="block" style="padding-top: 20px;">
@@ -485,6 +476,15 @@
         </el-table-column>
       </el-table>
     </el-drawer>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
   </div>
 </template>
 
@@ -588,7 +588,6 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
-
 .bzqdfb-step1 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -633,7 +632,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 55px');
+    height: calc(~'100% - 103px');
     overflow: auto;
 
     .tableTitle {