Merge remote-tracking branch 'origin/pet_门口门禁' into pet_门口门禁

# Conflicts:
#	src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/sendUtil.vue

src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/sendUtil.vue

@@ -127,8 +127,10 @@ export default {
       this.$parent.activeName = 'List'
     },
     sendMessage() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return false
+        }
         requestFN(
           '/vehiclemessage/auditChronicallyCar',
           {
@@ -143,9 +145,6 @@ export default {
         }).catch((e) => {
           this.loading = false
         })
-        } else {
-          return false
-        }
       })
     }
   }

src/views/truckinputportmanage/dangertruckcheck/components/sendUtil.vue

@@ -129,6 +129,10 @@ export default {
       this.$parent.activeName = 'List'
     },
     sendMessage() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return false
+        }
         requestFN(
           '/vehiclemessage/qyAudit',
           {
@@ -139,10 +143,12 @@ export default {
           }
         ).then((data) => {
           this.visible = false
+          this.handleClose()
           this.$emit('refresh', '')
         }).catch((e) => {
           this.loading = false
         })
+      })
     }
   }
 }