diff --git a/src/utils/validate.js b/src/utils/validate.js
index 480ad2692..c9e98d3e9 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -39,3 +39,13 @@ export function isURL(s) {
 export function isCard(s) {
   return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
 }
+/**
+ * 护照
+ * @param {*} s
+ */
+export function isPassport(s) {
+  let reg=/(^[EeKkGgDdSsPpHh]\d{8}$)|(^(([Ee][a-fA-F])|([DdSsPp][Ee])|([Kk][Jj])|([Mm][Aa])|(1[45]))\d{7}$)/;  //护照（包括香港和澳门）
+
+
+  return reg.test(s);
+}
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 751bde6c1..c9e6d7201 100644
--- a/src/views/components/editResi.vue
+++ b/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()
       }
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 505fe55c0..014216e24 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1,91 +1,115 @@
 <template>
-  <div :id="formId" class="resi-container">
-    <el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth">
+  <div :id="formId"
+       class="resi-container">
+    <el-form :ref="formId"
+             class="resi-form"
+             :model="form"
+             :rules="rulesForm"
+             :label-width="labelWidth">
       <template v-if="supportAdd">
         <el-row style="margin-bottom: 10px;">
           <el-col :span="24">
-            <el-button icon="el-icon-plus" size="small" @click="handleAddRow"></el-button>
+            <el-button icon="el-icon-plus"
+                       size="small"
+                       @click="handleAddRow"></el-button>
           </el-col>
         </el-row>
-        <resi-form v-for="(item, index) in addList" :key="index"  :ref="'baseForms' + index" :columns="3" :form-list="formList" :form-id="'baseForms' + item" />
+        <resi-form v-for="(item, index) in addList"
+                   :key="index"
+                   :ref="'baseForms' + index"
+                   :columns="3"
+                   :form-list="formList"
+                   :form-id="'baseForms' + item" />
       </template>
       <template v-else>
-        <el-row v-if="fixed" class="resi-row">
+        <el-row v-if="fixed"
+                class="resi-row">
           <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
           <el-col :span="6">
-              <el-form-item prop="GRID_ID" label="所属网格">
+            <el-form-item prop="GRID_ID"
+                          label="所属网格">
               <!-- <div class="resi-cell"> -->
-                <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.GRID_ID" placeholder="请选择网格" size="small"
-                  clearable class="resi-cell-select" @change="handleChangeGrid"
-                  >
-                    <el-option
-                      v-for="item in optionsG"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+                <el-select v-model.trim="form.GRID_ID"
+                           placeholder="请选择网格"
+                           size="small"
+                           clearable
+                           class="resi-cell-select"
+                           @change="handleChangeGrid">
+                  <el-option v-for="item in optionsG"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
               <!-- </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item label="所属房屋" required>
-                <div class="resi-cell-value">
-                  <div class="resi-cell-col">
-                    <el-form-item prop="VILLAGE_ID">
-                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
-                      clearable class="resi-cell-select" @change="handleChangeV"
-                      >
-                        <el-option
-                          v-for="item in optionsV"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="BUILD_ID">
-                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
-                      >
-                        <el-option
-                          v-for="item in optionsB"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="UNIT_ID">
-                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
-                      >
-                        <el-option
-                          v-for="item in optionsD"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="HOME_ID">
-                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle"
-                      @change="handleChangeH"
-                      >
-                        <el-option
-                          v-for="item in optionsH"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </div>
-                  <!-- <el-col :span="6">
+            <el-form-item label="所属房屋"
+                          required>
+              <div class="resi-cell-value">
+                <div class="resi-cell-col">
+                  <el-form-item prop="VILLAGE_ID">
+                    <el-select v-model.trim="form.VILLAGE_ID"
+                               placeholder="请选择小区"
+                               size="small"
+                               clearable
+                               class="resi-cell-select"
+                               @change="handleChangeV">
+                      <el-option v-for="item in optionsV"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="BUILD_ID">
+                    <el-select v-model.trim="form.BUILD_ID"
+                               placeholder="请选择楼号"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeB">
+                      <el-option v-for="item in optionsB"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="UNIT_ID">
+                    <el-select v-model.trim="form.UNIT_ID"
+                               placeholder="请选择单元"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeD">
+                      <el-option v-for="item in optionsD"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="HOME_ID">
+                    <el-select v-model.trim="form.HOME_ID"
+                               placeholder="请选择房号"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeH">
+                      <el-option v-for="item in optionsH"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </div>
+                <!-- <el-col :span="6">
                     
                   </el-col>
                   <el-col :span="6">
