Merge branch 'dev-huji' into dev

src/views/modules/base/huji/immigration/edit.vue

@@ -771,13 +771,13 @@ export default {
     },
 
     async handleComfirm() {
-      this.btnDisable = true
+      
       // setTimeout(() => {
       //   this.btnDisable = false
       // }, 10000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          // app.util.validateRule(messageObj)
           this.btnDisable = false
         } else {
           if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
@@ -786,6 +786,7 @@ export default {
               message: '手机号格式有误'
             })
           }
+          this.btnDisable = true
           if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
@@ -804,8 +805,8 @@ export default {
                 return
               }
             }
-            
-          } else this.submit()
+          }
+          this.submit()
           
         }
       })
@@ -846,6 +847,7 @@ export default {
       this.orgId = ''
       this.nowAllCode = []
       this.btnDisable = false
+      this.userInfo = {}
       this.fmData = iniFmData()
     }
   }