证件类型修改

src/assets/js/utils/data-dictionary.js

@@ -143,129 +143,87 @@ export default {
   idType: [
     {
       id: 1,
-      text: '身份证'
+      text: '居民身份证'
-    }
+    },
-  ],
+    {
-  // idType: [
+      id: 2,
-  //   {
+      text: '户口本'
-  //     id: 1,
+    },
-  //     text: '身份证'
+    {
-  //   },
+      id: 3,
-  //   {
+      text: '出生证'
-  //     id: 2,
+    },
-  //     text: '户口本',
+    {
-  //     disabled: true
+      id: 4,
-  //   },
+      text: '外国人护照'
-  //   {
+    },
-  //     id: 3,
+    {
-  //     text: '出生证明',
+      id: 5,
-  //     disabled: true
+      text: '港澳居民来往内地通行证'
-  //   },
+    },
-  //   {
+    {
-  //     id: 4,
+      id: 6,
-  //     text: '护照',
+      text: '台湾居民来往大陆通行证'
-  //     disabled: true
+    },
-  //   },
-  //   {
-  //     id: 5,
-  //     text: '港澳居民通行证',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 6,
-  //     text: '台湾居民通行证',
-  //     disabled: true
-  //   },
     // {
     //   id: 7,
     //   text: '其他',
     //   disabled: true
     // }
-  // ],
+    {
+      id: 8,
+      text: '外国人永久居留身份证'
+    },
+    {
+      id: 9,
+      text: '港澳台居民居住证'
+    }
+  ],
   //投保人证件类型
   insuredIdType: [
     {
       id: 1,
-      text: '身份证'
+      text: '居民身份证'
-    }
+    },
-  ],
+    {
-  // insuredIdType: [
+      id: 2,
-  //   {
+      text: '户口本'
-  //     id: 1,
+    },
-  //     text: '身份证'
+    {
-  //   },
+      id: 3,
-  //   {
+      text: '出生证'
-  //     id: 2,
+    },
-  //     text: '户口本',
+    {
-  //     disabled: true
+      id: 4,
-  //   },
+      text: '外国人护照'
-  //   {
+    },
-  //     id: 3,
+    {
-  //     text: '出生证明',
+      id: 5,
-  //     disabled: true
+      text: '港澳居民来往内地通行证'
-  //   },
+    },
-  //   {
+    {
-  //     id: 4,
+      id: 6,
-  //     text: '护照',
+      text: '台湾居民来往大陆通行证'
-  //     disabled: true
+    },
-  //   },
-  //   {
-  //     id: 5,
-  //     text: '港澳居民通行证',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 6,
-  //     text: '台湾居民通行证',
-  //     disabled: true
-  //   },
     // {
     //   id: 7,
     //   text: '其他',
     //   disabled: true
     // }
-  // ],
-  //出生证明
-  birthType: [
     {
-      id: 1,
+      id: 8,
-      text: '身份证'
+      text: '外国人永久居留身份证'
+    },
+    {
+      id: 9,
+      text: '港澳台居民居住证'
     }
   ],
+  //出生证明
   // birthType: [
   //   {
   //     id: 1,
   //     text: '身份证'
-  //   },
-  //   {
-  //     id: 2,
-  //     text: '户口本',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 3,
-  //     text: '出生证明',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 4,
-  //     text: '护照',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 5,
-  //     text: '港澳居民通行证',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 6,
-  //     text: '台湾居民通行证',
-  //     disabled: true
-  //   },
-  //   {
-  //     id: 7,
-  //     text: '其他',
-  //     disabled: true
   //   }
   // ],
   //投保人/被保人关系

src/components/ebiz/customer/formBlock.vue

@@ -38,19 +38,9 @@
         @confirm="onDateConfirm($event, '1')"
       ></FieldDatePicter>
       <div class="border-bt relative fs14 p10 flex align-center">
-        <van-checkbox
+        <van-checkbox v-model="userInfo.effectiveDateType" class="fr" :disabled="effectiveDateTypeAble" @change="isEnd">长期</van-checkbox>
-          v-model="userInfo.effectiveDateType"
-          class="fr"
-          :disabled="effectiveDateTypeAble"
-          @change="isEnd"
-        >长期</van-checkbox>
       </div>
-      <select-radio
+      <select-radio :radios="sexRadio" label="性别" :value.sync="userInfo.customerSex" :required="false"></select-radio>
-        :radios="sexRadio"
-        label="性别"
-        :value.sync="userInfo.customerSex"
-        :required="false"
-      ></select-radio>
       <van-field
         :value="userInfo.nativeplace | idToText('nativeplace')"
         readonly
