Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/views/modules/sys/icvaccineprarmeter-add-or-update.vue

@@ -220,7 +220,8 @@
             </el-option>
           </el-select>
       </el-form-item>
-      <el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">
+      <el-form-item label="原因" label-width="150px">
+          <!--<el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">-->
           <el-select class="item_width_2"
                      v-model.trim="dataForm.reason"
                      placeholder="请选择"
@@ -337,6 +338,14 @@
       return !this.dataForm.unitId
     },
     dataRule () {
+        var checkPhone = (rule, value, callback) => {
+            let moblie = /^1(3|4|5|6|7|8|9)\d{9}$/; let tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/
+            if (!moblie.test(this.dataForm.mobile) && !tel.test(this.dataForm.mobile)) {
+                return callback(new Error('请输入正确的手机号或座机号！'))
+            } else {
+                callback()
+            }
+        }
       return {
         customerId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -384,7 +393,8 @@
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+            { validator: checkPhone, trigger: 'blur' }
         ],
         idCard: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -728,16 +738,6 @@
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      //验证手机号码
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/;
-      if (regPhone.test(this.dataForm.mobile) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
       if(this.dataForm.isVaccination === '1'){
           if(this.dataForm.firstVacTime === ''){
               this.$message({