Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue

@@ -61,6 +61,7 @@
             :required='!!item.requiredType'
             :disabled='!item.requiredType'
             maxlength='18'
+            @blur="getRelatedData(item, '1')"
           />
           <FieldDatePicter
             label='出生日期'
@@ -120,6 +121,7 @@ import RsTop from '@/components/ebiz/agentEenter/RsTop';
 import idNoCheck from '@/assets/js/utils/idNoCheck';
 import beforeDate from '@/assets/js/utils/getBeforeDate.js';
 import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter';
+import {idToData} from "../cardList/js/verification";
 // 是否存在亲属关系的枚举值
 const immediateFamilyEnum = {
   existence: 1, // 存在亲属关系
@@ -488,6 +490,19 @@ export default {
         mobile: '', // 联系电话
         requiredType: immediateFamilyEnum.existence // 是否必填
       });
+    },
+    getRelatedData(val, ind) {
+      if (ind == '1') {
+        if (val.idType != '1') {
+          return
+        }
+        //如果证件校验不通过,恢复默认值
+        if (idToData(val.idNo).text) {
+          //;[val.idNo, val.birthday] = ['', '']
+          return this.$toast(idToData(val.idNo).text)
+        }
+        val.birthday = idToData(val.idNo).birthday
+      }
     }
   }
 };

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -209,11 +209,11 @@
         placeholder='请选择'
         @click="toSelect('15')"
       />
+      <!-- @click="toSelect('13')"-->
       <van-field
         :value="userInfo.applGrade | idToText('applGrade')"
         right-icon='arrow'
         placeholder='请选择'
-        @click="toSelect('13')"
         label='拟聘职级'
         name='拟聘职级'
         readonly

src/views/ebiz/agentEenter/approve/BasicInfo.vue

@@ -65,6 +65,7 @@
       </van-cell-group>
       <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">家属信息</p>
       <van-cell-group v-for="item in relationList" :key="item.id" class="fs15">
+        <van-cell  v-if="item.birthday!=''">
         <van-cell title="姓名" :value="item.name | blankFilter" />
         <van-cell title="性别" :value="item.sex | genderFilter" />
         <van-cell title="出生日期" :value="item.birthday | blankFilter" />
@@ -72,6 +73,7 @@
         <van-cell title="证件号码" :value="item.idNo | blankFilter" />
         <van-cell title="关系" :value="item.relationType | familyRelationFilter" />
         <van-cell title="联系电话" :value="item.mobile | blankFilter" />
+        </van-cell>
       </van-cell-group>
     </div>
     <div class="imgInfo bg-white" v-show="active === 1">

src/views/ebiz/agentEenter/approve/RecordDetail.vue

@@ -65,7 +65,8 @@
           <van-cell title="担保人类别" :value="item.type | relationFilter" />
         </van-cell-group>
         <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">家属信息</p>
-        <van-cell-group v-for="item in relationList" :key="item.id" class="fs15">
+        <van-cell-group v-for="item in relationList" :key="item.id"  class="fs15">
+          <van-cell v-if="item.birthday!=''">
           <van-cell title="姓名" :value="item.name | blankFilter" />
           <van-cell title="性别" :value="item.sex | genderFilter" />
           <van-cell title="出生日期" :value="item.birthday | blankFilter" />
@@ -73,6 +74,7 @@
           <van-cell title="证件号码" :value="item.idNo | blankFilter" />
           <van-cell title="关系" :value="item.relationType | familyRelationFilter" />
           <van-cell title="联系电话" :value="item.mobile | blankFilter" />
+          </van-cell>
         </van-cell-group>
         <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">审批信息</p>
         <van-cell-group v-for="item in approvalInfo" :key="item.examineApproveName" class="fs15">

src/views/ebiz/cardList/information.vue