@@ -60,15 +50,7 @@
         placeholder="请选择"
         @click="toSelect('1')"
       />
-      <van-field
+      <van-field :value="census" readonly label="户籍" name="户籍" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
-        :value="census"
-        readonly
-        label="户籍"
-        name="户籍"
-        right-icon="arrow"
-        placeholder="请选择"
-        @click="censusShow = true"
-      />
       <FieldDatePicter
         label="出生日期"
         :value.sync="userInfo.birthday"
@@ -77,32 +59,9 @@
         @confirm="onDateConfirm($event, '2')"
         ref="birthday"
       ></FieldDatePicter>
-      <van-field
+      <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" v-validate="'email'" placeholder="请输入" clearable maxlength="50" />
-        v-model="userInfo.email"
+      <van-field v-model="userInfo.stature" label="身高（cm）" name="身高" placeholder="请输入" clearable v-validate="'onlyNumber|stature'" maxlength="5" />
-        label="电子邮箱"
+      <van-field v-model="userInfo.weight" label=" 体重（kg）" name="体重" placeholder="请输入" clearable v-validate="'onlyNumber|avoirdupois'" />
-        name="电子邮箱"
-        v-validate="'email'"
-        placeholder="请输入"
-        clearable
-        maxlength="50"
-      />
-      <van-field
-        v-model="userInfo.stature"
-        label="身高（cm）"
-        name="身高"
-        placeholder="请输入"
-        clearable
-        v-validate="'onlyNumber|stature'"
-        maxlength="5"
-      />
-      <van-field
-        v-model="userInfo.weight"
-        label=" 体重（kg）"
-        name="体重"
-        placeholder="请输入"
-        clearable
-        v-validate="'onlyNumber|avoirdupois'"
-      />
       <van-field
         :value="userInfo.customerType | idToText('customerType')"
         readonly
@@ -135,12 +94,7 @@
         placeholder="请选择"
         @click="toSelect('3')"
       />
-      <select-radio
+      <select-radio :radios="medicalRadio" label="有无社保" :value.sync="userInfo.socialSecurity" :required="false"></select-radio>
-        :radios="medicalRadio"
-        label="有无社保"
-        :value.sync="userInfo.socialSecurity"
-        :required="false"
-      ></select-radio>
       <van-field
         :value="userInfo.taxIdentity | idToText('taxIdentity')"
         readonly
@@ -183,13 +137,7 @@
         clearable
         maxlength="5"
       />
-      <van-field
+      <van-field v-model="userInfo.workUnits" label="工作单位" placeholder="请输入工作单位" clearable maxlength="50" />
-        v-model="userInfo.workUnits"
-        label="工作单位"
-        placeholder="请输入工作单位"
-        clearable
-        maxlength="50"
-      />
       <van-field
         :value="userInfo.workCondition | idToText('workCondition')"
         readonly
@@ -199,39 +147,10 @@
         placeholder="请选择"
         @click="toSelect('9')"
       />
-      <van-field
+      <van-field v-model="areaName" readonly label="单位地址" name="单位地址" right-icon="arrow" placeholder="请选择" @click="areaShow = true" />
-        v-model="areaName"
+      <van-field v-model="userInfo.companyAddress" label name="详细地址" placeholder="请输入详细地址" maxlength="30" />
-        readonly
+      <van-field v-model="userInfo.companyZip" type="number" label="邮编" placeholder="请输入" clearable maxlength="6" v-validate="'zipCode'" />
-        label="单位地址"
+      <van-field v-model="userInfo.companyPhone" label="单位电话" name="单位电话" placeholder="请输入" clearable maxlength="13" />
-        name="单位地址"
-        right-icon="arrow"
-        placeholder="请选择"
-        @click="areaShow = true"
-      />
-      <van-field
-        v-model="userInfo.companyAddress"
-        label
-        name="详细地址"
-        placeholder="请输入详细地址"
-        maxlength="30"
-      />
-      <van-field
-        v-model="userInfo.companyZip"
-        type="number"
-        label="邮编"
-        placeholder="请输入"
-        clearable
-        maxlength="6"
-        v-validate="'zipCode'"
-      />
-      <van-field
-        v-model="userInfo.companyPhone"
-        label="单位电话"
-        name="单位电话"
-        placeholder="请输入"
-        clearable
-        maxlength="13"
-      />
     </van-cell-group>
 
     <!-- 家庭信息 -->
@@ -255,33 +174,10 @@
         placeholder="请输入"
         clearable
       />
