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

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -400,6 +400,7 @@ export default {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')
       }else{
+        this.isSubmit = true
         this.listForm.approvalOpinion = "1";
         this.saveLoading = true
         this.listForm.commentText = this.commentText;
@@ -416,12 +417,14 @@ export default {
             this.$router.push("/processCenter");
           }
           this.saveLoading = false
+          this.isSubmit = false
         });
       }/**/
     },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true
+      this.isSubmit = true;
+      this.listForm.approvalOpinion = "2";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {
@@ -432,8 +435,8 @@ export default {
         _this: this
       }, res => {
         if (res.success) {
-          this.$message.success(res.message)
-          this.$router.push('/processCenter')
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
         }
         this.isSubmit = false
       });