@@ -1588,9 +1588,9 @@ export default {
 
           let insuredInfoAge = utilsAge.getAge(this.insuredInfo.birthday, new Date())
           if (this.itemProductDTOS.productCode === 'GFRS_M0049') {
-            //幼儿园：3岁≤被保险人≤7岁
+            //幼儿园：2岁≤被保险人≤7岁
-            if(insuredInfoAge<3||insuredInfoAge>7){
+            if(insuredInfoAge<2||insuredInfoAge>7){
-              return this.$toast('被保险人年龄应为3岁-7岁，请重新选择。')
+              return this.$toast('被保险人年龄应为2岁-7岁，请重新选择。')
             }
           }else if (this.itemProductDTOS.productCode === 'GFRS_M0048') {
             //义务教育：5岁≤被保险人≤18岁

src/views/ebiz/poster/PosterPreview.vue

@@ -69,6 +69,8 @@ export default {
       if(this.isShareLimit=='1'){
         this.$toast(this.shareLimitDesc)
       }else{
+        console.log('分享图片url');
+        console.log(this.imgUrl);
       // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
@@ -145,17 +147,21 @@ export default {
           agentMobile: this.userMobile,
           agentName: this.userName,
           companyName: this.manageComName || '国富人寿保险股份有限公司',
-          schoolName:localStorage.getItem('schoolName'),
+          schoolName:window.localStorage.getItem('schoolName'),
-          className:localStorage.getItem('className')
+          className:window.localStorage.getItem('className')
 
         }
         if (this.posterType == 'product') {
           shareUrlWithQR(params).then(res => {
+            window.localStorage.removeItem('schoolName')
+            window.localStorage.removeItem('className')
             this.$toast.clear()
             if (res.result == 0) {
-              this.imgUrl = config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${res.content.path}`
+              this.imgUrl = config.imgDomain + `/returnImageStream?a=`+Math.random()*100+`.jpg&imgPath=${res.content.path}`
               this.imgPath = res.content.path
               this.isShow = true
+              console.log('created生成图片url');
+              console.log(this.imgUrl);
               // this.getBase64(this.imgUrl)
               resolve()
             } else {
@@ -164,6 +170,8 @@ export default {
           })
         } else {
           shareUrl(params).then(res => {
+            window.localStorage.removeItem('schoolName')
+            window.localStorage.removeItem('className')
             this.$toast.clear()
             if (res.result == 0) {
               this.imgUrl = config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${res.content.path}`
@@ -176,8 +184,7 @@ export default {
             }
           })
         }
-        window.localStorage.removeItem('schoolName')
+
-        window.localStorage.removeItem('className')
       })
     },
     // 获取base64
@@ -245,8 +252,10 @@ export default {
                window.localStorage.setItem('className', this.className)
                 this.schoolName="";
                 this.className="";
+               console.log('确认提交生成图片url');
+               console.log(this.imgUrl);
                resolve()
-               location.reload();
+               window.location.reload();
              } else {
                reject()
              }

src/views/ebiz/product/HomeProduct.vue

@@ -62,7 +62,7 @@
         </div>
         <div class="home-product-pcenter performance">
           <div class="pcenter-list">
-            <table class="myTable" style="width: 130vw;" cellspacing="0" cellpadding="0">
+            <table class="myTable" style="width: 100vw;" cellspacing="0" cellpadding="0">
               <tr>
                 <th v-for="(thead, index) in theads" :class="{ 'sticky-col': index <= 1 }" :key="index">{{ thead }}</th>
               </tr>

src/views/ebiz/sale/AttachmentManagement.vue

@@ -1244,14 +1244,24 @@ export default {
                 isFlag = false;
             }
           }
-          // else if('appentBack' == flag){
+          else if('appentBack' == flag){
-          //   //投保人身份证反面
+            //投保人身份证反面
-          //   //"ValidDate": "2010.07.21-2020.07.21"
+            //"ValidDate": "2010.07.21-2020.07.21"
-          //   res.content.validDate = res.content.validDate.split('-')[1].replace(/\./g,'-')
+            //"ValidDate": "2010.07.21-长期"
-          //   if(this.saleInsuredInfo.certiexpiredate != res.content.validDate){
+            let certiexpireDate = res.content.validDate.split('-')[1]
-          //     isFlag = false;
+            if('长期' == certiexpireDate){
-          //   }
+              res.content.validDate = '9999-01-01'
-          // }
+              if(this.saleInsuredInfo.certiexpiredate != res.content.validDate){
+                isFlag = false;
+              }
+            }else{
+              res.content.validDate = res.content.validDate.split('-')[1].replace(/\./g,'-')
+              if(this.saleInsuredInfo.certiexpiredate != res.content.validDate){
+                isFlag = false;
+              }
+            }
+
+          }
           else if('insuredFront' == flag){
             this.saleInsuredPersonInfo.sex = this.saleInsuredPersonInfo.sex == '0'? '男' :'女'
             res.content.birth = utils.formatDate(Date.parse(res.content.birth), 'yyyy-MM-dd')
@@ -1264,14 +1274,24 @@ export default {
               isFlag = false;
             }
           }
-          // else if('insuredBack' == flag){
+          else if('insuredBack' == flag){
-          //   //被保人身份证反面
+            //被保人身份证反面
-          //   //"ValidDate": "2010.07.21-2020.07.21"
+            //"ValidDate": "2010.07.21-2020.07.21"
-          //   res.content.validDate = res.content.validDate.split('-')[1].replace(/\./g,'-')
+            //"ValidDate": "2010.07.21-长期"
-          //   if(this.saleInsuredInfo.certiexpiredate != res.content.validDate){
+            let certiexpireDate = res.content.validDate.split('-')[1]
-          //     isFlag = false;
+            console.log("res.content.validDate", res.content.validDate)
-          //   }
+            if('长期' == certiexpireDate){
-          // }
+              res.content.validDate = '9999-01-01'
+              if(this.saleInsuredInfo.certiexpiredate != res.content.validDate){
+                isFlag = false;
+              }
+            }else{
+              res.content.validDate = res.content.validDate.split('-')[1].replace(/\./g,'-')
+              if(this.saleInsuredInfo.certiexpiredate != res.content.validDate){
+                isFlag = false;
+              }
+            }
+          }
           if(!isFlag){
             this.$toast.clear()
             this.$toast("上传的证件信息与录入的证件信息不一致，请核对修改并重新上传。")