-      <van-field
+      <van-field v-model="homeName" readonly label="家庭地址" name="家庭地址" right-icon="arrow" placeholder="请选择" @click="homeShow = true" />
-        v-model="homeName"
-        readonly
-        label="家庭地址"
-        name="家庭地址"
-        right-icon="arrow"
-        placeholder="请选择"
-        @click="homeShow = true"
-      />
       <van-field v-model="userInfo.homeAddress" label name="详细地址" placeholder="请输入详细地址" />
-      <van-field
+      <van-field v-model="userInfo.homeZip" type="number" label="邮编" placeholder="请输入" clearable maxlength="6" v-validate="'zipCode'" />
-        v-model="userInfo.homeZip"
+      <van-field v-model="userInfo.homePhone" label="家庭电话" name="家庭电话" placeholder="请输入" clearable maxlength="13" />
-        type="number"
-        label="邮编"
-        placeholder="请输入"
-        clearable
-        maxlength="6"
-        v-validate="'zipCode'"
-      />
-      <van-field
-        v-model="userInfo.homePhone"
-        label="家庭电话"
-        name="家庭电话"
-        placeholder="请输入"
-        clearable
-        maxlength="13"
-      />
     </van-cell-group>
 
     <!-- 字段选择 -->
@@ -290,31 +186,15 @@
     </van-popup>
     <!-- 地区选择 -->
     <van-popup v-model="areaShow" position="bottom">
-      <van-area
+      <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
-        :area-list="areaList"
-        value="110101"
-        @confirm="sureArea($event, '1')"
-        @cancel="areaShow = false"
-      />
     </van-popup>
     <!-- 家庭地址选择 -->
     <van-popup v-model="homeShow" position="bottom">
-      <van-area
+      <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '2')" @cancel="homeShow = false" />
-        :area-list="areaList"
-        value="110101"
-        @confirm="sureArea($event, '2')"
-        @cancel="homeShow = false"
-      />
     </van-popup>
     <!-- 户籍选择 -->
     <van-popup v-model="censusShow" position="bottom">
-      <van-area
+      <van-area :area-list="areaList" value="110101" :columns-num="2" @confirm="sureArea($event, '3')" @cancel="areaShow = false" />
-        :area-list="areaList"
-        value="110101"
-        :columns-num="2"
-        @confirm="sureArea($event, '3')"
-        @cancel="areaShow = false"
-      />
     </van-popup>
   </div>
 </template>