@@ -97,41 +121,42 @@
                   <el-col :span="6">
                     
                   </el-col> -->
-                </div>
+              </div>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
-        <el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row">
-            <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
-            <el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)"
-            :style="n.itemType === 'divider' && 'display: none;'">
-              <el-form-item :prop="n.columnName" :label="n.label">
-                <!-- <div class="resi-cell"> -->
-                  <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-                  <div class="resi-cell-value">
-                    <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
-                      <el-input
-                        v-if="n.validType"
-                        v-model.trim="form[n.columnName]"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        @blur="handleValidBlur(n)"
-                        >
-                      </el-input>
-                      <el-input
-                        v-else
-                        v-model.trim="form[n.columnName]"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        >
-                      </el-input>
-                    </template>
-                    <!-- <template v-if="n.itemType === 'textarea'">
+        <el-row v-for="(item, index) in sliceList(formList, columns)"
+                :key="index"
+                class="resi-row">
+          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
+          <el-col v-for="n in item"
+                  :key="n.itemId"
+                  :span="item.length === 1 ? 24 : (24/columns)"
+                  :style="n.itemType === 'divider' && 'display: none;'">
+            <el-form-item :prop="n.columnName"
+                          :label="n.label">
+              <!-- <div class="resi-cell"> -->
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+                <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
+                  <el-input v-if="n.validType"
+                            v-model.trim="form[n.columnName]"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容"
+                            @blur="handleValidBlur(n)">
+                  </el-input>
+                  <el-input v-else
+                            v-model.trim="form[n.columnName]"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                </template>
+                <!-- <template v-if="n.itemType === 'textarea'">
                       <el-input
                         v-model.trim="form[n.columnName]"
                         class="resi-cell-textarea"
@@ -142,88 +167,90 @@
                         >
                       </el-input>
                     </template> -->
-                    <el-date-picker
-                      v-else-if="n.itemType === 'datepicker'"
-                      v-model.trim="form[n.columnName]"
-                      class="resi-cell-input"
-                      type="date"
-                      size="small"
-                      clearable
-                      placeholder="选择日期"
-                      format="yyyy 年 MM 月 dd 日"
-                      value-format="yyyy-MM-dd">
-                    </el-date-picker>
-                    <el-date-picker
-                      v-else-if="n.itemType === 'daterange'"
-                      v-model.trim="form[n.columnName]"
-                      type="daterange"
-                      align="right"
-                      unlink-panels
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                      value-format="yyyy-MM-dd"
-                      >
-                    </el-date-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timepicker'"
-                      v-model.trim="form[n.columnName]"
-                      placeholder="任意时间点">
-                    </el-time-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timerange'"
-                      v-model.trim="form[n.columnName]"
-                      is-range
-                      class="resi-cell-range"
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                      placeholder="选择时间范围">
-                    </el-time-picker>
-                    <el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]"
-                    :multiple="n.multiSelect"
-                    placeholder="请选择" size="small" clearable class="resi-cell-select">
-                      <el-option
-                        v-for="item in n.options || options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                    <!-- <el-cascader
+                <el-date-picker v-else-if="n.itemType === 'datepicker'"
+                                v-model.trim="form[n.columnName]"
+                                class="resi-cell-input"
+                                type="date"
+                                size="small"
+                                clearable
+                                placeholder="选择日期"
+                                format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-date-picker v-else-if="n.itemType === 'daterange'"
+                                v-model.trim="form[n.columnName]"
+                                type="daterange"
+                                align="right"
+                                unlink-panels
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-time-picker v-else-if="n.itemType === 'timepicker'"
+                                v-model.trim="form[n.columnName]"
+                                placeholder="任意时间点">
+                </el-time-picker>
+                <el-time-picker v-else-if="n.itemType === 'timerange'"
+                                v-model.trim="form[n.columnName]"
+                                is-range
+                                class="resi-cell-range"
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                </el-time-picker>
+                <el-select v-else-if="n.itemType === 'select'"
+                           v-model.trim="form[n.columnName]"
+                           :multiple="n.multiSelect"
+                           placeholder="请选择"
+                           size="small"
+                           clearable
+                           class="resi-cell-select">
+                  <el-option v-for="item in n.options || options"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <el-cascader
                       :options="options"
                       :props="{ checkStrictly: true }"
                       clearable></el-cascader> -->
