Merge branch 'dev_ljj_idcard'

src/views/components/editResi.vue

@@ -333,10 +333,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入身份证'))
+        callback(new Error('请输入证件号'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+          callback(new Error('证件号格式不正确'))
         }
         callback()
       }

src/views/modules/base/epidemic/travelForm.vue

@@ -83,12 +83,12 @@
                     v-model="formData.mobile">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证号"
+        <el-form-item label="证件号"
                       prop="idCard"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
-                    placeholder="请输入身份证号"
+                    placeholder="请输入身份证号或证件号"
                     clearable
                     :disabled="isFromResi"
                     v-model="formData.idCard">
@@ -245,10 +245,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('身份证不能为空'))
+        callback(new Error('证件号不能为空'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+          callback(new Error('证件号格式不正确'))
         }
         callback()
       }

src/views/modules/shequzhili/xiangmu/cpts/edit.vue

@@ -170,7 +170,7 @@
         </el-form-item>
 
         <el-form-item
-          label="身份证号"
+          label="证件号"
           prop="idCard"
           label-width="150px"
           style="display: block"
@@ -178,7 +178,7 @@
           <el-input
             class="item_width_1"
             maxlength="30"
-            placeholder="请输入身份证号"
+            placeholder="请输入身份证号或证件号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
             :disabled="formType === 'edit'"
@@ -444,10 +444,10 @@ export default {
     dataRule() {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
-          callback(new Error("请输入身份证"));
+          callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("身份证号格式不正确"));
+            callback(new Error("证件号格式不正确"));
           }
           callback();
         }
@@ -462,7 +462,7 @@ export default {
         ],
         name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         idCard: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" },
+          { required: true, message: "证件号不能为空", trigger: "blur" },
           { required: true, validator: checkIdCard, trigger: "blur" },
         ],
         birthplace: [