Merge branch 'master' into xiaotong

src/views/jira/Notify.vue

@@ -151,7 +151,11 @@ export default {
       },
       sendFormRules: {
         progress: [
-          { required: true, message: '请输入测试进度百分比，不需要%', trigger: 'blur' }
+          {
+            required: true,
+            message: '请输入测试进度百分比，不需要%',
+            trigger: 'blur'
+          }
         ]
       }
     }
@@ -237,12 +241,18 @@ export default {
       this.sendScheduleData.progress = this.sendScheduleForm.progress + '%'
       this.sendScheduleData.risk = this.sendScheduleForm.risk
       this.sendScheduleData.webhook = this.sendProjectRobot.dingUrl
-      sendScheduleReport(this.sendScheduleData).then((resp) => {
-        if (resp.data.data === true) {
-          this.sendScheduleDialogVisible = false
-          return this.$message.success('发送成功!')
-        } else if (resp.data.data === false) {
-          return this.$message.error('发送失败!')
+      this.$refs.sendFormRef.validate((valid) => {
+        if (!valid) {
+          return false
+        } else {
+          sendScheduleReport(this.sendScheduleData).then((resp) => {
+            if (resp.data.data === true) {
+              this.sendScheduleDialogVisible = false
+              return this.$message.success('发送成功!')
+            } else if (resp.data.data === false) {
+              return this.$message.error('发送失败!')
+            }
+          })
         }
       })
     },