Merge remote-tracking branch 'origin/master'

src/views/modules/common/approve-component-batch.vue

@@ -55,6 +55,8 @@
                 this.$message.error('请填写审批意见')
                 return
               }
+            } else {
+              this.dataForm.remark = this.dataForm.remark || '审批通过'
             }
             this.loading = true
             // 添加附件

src/views/modules/common/approve-component.vue

@@ -53,6 +53,8 @@
                 this.$message.error('请填写审批意见')
                 return
               }
+            } else {
+              this.dataForm.remark = this.dataForm.remark || '审批通过'
             }
             // 添加附件
             let fList = this.fileList