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

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

@@ -263,7 +263,6 @@
       </div>
     </div>
     <ProcessFooter
-      show-back
       show-transfer
       show-submit
       :transfer-loading="isTransfer"
@@ -271,7 +270,6 @@
       :saveLoading="saveLoading"
       :approval="true"
       @transfer="handleTransfer"
-      @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -448,31 +446,6 @@ export default {
       }, e => {
       });
     },
-    //驳回
-    beforeBack(){
-      if(!this.commentText){
-        this.$message.warning('请填写审批意见')
-      }else{
-        this.listForm.commentText = this.commentText
-        this.listForm.stepFlag =  '1'
-        const json = JSON.stringify(this.listForm);
-        this.isSubmit = true
-        this.$http.post('lawss/activiti/completeTask', {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json,
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message)
-            this.$router.push('/processCenter')
-          }
-          this.isSubmit = false
-        }, e => {
-        });
-      }
-    },
     //确认转办
     checkedRole (data) {
       this.assigneeNewLoading = true