Merge branch 'dev_ljj_idcard'

src/views/components/editResi.vue

@@ -87,16 +87,16 @@
                     </el-form-item>
                   </div>
                   <!-- <el-col :span="6">
-                    
+
                   </el-col>
                   <el-col :span="6">
-                    
+
                   </el-col>
                   <el-col :span="6">
-                    
+
                   </el-col>
                   <el-col :span="6">
-                    
+
                   </el-col> -->
                 </div>
             </el-form-item>
@@ -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,18 +83,18 @@
                     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">
           </el-input>
         </el-form-item>
-        <el-form-item 
+        <el-form-item
                       label="现居地"
                       prop="presentAddress"
                       style="display: block"
@@ -111,7 +111,7 @@
                     clearable
                     :disabled="isFromResi"
                     v-model="formData.presentAddress" />
-            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps" 
+            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps"
             v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
           </template>
         </el-form-item>
@@ -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()
       }
@@ -273,9 +273,9 @@ export default {
       icNatId: '',
       formData: {
         gridId: '',
-        agencyId: '',//当前网格所属组织Id	
-        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
-        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
         name: '',
         idCard: '',
         mobile: '',
@@ -358,12 +358,12 @@ export default {
       if (type != 'add') {
         // this.formData = { ...row, channel: [], content: '' }
         await this.loadFormData(row.id)
-        
-        
+
+
       } else {
         const { user } = this.$store.state
         this.nowAllCode = user.areaCodePath
-      } 
+      }
       // this.$refs['ref_form'].resetFields();
 
       console.log('formtype', type)
@@ -386,7 +386,7 @@ export default {
         const { user } = this.$store.state
         this.nowAllCode = user.areaCodePath
       }
-      
+
 
     },
     handleSourceArea(val) {
@@ -403,7 +403,7 @@ export default {
         this.formData.sourceAddress = ''
         this.formData.sourceAddressPathCode = ''
       }
-      
+
     },
     handleNowArea(val) {
       console.log('val-----', val)
@@ -469,7 +469,7 @@ export default {
 
       if (code === 0) {
         const nodes = data.map(item => ({
-          value: item.areaCode, // 
+          value: item.areaCode, //
           label: item.areaName,
           code: item.areaCode,
           level: item.level,
@@ -517,7 +517,7 @@ export default {
         console.log('deda-------', data)
         this.formData = { ...data, channel: [], content: '' }
         this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
-        
+
         if (data.userType == 'icresi') this.isFromResi = true
         else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
       } else {
@@ -566,7 +566,7 @@ export default {
           return false;
         }
       });
-      
+
 
     },
 

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: [