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

2021-12-14 17:07:34 +08:00
parent 4b5b3669c9 8c21952c09
commit 537804660c
3 changed files with 7 additions and 2 deletions
@@ -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() {
@@ -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'
@@ -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'