@@ -508,41 +388,47 @@ export default {
         }
         //证件是户口本
       } else if (this.userInfo.idType == '2') {
-        if (age >= 16) {
+        if (age > 16) {
-          return this.$toast('客户年龄在16周岁及以上，不能使用户口本作为有效证件')
+          return this.$toast('客户年龄在16周岁以上，不能使用户口本作为有效证件')
-        } else if (this.userInfo.customerIdNumber.length != 18) {
+        }
-          return this.$toast('户口本的证件号码长度应等于18位')
+        // else if (this.userInfo.customerIdNumber.length != 18) {
-        } else {
+        //   return this.$toast('户口本的证件号码长度应等于18位')
+        // }
+        else {
           this.checkMarr()
         }
         //证件是出生证明
       } else if (this.userInfo.idType == '3') {
-        if (age >= 3) {
+        if (age >= 2) {
-          return this.$toast('客户年龄在3周岁及以上，不能使用出生证作为有效证件')
+          return this.$toast('客户年龄在2周岁及以上，不能使用出生证作为有效证件')
-        } else if (this.userInfo.customerIdNumber.length < 3) {
+        }
-          return this.$toast('出生证须大于等于3个字符')
+        // else if (this.userInfo.customerIdNumber.length < 3) {
-        } else {
+        //   return this.$toast('出生证须大于等于3个字符')
+        // }
+        else {
           this.checkMarr()
         }
         //证件是护照
-      } else if (this.userInfo.idType == '4' && this.userInfo.customerIdNumber.length < 3) {
-        console.log('证件类型是护照')
-        return this.$toast('护照须大于等于3个字符')
-        //证件是港澳居民通行证
-      } else if (this.userInfo.idType == '5') {
-        console.log('证件类型是港澳居民通行证')
-        if (this.userInfo.customerIdNumber.length != 9) {
-          return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
-        } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.customerIdNumber)) {
-          return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
-        } else {
-          this.checkMarr()
       }
-        //证件是台湾居民通行证
+      // else if (this.userInfo.idType == '4' && this.userInfo.customerIdNumber.length < 3) {
-      } else if (this.userInfo.idType == '6' && this.userInfo.customerIdNumber.length != 8) {
+      //   console.log('证件类型是护照')
-        console.log('证件类型是台湾居民通行证')
+      //   return this.$toast('护照须大于等于3个字符')
-        return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
+      //   //证件是港澳居民通行证
-      } else {
+      // } else if (this.userInfo.idType == '5') {
+      //   console.log('证件类型是港澳居民通行证')
+      //   if (this.userInfo.customerIdNumber.length != 9) {
+      //     return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
+      //   } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.customerIdNumber)) {
+      //     return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
+      //   } else {
+      //     this.checkMarr()
+      //   }
+      //   //证件是台湾居民通行证
+      // } else if (this.userInfo.idType == '6' && this.userInfo.customerIdNumber.length != 8) {
+      //   console.log('证件类型是台湾居民通行证')
+      //   return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
+      // }
+      else {
         this.checkMarr()
       }
     },

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -227,7 +227,7 @@ export default {
       columns: [],
       valueKey: 'text',
       nativeplace: '',
-      idType: '身份证',
+      idType: '居民身份证',
       degree: '',
       socialSecurity: '',
       taxIdentity: '',
@@ -684,32 +684,35 @@ export default {
             }
             //证件类型是户口本
           } else if (this.userInfo.idType == '2') {
-            if (age >= 16) {
+            if (age > 16) {
-              return this.$toast('客户年龄在16周岁及以上，不能使用户口本作为有效证件')
+              return this.$toast('客户年龄在16周岁以上，不能使用户口本作为有效证件')
-            } else if (this.userInfo.idNo.length != 18) {
-              return this.$toast('户口本的证件号码长度应等于18位')
             }
+            // else if (this.userInfo.idNo.length != 18) {
+            //   return this.$toast('户口本的证件号码长度应等于18位')
+            // }
             //证件类型是出生证明
           } else if (this.userInfo.idType == '3') {
-            if (age >= 3) {
+            if (age >= 2) {
-              return this.$toast('客户年龄在3周岁及以上，不能使用出生证作为有效证件')
+              return this.$toast('客户年龄在2周岁及以上，不能使用出生证作为有效证件')
-            } else if (this.userInfo.idNo.length < 3) {
-              return this.$toast('出生证须大于等于3个字符')
             }
+            //  else if (this.userInfo.idNo.length < 3) {
+            //   return this.$toast('出生证须大于等于3个字符')
+            // }
             //证件类型是护照
-          } else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) {
-            return this.$toast('护照须大于等于3个字符')
-            //证件是港澳居民通行证
-          } else if (this.userInfo.idType == '5') {
-            if (this.userInfo.idNo.length != 9) {
-              return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
-            } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.idNo)) {
-              return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
-            }
-            //证件是台湾居民通行证
-          } else if (this.userInfo.idType == '6' && this.userInfo.idNo.length != 8) {
-            return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
           }