-                    <el-cascader
-                      v-else-if="n.itemType === 'cascader'"
-                      v-model.trim="form[n.columnName]"
-                      :options="n.options"
-                      :props="{ emitPath: false }"
-                      clearable
-                      size="small"
-                      class="resi-cell-select">
-                    </el-cascader>
-                    <template v-else-if="n.itemType === 'radio'">
-                      <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]"
-                      :label="ns.value" @change="hanldeChangeRadio(n)">
-                        {{ ns.label }}
-                      </el-radio>
-                      <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
-                    </template>
-                    <template v-else-if="n.itemType === 'checkbox'">
-                      <el-checkbox-group v-model.trim="form[n.columnName]">
-                        <template v-for="ns in n.options">
-                          <el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'" :key="ns.value" :label="ns.value">
-                            {{ns.label}}
-                          </el-checkbox>
-                        </template>
-                        <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                      </el-checkbox-group>
+                <el-cascader v-else-if="n.itemType === 'cascader'"
+                             v-model.trim="form[n.columnName]"
+                             :options="n.options"
+                             :props="{ emitPath: false }"
+                             clearable
+                             size="small"
+                             class="resi-cell-select">
+                </el-cascader>
+                <template v-else-if="n.itemType === 'radio'">
+                  <el-radio v-for="ns in n.options"
+                            :key="ns.value"
+                            v-model.trim="form[n.columnName]"
+                            :label="ns.value"
+                            @change="hanldeChangeRadio(n)">
+                    {{ ns.label }}
+                  </el-radio>
+                  <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
+                </template>
+                <template v-else-if="n.itemType === 'checkbox'">
+                  <el-checkbox-group v-model.trim="form[n.columnName]">
+                    <template v-for="ns in n.options">
+                      <el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'"
+                                   :key="ns.value"
+                                   :label="ns.value">
+                        {{ns.label}}
+                      </el-checkbox>
                     </template>
-                  </div>
-                <!-- </div> -->
-              </el-form-item>
-            </el-col>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                </template>
+              </div>
+              <!-- </div> -->
+            </el-form-item>
+          </el-col>
         </el-row>
       </template>
     </el-form>
@@ -231,7 +258,7 @@
 </template>
 
 <script>
-import { isCard, isMobile } from '@/utils/validate'
+import { isCard, isPassport, isMobile } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 
 export default {
@@ -286,10 +313,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入身份证'))
+        callback(new Error('请输入证件号码'))
       } else {
-        if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+        if (!isCard(value) && !isPassport(value)) {
+          callback(new Error('证件号码格式不正确'))
         }
         callback()
       }
@@ -311,13 +338,13 @@ export default {
             _form[item.columnName] = obj[item.columnName]
             item.isChange = true
           }
-          
+
         } else {
           if (item.multiSelect) _form[item.columnName] = []
           else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
           else _form[item.columnName] = ''
         }
-        
+
 
         // if (item.optionSourceType === 'remote') {
         //   this.getOptionsLists(item.optionSourceValue).then(res => {
