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

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -565,6 +565,9 @@ export default {
     },
     //驳回事件
     beforeBack () {
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
         this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
@@ -583,6 +586,7 @@ export default {
           }
         }, e => {
         });
+      }
     },
     //提交事件
     handleSubmit() {

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -561,7 +561,8 @@ export default {
       })
     },
     //驳回事件
-    beforeBack () { if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
+    beforeBack () {
+      if(!this.commentText){
       this.$message.warning('请填写审批意见')
     } else {
       this.listForm.fenFlag = '2'

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -560,7 +560,7 @@ export default {
 
     //驳回事件
     beforeBack () {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
+      if(!this.commentText){
         this.$message.warning('请填写审批意见')
       } else {
         this.listForm.fenFlag = '2'