+          //  else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) {
+          //   return this.$toast('护照须大于等于3个字符')
+          //   //证件是港澳居民通行证
+          // } else if (this.userInfo.idType == '5') {
+          //   if (this.userInfo.idNo.length != 9) {
+          //     return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
+          //   } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.idNo)) {
+          //     return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
+          //   }
+          //   //证件是台湾居民通行证
+          // } else if (this.userInfo.idType == '6' && this.userInfo.idNo.length != 8) {
+          //   return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
+          // }
 
           let beneficiaries = []
           if (localStorage.beneficiaryInfo) {
@@ -840,9 +843,9 @@ export default {
       return `${year}-${month}-${day}`
     },
     getRelatedData(val) {
-      // if (this.userInfo.idType != '1') {
+      if (this.userInfo.idType != '1') {
-      //   return
+        return
-      // }
+      }
       // //如果证件校验不通过,恢复默认值
       // if (idToData(val).text) {
       //   ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false]
@@ -851,10 +854,10 @@ export default {
       // this.effectiveDateTypeAble = idToData(val).age < 45
       // this.userInfo.birthday = idToData(val).birthday
       // this.userInfo.sex = idToData(val).sex
-      if (!['1', '2', '3', 1, 2, 3].includes(this.userInfo.idType)) {
+      // if (!['1', '2', '3', 1, 2, 3].includes(this.userInfo.idType)) {
-        return
+      //   return
-      }
+      // }
-      //如果证件校验不通过,恢复默认值
+      // //如果证件校验不通过,恢复默认值
       if (idToData(val).text) {
         ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false]
         return this.$toast(idToData(val).text)
@@ -864,20 +867,20 @@ export default {
       this.userInfo.birthday = idToData(val).birthday
       this.userInfo.sex = idToData(val).sex
       //如果选择户口本
-      if (this.userInfo.idType == '2') {
+      // if (this.userInfo.idType == '2') {
-        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
-        this.userInfo.certificateValidate = this.userInfo.birthday
+      //   this.userInfo.certificateValidate = this.userInfo.birthday
-        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-        this.idLimit = true
+      //   this.idLimit = true
-        //如果选择出生证明
+      //   //如果选择出生证明
-      } else if (this.userInfo.idType == '3') {
+      // } else if (this.userInfo.idType == '3') {
-        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1972-12-31')
+      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1972-12-31')
-        this.userInfo.certificateValidate = this.userInfo.birthday
+      //   this.userInfo.certificateValidate = this.userInfo.birthday
-        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-        this.idLimit = true
+      //   this.idLimit = true
-      } else {
+      // } else {
-        this.idLimit = false
+      //   this.idLimit = false
-      }
+      // }
     }
   },
   filters: {

src/views/ebiz/sale/Detail.vue

@@ -147,25 +147,31 @@ export default {
           }
           switch (res.orderDTO.appntDTO.idType) {
             case '1':
-              res.orderDTO.appntDTO.idType = '身份证'
+              res.orderDTO.appntDTO.idType = '居民身份证'
               break
             case '2':
               res.orderDTO.appntDTO.idType = '户口本'
               break
             case '3':
-              res.orderDTO.appntDTO.idType = '出生证明'
+              res.orderDTO.appntDTO.idType = '出生证'
               break
             case '4':
-              res.orderDTO.appntDTO.idType = '护照'
+              res.orderDTO.appntDTO.idType = '外国人护照'
               break
             case '5':
-              res.orderDTO.appntDTO.idType = '港澳居民通行证'
+              res.orderDTO.appntDTO.idType = '港澳居民来往内地通行证'
               break
             case '6':
-              res.orderDTO.appntDTO.idType = '台湾居民通行证'
+              res.orderDTO.appntDTO.idType = '台湾居民来往大陆通行证'
               break
-            case '7':
+            // case '7':
-              res.orderDTO.appntDTO.idType = '其他'
+            //   res.orderDTO.appntDTO.idType = '其他'
+            //   break
+            case '8':
+              res.orderDTO.appntDTO.idType = '外国人永久居留身份证'
+              break
+            case '9':
+              res.orderDTO.appntDTO.idType = '港澳台居民居住证'
               break
           }
           that.appntDTO = res.orderDTO.appntDTO
@@ -203,25 +209,31 @@ export default {
             }
             switch (item.idType) {
               case '1':
-                item.idType = '身份证'
+                item.idType = '居民身份证'
                 break
               case '2':
                 item.idType = '户口本'
                 break
               case '3':
-                item.idType = '出生证明'
+                item.idType = '出生证'
                 break
               case '4':
-                item.idType = '护照'
+                item.idType = '外国人护照'
                 break
               case '5':
-                item.idType = '港澳居民通行证'
+                item.idType = '港澳居民来往内地通行证'
                 break
               case '6':
-                item.idType = '台湾居民通行证'
+                item.idType = '台湾居民来往大陆通行证'
                 break
-              case '7':
+              // case '7':
-                item.idType = '其他'
+              //   item.idType = '其他'
+              //   break
+              case '8':
+                res.orderDTO.appntDTO.idType = '外国人永久居留身份证'
+                break
+              case '9':
+                res.orderDTO.appntDTO.idType = '港澳台居民居住证'
                 break
             }
             switch (item.relationToAppnt) {
@@ -252,25 +264,31 @@ export default {
                 }
                 switch (it.idType) {
                   case '1':
-                    it.idType = '身份证'
+                    it.idType = '居民身份证'
                     break
                   case '2':
                     it.idType = '户口本'
                     break
                   case '3':
-                    it.idType = '出生证明'
+                    it.idType = '出生证'
                     break
                   case '4':
-                    it.idType = '护照'
+                    it.idType = '外国人护照'
                     break
                   case '5':
-                    it.idType = '港澳居民通行证'
+                    it.idType = '港澳居民来往内地通行证'
                     break
                   case '6':
-                    it.idType = '台湾居民通行证'
+                    it.idType = '台湾居民来往大陆通行证'
                     break
-                  case '7':
+                  // case '7':
-                    it.idType = '其他'
+                  //   it.idType = '其他'
+                  //   break
+                  case '8':
+                    res.orderDTO.appntDTO.idType = '外国人永久居留身份证'
+                    break
+                  case '9':
+                    res.orderDTO.appntDTO.idType = '港澳台居民居住证'
                     break
                 }
                 switch (it.relationToInsured) {

src/views/ebiz/sale/InsuranceTip.vue

@@ -309,26 +309,32 @@ export default {
           }
         } else {
           switch (that.saleInsuredInfo.idType) {
-            case '身份证':
+            case '居民身份证':
               that.saleInsuredInfo.idType = '1'
               break
             case '户口本':
               that.saleInsuredInfo.idType = '2'
               break
-            case '出生证明':
+            case '出生证':
               that.saleInsuredInfo.idType = '3'
               break
-            case '护照':
+            case '外国人护照':
               that.saleInsuredInfo.idType = '4'
               break
-            case '港澳居民通行证':
+            case '港澳居民来往内地通行证':
               that.saleInsuredInfo.idType = '5'
               break
-            case '台湾居民通行证':
+            case '台湾居民来往大陆通行证':
               that.saleInsuredInfo.idType = '6'
               break
-            case '其他':
+            // case '其他':
-              that.saleInsuredInfo.idType = '7'
+            //   that.saleInsuredInfo.idType = '7'
+            //   break
+            case '外国人永久居留身份证':
+              that.saleInsuredInfo.idType = '8'
+              break
+            case '港澳台居民居住证':
+              that.saleInsuredInfo.idType = '9'
               break
           }
           if (this.isWeixin) {

src/views/ebiz/sale/InsuredInfo.vue

@@ -933,23 +933,32 @@ export default {
                 return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年')
               }
             }
-            //证件类型是护照
+            //证件类型是户口本
-          } else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) {
+          } else if (this.userInfo.idType == '2') {
-            console.log('证件类型是护照')
+            if (age > 16) {
-            return this.$toast('护照须大于等于3个字符')
+              return this.$toast('客户年龄在16周岁以上，不能使用户口本作为有效证件')
-            //证件是港澳居民通行证
-          } else if (this.userInfo.idType == '5') {
-            console.log('证件类型是港澳居民通行证')
-            if (this.userInfo.idNo.length != 9) {
-              return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
-            } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.idNo)) {
-              return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
             }
-            //证件是台湾居民通行证
+          } else if (this.userInfo.idType == '3') {
-          } else if (this.userInfo.idType == '6' && this.userInfo.idNo.length != 8) {
+            if (age >= 2) {
-            console.log('证件类型是台湾居民通行证')
+              return this.$toast('客户年龄在2周岁及以上，不能使用出生证作为有效证件')
-            return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
             }
+          }
+          // else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) {
+          //   console.log('证件类型是护照')
+          //   return this.$toast('护照须大于等于3个字符')
+          //   //证件是港澳居民通行证
+          // } else if (this.userInfo.idType == '5') {
+          //   console.log('证件类型是港澳居民通行证')
+          //   if (this.userInfo.idNo.length != 9) {
+          //     return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
+          //   } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.idNo)) {
+          //     return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
+          //   }
+          //   //证件是台湾居民通行证
+          // } else if (this.userInfo.idType == '6' && this.userInfo.idNo.length != 8) {
+          //   console.log('证件类型是台湾居民通行证')
+          //   return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
+          // }
 
 
           //投保人需大于等于 16 周岁

src/views/ebiz/sale/InsuredPerson.vue

@@ -1180,32 +1180,35 @@ export default {
             }
             //证件类型是户口本
           } else if (this.userInfo.idType == '2') {
-            if (age >= 16) {
+            if (age > 16) {
-              return this.$toast('客户年龄在16周岁及以上，不能使用户口本作为有效证件')
+              return this.$toast('客户年龄在16周岁以上，不能使用户口本作为有效证件')
-            } else if (this.userInfo.idNo.length != 18) {
-              return this.$toast('户口本的证件号码长度应等于18位')
             }
+            // else if (this.userInfo.idNo.length != 18) {
+            //   return this.$toast('户口本的证件号码长度应等于18位')
+            // }
             //证件类型是出生证明
           } else if (this.userInfo.idType == '3') {
-            if (age >= 3) {
+            if (age >= 2) {
-              return this.$toast('客户年龄在3周岁及以上，不能使用出生证作为有效证件')
+              return this.$toast('客户年龄在2周岁及以上，不能使用出生证作为有效证件')
-            } else if (this.userInfo.idNo.length < 3) {
-              return this.$toast('出生证须大于等于3个字符')
             }
+            // else if (this.userInfo.idNo.length < 3) {
+            //   return this.$toast('出生证须大于等于3个字符')
+            // }
             //证件类型是护照
-          } else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) {
-            return this.$toast('护照须大于等于3个字符')
-            //证件是港澳居民通行证
-          } else if (this.userInfo.idType == '5') {
-            if (this.userInfo.idNo.length != 9) {
-              return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
-            } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.idNo)) {
-              return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
-            }
-            //证件是台湾居民通行证
-          } else if (this.userInfo.idType == '6' && this.userInfo.idNo.length != 8) {
-            return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
           }