@@ -351,7 +378,7 @@ export default {
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
-    let tempFormList = [ ...this.formList ].map(item => {
+    let tempFormList = [...this.formList].map(item => {
       const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true
       return {
         ...item,
@@ -506,27 +533,30 @@ export default {
         // }
       })
     },
-    hanldeChangeRadio(n) {
+    hanldeChangeRadio (n) {
       this.$emit('changeradio', n)
     },
-    handleValidBlur(n) {
+    handleValidBlur (n) {
       console.log('n---', n)
       if (n.columnName !== 'ID_CARD') return
-      if (!isCard(this.form.ID_CARD)) return
+      if (!isCard(this.form.ID_CARD) && !isPassport(this.form.ID_CARD)) return
       const { user } = this.$store.state
       let huji = '', i = 0
       if (user.areaCodePath && user.areaCodePath.length > 0) {
         i = user.areaCodePath.length - 1
         huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
       }
-      const _id = this.form.ID_CARD.substr(0, 6)
-      const { sex, birth, age } = computedCard(this.form.ID_CARD)
-      this.form.BIRTHDAY = birth
-      this.form.GENDER = sex == 1 ? '1' : '2'
-      this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
-      this.form.IS_BDHJ = huji == _id ? '1' : ''
-      this.validateIdcard(this.form.ID_CARD)
-      console.log('age-----', age, _id)
+      if (this.form.ID_CARD.length === 18 || this.form.ID_CARD.length === 15) {
+        const _id = this.form.ID_CARD.substr(0, 6)
+        const { sex, birth, age } = computedCard(this.form.ID_CARD)
+        this.form.BIRTHDAY = birth
+        this.form.GENDER = sex == 1 ? '1' : '2'
+        this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
+        this.form.IS_BDHJ = huji == _id ? '1' : ''
+        this.validateIdcard(this.form.ID_CARD)
+        console.log('age-----', age, _id)
+      }
+
     },
     handleOpenSearch () {
       this.openSearch = !this.openSearch
@@ -551,7 +581,7 @@ export default {
           if (this.isParty) {
             this.$emit('changegroup', { value, partyInfo: this.partyInfo, childGroup: item.childGroup })
           } else this.$emit('changegroup', { value, childGroup: item.childGroup })
-          
+
         }
       })
     },
@@ -589,9 +619,9 @@ export default {
       this.getHouseList()
     },
     // 为了实现根据房屋类型改版是否租户的需求
-    handleChangeH(val){
+    handleChangeH (val) {
       let item = this.optionsH.find(item => item.value === val);
-      if(item && item.type == '1'){
+      if (item && item.type == '1') {
         this.form.IS_TENANT = '1'
         console.log('item-----', item)
       } else this.form.IS_TENANT = '0'
@@ -619,7 +649,7 @@ export default {
       let arr = []
       this.addList.forEach(item => {
         // console.log('handlerMuscForm----000', this.$refs['baseForms' + item][0].handleForm())
-        arr.push([ ...this.$refs['baseForms' + item][0].handleForm() ])
+        arr.push([...this.$refs['baseForms' + item][0].handleForm()])
       })
       // console.log('handlerMuscForm----111', arr)
       let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@@ -698,19 +728,19 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取查询详情成功', res.data)
-            
+
             if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1'
             else this.form.IS_VOLUNTEER = '0'
-            
+
             if (res.data.isPartyMember == '1') {
               this.form.IS_PARTY = '1'
-               this.isParty = true
+              this.isParty = true
               this.partyInfo = res.data.detail.ic_party_member
             } else this.form.IS_PARTY = '0'
 
             // if (type == 'vol') {
             //   this.isParty = false
-              
+
             // } else if (res.data.isPartyMember == '1' && val == 'party') {
             //   this.isParty = true
             // }
@@ -822,12 +852,13 @@ export default {
 
 <style lang="scss" scoped>
 .resi-form {
-  :deep .el-date-editor.el-input, .el-date-editor.el-input__inner {
+  :deep .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
     width: 100% !important;
   }
 }
 .resi-cell-value .resi-cell-input {
-    width: 190px;
+  width: 190px;
 }
 .resi-cell-value {
   :deep .el-col {
@@ -839,33 +870,31 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-
 .resi-form .resi-row {
   margin-bottom: 0;
 }
 
-
-  .resi-cell-value .resi-cell-textarea {
-    width: 300px;
-  }
-  .resi-cell-col {
-    display: flex;
-    .el-form-item {
-      margin-right: 10px;
-    }
-  }
-  .resi-cell-select {
-    width: 190px;
-    box-sizing: border-box;
+.resi-cell-value .resi-cell-textarea {
+  width: 300px;
+}
+.resi-cell-col {
+  display: flex;
+  .el-form-item {
     margin-right: 10px;
-    &-middle {
-      width: 130px;
-    }
-    &-small {
-      width: 88px;
-    }
   }
-  .resi-cell-select:last-child {
-    margin-right: 0;
+}
+.resi-cell-select {
+  width: 190px;
+  box-sizing: border-box;
+  margin-right: 10px;
+  &-middle {
+    width: 130px;
+  }
+  &-small {
+    width: 88px;
   }
+}
+.resi-cell-select:last-child {
+  margin-right: 0;
+}
 </style>
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index dcfe9e2d2..e2c29e66e 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -101,13 +101,13 @@
             </el-input>
 
           </el-form-item>
-          <el-form-item label="身份证"
+          <el-form-item label="证件号"
                         prop="idCard">
             <el-input v-model="searchForm.idCard"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入身份证">
+                      placeholder="请输入身份证号或护照号">
             </el-input>
 
           </el-form-item>
@@ -197,7 +197,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证号"
+                         label="证件号"
                          width="180">
         </el-table-column>
         <el-table-column prop="birthDay"
@@ -318,7 +318,7 @@
               </el-input>
               <!-- <span>{{ formDetail.mobile }}</span> -->
             </el-form-item>
-            <el-form-item label="身份证"
+            <el-form-item label="证件号"
                           prop="idCard">
               <el-input v-model="formDetail.idCard"
                         size="small"
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index f326af6f3..0d48fcc5a 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -36,12 +36,12 @@
                         v-model="formData1.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
                         v-model="formData1.idCard">
               </el-input>
@@ -196,7 +196,7 @@
               <el-table-column prop="idCard"
                                header-align="center"
                                align="center"
-                               label="身份证"
+                               label="证件号"
                                min-width="170">
               </el-table-column>
               <el-table-column prop="houseName"
@@ -602,12 +602,12 @@ export default {
           })
           return false;
         }
-        const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+        const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
         if (regCard.test(this.formData1.idCard) === false) {
           this.btnDisable = false
           this.$message({
             type: 'warning',
-            message: '请输入正确的身份证号码'
+            message: '请输入正确的证件号码'
           })
           return false;
         }
@@ -783,7 +783,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'blur' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index 2f6b40092..643e0f07f 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -33,7 +33,7 @@
                     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">
@@ -285,7 +285,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'blur' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 78b053941..47f0ce8df 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -28,13 +28,13 @@
 
           </el-form-item>
 
-          <el-form-item label="身份证"
+          <el-form-item label="证件号"
                         prop="mobile">
             <el-input v-model="formData.idCard"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入身份证">
+                      placeholder="请输入身份证号或护照号">
             </el-input>
 
           </el-form-item>
@@ -210,7 +210,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="170">
         </el-table-column>
         <el-table-column prop="allName"
@@ -393,7 +393,7 @@ export default {
       agencyId: '',
 
       formData: {
-        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
+        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1
         name: '',
         mobile: '',
         idCard: '',
@@ -798,7 +798,7 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
+        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1
         name: '',
         mobile: '',
         idCard: '',
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index a3e07bc5f..1408d4469 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -84,12 +84,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">
@@ -249,9 +249,9 @@ export default {
       icNatId: '',
       formData: {
         icNatId: '',
-        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: '',
@@ -262,9 +262,9 @@ export default {
         channel: [],
         content: '',
 
-        fileName: '',//附件名	
-        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
-        attachmentUrl: '',//附件地址	
+        fileName: '',//附件名
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+        attachmentUrl: '',//附件地址
       },
 
       fileList: [],
@@ -449,12 +449,12 @@ export default {
         })
         return false;
       }
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (regCard.test(this.formData.idCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号码'
         })
         return false;
       }
@@ -581,9 +581,9 @@ export default {
 
       this.formData = {
         icNatId: '',
-        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: '',
@@ -594,9 +594,9 @@ export default {
         channel: [],
         content: '',
 
-        fileName: '',//附件名	
-        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
-        attachmentUrl: '',//附件地址	
+        fileName: '',//附件名
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+        attachmentUrl: '',//附件地址
 
       }
     },
@@ -623,7 +623,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'blur' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 5aee1c387..8529b0ec8 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -71,13 +71,13 @@
               </el-input>
 
             </el-form-item>
-            <el-form-item label="身份证"
+            <el-form-item label="证件号"
                           prop="idCard">
               <el-input v-model="formData.idCard"
                         size="small"
                         class="list_item_width_1"
                         clearable
-                        placeholder="请输入身份证">
+                        placeholder="请输入身份证号或护照号">
               </el-input>
 
             </el-form-item>
@@ -153,7 +153,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          min-width="170">
         </el-table-column>
         <el-table-column prop="natTime"
@@ -297,11 +297,11 @@ export default {
 
       timeRange: [],
       formData: {
-        orgType: 'current',//当前组织:current 根组织：all		
-        name: '',//姓名	
-        mobile: '',//手机号	
-        idCard: '',//身份证号码	
-        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        orgType: 'current',//当前组织:current 根组织：all
+        name: '',//姓名
+        mobile: '',//手机号
+        idCard: '',//身份证号码
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
         isResiUser: ''//0:否  1:是
 
@@ -556,11 +556,11 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        orgType: 'current',//当前组织:current 根组织：all		
-        name: '',//姓名	
-        mobile: '',//手机号	
-        idCard: '',//身份证号码	
-        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        orgType: 'current',//当前组织:current 根组织：all
+        name: '',//姓名
+        mobile: '',//手机号
+        idCard: '',//身份证号码
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
       }
       this.timeRange = []
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index fac30f52a..474cc6afa 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -6,7 +6,7 @@
                ref="ref_searchform"
                :label-width="'100px'">
         <div>
-          
+
           <el-form-item label="姓名"
                         prop="name">
             <el-input v-model="formData.name"
@@ -28,20 +28,20 @@
 
           </el-form-item>
 
-          <el-form-item label="身份证"
+          <el-form-item label="证件号"
                         prop="idCard">
             <el-input v-model="formData.idCard"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入身份证">
-            </el-input>
+                      placeholder="请输入身份证号或证件号">
+          </el-input>
 
           </el-form-item>
 
         </div>
         <div>
-          
+
           <el-form-item label="来自地区"
                         prop="sourceAddress">
             <el-input v-model="formData.sourceAddress"
@@ -50,7 +50,7 @@
                       clearable
                       placeholder="请输入地区">
             </el-input>
-            <!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps" 
+            <!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps"
               v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader> -->
           </el-form-item>
 
@@ -85,7 +85,7 @@
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button 
+        <el-button
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
@@ -154,7 +154,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="180">
         </el-table-column>
         <el-table-column prop="detailAddress"
@@ -382,8 +382,8 @@ export default {
       selectionAll: [],
       timeRange: [],
       formData: {
-        name: '',//负责人		
-        mobile: '',//联系电话	
+        name: '',//负责人
+        mobile: '',//联系电话
         idCard: '',
         sourceAddress: '',
         sourceAddressCode: '',
@@ -430,7 +430,7 @@ export default {
     lzayLoadArea(node, resolve) {
       this.getArea(node, resolve)
       // setTimeout(() => {
-        
+
       // }, 1000)
     },
     handleSearch () {
@@ -453,7 +453,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,
@@ -496,7 +496,7 @@ export default {
       this.tableLoading = false
     },
     handleAreaChange(val) {
-      
+
       if (val.length > 0) {
         const len = val.length - 1
         this.formData.sourceAddressCode = val[len]
@@ -574,7 +574,7 @@ export default {
 
         });
     },
-    
+
     async handleDeletes (row) {
       if (this.selectionAll.length === 0) {
         this.$message.info('请选择要取消关注的名单')
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 9647aef24..20a5fdbb1 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/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;
         }
       });
-      
+
 
     },
 
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index fbb451b8b..93d9fba7b 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -68,13 +68,13 @@
                         placeholder="请输入手机号">
               </el-input>
             </el-form-item>
-            <el-form-item label="身份证"
+            <el-form-item label="证件号"
                           prop="idCard">
               <el-input v-model="formData.idCard"
                         size="small"
                         class="list_item_width_1"
                         clearable
-                        placeholder="请输入身份证">
+                        placeholder="请输入身份证号或证件号">
               </el-input>
             </el-form-item>
 
@@ -149,7 +149,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="180">
         </el-table-column>
         <el-table-column prop="inoculateTime"
diff --git a/src/views/modules/base/epidemic/vaccinAdd.vue b/src/views/modules/base/epidemic/vaccinAdd.vue
index 12d6a2b6d..340766027 100644
--- a/src/views/modules/base/epidemic/vaccinAdd.vue
+++ b/src/views/modules/base/epidemic/vaccinAdd.vue
@@ -84,12 +84,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">
@@ -211,10 +211,10 @@ export default {
       vaccineId: '',
       formData: {
         vaccineId: '',
-        agencyId: '',//当前网格所属组织Id	
-        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
-        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
-        isResiUser: "0",//是否客户下居民(0:否  1:是)	
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
+        isResiUser: "0",//是否客户下居民(0:否  1:是)
         name: '',
         idCard: '',
         mobile: '',
@@ -389,12 +389,12 @@ export default {
         })
         return false;
       }
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (regCard.test(this.formData.idCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号码'
         })
         return false;
       }
@@ -465,10 +465,10 @@ export default {
 
       this.formData = {
         vaccineId: '',
-        agencyId: '',//当前网格所属组织Id	
-        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
-        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
-        isResiUser: "0",//是否客户下居民(0:否  1:是)	
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
+        isResiUser: "0",//是否客户下居民(0:否  1:是)
         name: '',
         idCard: '',
         mobile: '',
@@ -507,7 +507,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'change' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'change' }
+          { required: true, message: '证件号不能为空', trigger: 'change' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'change' },
diff --git a/src/views/modules/base/epidemic/vaccinForm.vue b/src/views/modules/base/epidemic/vaccinForm.vue
index efd9d76ce..be2a74dc5 100644
--- a/src/views/modules/base/epidemic/vaccinForm.vue
+++ b/src/views/modules/base/epidemic/vaccinForm.vue
@@ -33,12 +33,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">
@@ -126,9 +126,9 @@ export default {
 
       icNatId: '',
       formData: {
-        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: '',
@@ -313,12 +313,12 @@ export default {
         })
         return false;
       }
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (regCard.test(this.formData.idCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号码'
         })
         return false;
       }
@@ -445,9 +445,9 @@ export default {
 
       this.formData = {
         icNatId: '',
-        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: '',
@@ -458,9 +458,9 @@ export default {
         channel: [],
         content: '',
 
-        fileName: '',//附件名	
-        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
-        attachmentUrl: '',//附件地址	
+        fileName: '',//附件名
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+        attachmentUrl: '',//附件地址
 
       }
     },
@@ -487,7 +487,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'blur' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 49d16f319..68522dcf4 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -36,12 +36,12 @@
                         v-model="formData1.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
                         v-model="formData1.idCard">
               </el-input>
@@ -207,7 +207,7 @@
               <el-table-column prop="idCard"
                                header-align="center"
                                align="center"
-                               label="身份证"
+                               label="证件号"
                                width="150">
               </el-table-column>
               <el-table-column prop="houseName"
@@ -647,12 +647,12 @@ export default {
           })
           return false;
         }
-        const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+        const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$)）/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
         if (regCard.test(this.formData1.idCard) === false) {
           this.btnDisable = false
           this.$message({
             type: 'warning',
-            message: '请输入正确的身份证号码'
+            message: '请输入正确的证件号码'
           })
           return false;
         }
@@ -833,7 +833,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'blur' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
index becacc40b..6f2b079f9 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -33,7 +33,7 @@
                     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">
@@ -279,7 +279,7 @@ export default {
           { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'blur' }
         ],
         mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 603f42a0b..4ef3ba180 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -25,13 +25,13 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证"
+          <el-form-item label="证件号"
                         prop="mobile">
             <el-input v-model="formData.idCard"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入身份证">
+                      placeholder="请输入身份证号或证件号">
             </el-input>
           </el-form-item>
 
@@ -206,7 +206,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="170">
         </el-table-column>
         <el-table-column prop="allName"
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index ccf2018e4..552c7f50c 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/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: [