+          // else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) {
+          //   return this.$toast('护照须大于等于3个字符')
+          //   //证件是港澳居民通行证
+          // } else if (this.userInfo.idType == '5') {
+          //   if (this.userInfo.idNo.length != 9) {
+          //     return this.$toast('证件类型为港澳居民通行证的，证件号码须为9位')
+          //   } else if (!/^(H|M)[0-9]{8}$/.test(this.userInfo.idNo)) {
+          //     return this.$toast('证件类型为港澳居民通行证的，证件号码首位字母为"H"/"M",证件号码第2位至第9位为阿拉伯数字')
+          //   }
+          //   //证件是台湾居民通行证
+          // } else if (this.userInfo.idType == '6' && this.userInfo.idNo.length != 8) {
+          //   return this.$toast('证件类型为台湾居民通行证的，证件号码须为8位数字')
+          // }
 
           // 年龄 0-7 周岁且不是投保人的子女
           if (age < 7 && this.userInfo.relationToAppnt != '4') {
@@ -1453,12 +1456,12 @@ export default {
       }
     },
     getRelatedData(val) {
-      // if (this.userInfo.idType != '1') {
+      if (this.userInfo.idType != '1') {
-      //   return
-      // }
-      if (!['1', '2', '3', 1, 2, 3].includes(this.userInfo.idType)) {
         return
       }
+      // if (!['1', '2', '3', 1, 2, 3].includes(this.userInfo.idType)) {
+      //   return
+      // }
       //如果证件校验不通过,恢复默认值
       if (idToData(val).text) {
         ;[this.userInfo.idNo, this.userInfo.sex, this.userInfo.birthday, this.effectiveDateTypeAble] = ['', '0', '', false]
@@ -1469,20 +1472,20 @@ export default {
       this.userInfo.birthday = idToData(val).birthday
       this.userInfo.sex = idToData(val).sex
       //如果选择户口本
-      if (this.userInfo.idType == '2') {
+      // if (this.userInfo.idType == '2') {
-        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
-        this.userInfo.certificateValidate = this.userInfo.birthday
+      //   this.userInfo.certificateValidate = this.userInfo.birthday
-        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-        this.idLimit = true
+      //   this.idLimit = true
-        //如果选择出生证明
+      //   //如果选择出生证明
-      } else if (this.userInfo.idType == '3') {
+      // } else if (this.userInfo.idType == '3') {
-        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1972-12-31')
+      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1972-12-31')
-        this.userInfo.certificateValidate = this.userInfo.birthday
+      //   this.userInfo.certificateValidate = this.userInfo.birthday
-        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-        this.idLimit = true
+      //   this.idLimit = true
-      } else {
+      // } else {
-        this.idLimit = false
+      //   this.idLimit = false
-      }
+      // }
     }
   },
   computed: {

src/views/ebiz/sale/SignatureOfElectronic.vue

@@ -450,26 +450,32 @@ export default {
           }
         } else {
           switch (that.saleInsuredInfo.idType) {
-            case '身份证':
+            case '居民身份证':
               that.saleInsuredInfo.idType = '1'
               break
             case '户口本':
               that.saleInsuredInfo.idType = '2'
               break
-            case '出生证明':
+            case '出生证':
               that.saleInsuredInfo.idType = '3'
               break
-            case '护照':
+            case '外国人护照':
               that.saleInsuredInfo.idType = '4'
               break
-            case '港澳居民通行证':
+            case '港澳居民来往内地通行证':
               that.saleInsuredInfo.idType = '5'
               break
-            case '台湾居民通行证':
+            case '台湾居民来往大陆通行证':
               that.saleInsuredInfo.idType = '6'
               break
-            case '其他':
+            // case '其他':
-              that.saleInsuredInfo.idType = '7'
+            //   that.saleInsuredInfo.idType = '7'
+            //   break
+            case '外国人永久居留身份证':
+              that.saleInsuredInfo.idType = '8'
+              break
+            case '港澳台居民居住证':
+              that.saleInsuredInfo.idType = '9'
               break
           }
           if (this.isWeixin) {

src/views/ebiz/sale/SignatureOfNotice.vue

@@ -419,26 +419,32 @@ export default {
           }
         } else {
           switch (that.saleInsuredInfo.idType) {
-            case '身份证':
+            case '居民身份证':
               that.saleInsuredInfo.idType = '1'
               break
             case '户口本':
               that.saleInsuredInfo.idType = '2'
               break
-            case '出生证明':
+            case '出生证':
               that.saleInsuredInfo.idType = '3'
               break
-            case '护照':
+            case '外国人护照':
               that.saleInsuredInfo.idType = '4'
               break
-            case '港澳居民通行证':
+            case '港澳居民来往内地通行证':
               that.saleInsuredInfo.idType = '5'
               break
-            case '台湾居民通行证':
+            case '台湾居民来往大陆通行证':
               that.saleInsuredInfo.idType = '6'
               break
-            case '其他':
+            // case '其他':
-              that.saleInsuredInfo.idType = '7'
+            //   that.saleInsuredInfo.idType = '7'
+            //   break
+            case '外国人永久居留身份证':
+              that.saleInsuredInfo.idType = '8'
+              break
+            case '港澳台居民居住证':
+              that.saleInsuredInfo.idType = '9'
               break
           }
           if (this.isWeixin) {

src/views/ebiz/serve/Detail.vue

@@ -154,25 +154,31 @@ export default {
           }
           switch (res.content.appntDTO.idType) {
             case '1':
-              res.content.appntDTO.idType = '身份证'
+              res.content.appntDTO.idType = '居民身份证'
               break
             case '2':
               res.content.appntDTO.idType = '户口本'
               break
             case '3':
-              res.content.appntDTO.idType = '出生证明'
+              res.content.appntDTO.idType = '出生证'
               break
             case '4':
-              res.content.appntDTO.idType = '护照'
+              res.content.appntDTO.idType = '外国人护照'
               break
             case '5':
-              res.content.appntDTO.idType = '港澳居民通行证'
+              res.content.appntDTO.idType = '港澳居民来往内地通行证'
               break
             case '6':
-              res.content.appntDTO.idType = '台湾居民通行证'
+              res.content.appntDTO.idType = '台湾居民来往大陆通行证'
               break
-            case '7':
+            // case '7':
-              res.content.appntDTO.idType = '其他'
+            //   res.content.appntDTO.idType = '其他'
+            //   break
+            case '8':
+              res.content.appntDTO.idType = '外国人永久居留身份证'
+              break
+            case '9':
+              res.content.appntDTO.idType = '港澳台居民居住证'
               break
           }
           that.appntDTO = res.content.appntDTO
@@ -223,25 +229,31 @@ export default {
             }
             switch (item.idType) {
               case '1':
-                item.idType = '身份证'
+                item.idType = '居民身份证'
                 break
               case '2':
                 item.idType = '户口本'
                 break
               case '3':
-                item.idType = '出生证明'
+                item.idType = '出生证'
                 break
               case '4':
-                item.idType = '护照'
+                item.idType = '外国人护照'
                 break
               case '5':
-                item.idType = '港澳居民通行证'
+                item.idType = '港澳居民来往内地通行证'
                 break
               case '6':
-                item.idType = '台湾居民通行证'
+                item.idType = '台湾居民来往大陆通行证'
                 break
-              case '7':
+              // case '7':
-                item.idType = '其他'
+              //   item.idType = '其他'
+              //   break
+              case '8':
+                item.idType = '外国人永久居留身份证'
+                break
+              case '9':
+                item.idType = '港澳台居民居住证'
                 break
             }
             switch (item.relationToAppnt) {
@@ -276,25 +288,31 @@ export default {
               }
               switch (it.idType) {
                 case '1':
-                  it.idType = '身份证'
+                  it.idType = '居民身份证'
                   break
                 case '2':
                   it.idType = '户口本'
                   break
                 case '3':
-                  it.idType = '出生证明'
+                  it.idType = '出生证'
                   break
                 case '4':
-                  it.idType = '护照'
+                  it.idType = '外国人护照'
                   break
                 case '5':
-                  it.idType = '港澳居民通行证'
+                  it.idType = '港澳居民来往内地通行证'
                   break
                 case '6':
-                  it.idType = '台湾居民通行证'
+                  it.idType = '台湾居民来往大陆通行证'
                   break
-                case '7':
+                // case '7':
-                  it.idType = '其他'
+                //   it.idType = '其他'
+                //   break
+                case '8':
+                  it.idType = '外国人永久居留身份证'
+                  break
+                case '9':
+                  it.idType = '港澳台居民居住证'
                   break
               }
               switch (it.relationToInsured) {