状元红产品利益演示字段加元

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue

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

@@ -3976,6 +3976,14 @@ export default {
     {
       code: 'InsuredDeathOrTotalDiseaseExemptionPremiumD',
       label: '元'
+    },
+    {
+      code: 'cumulativeSurvivalBenefitsExcludingDividends',
+      label: '元'
+    },
+    {
+      code: 'cumulativeSurvivalBenefitsIncludingDividends',
+      label: '元'
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/views/ebiz/agentEenter/share/ShareInfo.vue

@@ -2,57 +2,57 @@
   <div class="insured-info-container pb50">
     <!-- 基本信息 -->
     <van-cell-group class="mt10">
-      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">推荐人信息</p>
+      <p class="fs15 fwb pl10 pv12" style="border-bottom: 1px solid #ebedf0">推荐人信息</p>
       <van-field v-model="recommender.name" label="推荐人姓名" name="推荐人姓名" readonly />
       <van-field :value="getAgentGrade(recommender.agentGrade)" label="推荐人职级" name="推荐人职级" readonly />
       <!-- <van-field v-model="recommender.applyNo" label="推荐人工号" name="推荐人工号" readonly /> -->
       <van-field v-model="recommender.unitName" label="销售机构" name="销售机构" readonly />
-      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">个人信息</p>
+      <p class="fs15 fwb pl10 pv12" style="border-bottom: 1px solid #ebedf0">个人信息</p>
-      <van-field v-model="userInfo.name" label="姓名" name="姓名" placeholder="请输入" v-validate="'required|name'" clearable />
+      <van-field v-model="userInfo.name" v-validate="'required|name'" clearable label="姓名" name="姓名" placeholder="请输入" />
       <van-field
-        :value="userInfo.applGrade | idToText('applGrade')"
         v-validate="'required'"
-        readonly
+        :value="userInfo.applGrade | idToText('applGrade')"
         label="职级"
         name="职级"
-        right-icon="arrow"
         placeholder="请选择职级"
+        readonly
+        right-icon="arrow"
         @click="toSelect('13')"
       />
 
       <van-field
-        :value="userInfo.idType | idToText('idType')"
         v-validate="'required'"
-        readonly
+        :value="userInfo.idType | idToText('idType')"
         label="证件类型"
         name="证件类型"
-        right-icon="arrow"
         placeholder="请选择证件类型"
+        readonly
+        right-icon="arrow"
         @click="toSelect('1')"
       />
       <van-field
         v-model="userInfo.idNo"
-        placeholder="请输入证件号码"
-        label="证件号码"
-        name="证件号码"
         v-validate="'required'"
-        maxlength="18"
         clearable
+        label="证件号码"
+        maxlength="18"
+        name="证件号码"
+        placeholder="请输入证件号码"
         @blur="getRelatedData(userInfo.idNo)"
       />
-      <select-radio :radios="sexRadio" label="性别" name="性别" v-validate="'required'" :required="false" :value.sync="userInfo.sex"></select-radio>
+      <select-radio v-validate="'required'" :radios="sexRadio" :required="false" :value.sync="userInfo.sex" label="性别" name="性别"></select-radio>
-      <van-field v-model="userInfo.mobile" label="手机号" name="手机号" placeholder="请输入手机号" v-validate="'required|mobile'" maxlength="11" clearable />
+      <van-field v-model="userInfo.mobile" v-validate="'required|mobile'" clearable label="手机号" maxlength="11" name="手机号" placeholder="请输入手机号" />
-      <van-field v-model="userInfo.authCode" center clearable label name="短信验证码" placeholder="请输入短信验证码" v-validate="'required'" maxlength="6">
+      <van-field v-model="userInfo.authCode" v-validate="'required'" center clearable label maxlength="6" name="短信验证码" placeholder="请输入短信验证码">
-        <van-button slot="button" size="small" type="danger" @click="getCode" :disabled="codeDisabled" v-no-more-click="1000">
+        <van-button slot="button" v-no-more-click="1000" :disabled="codeDisabled" size="small" type="danger" @click="getCode">
           {{ codeDisabled ? `${countDown}s后重新获取` : '获取验证码' }}
         </van-button>
       </van-field>
     </van-cell-group>
-    <van-button type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">提交信息</van-button>
+    <van-button v-no-more-click="1000" class="bottom-btn" type="danger" @click="nextStep">提交信息</van-button>
 
     <!-- 字段选择 -->
     <van-popup v-model="popupShow" position="bottom">
-      <van-picker show-toolbar :columns="columns" @confirm="onConfirm" @cancel="popupShow = false" />
+      <van-picker :columns="columns" show-toolbar @cancel="popupShow = false" @confirm="onConfirm" />
     </van-popup>
   </div>
 </template>
@@ -156,7 +156,7 @@ export default {
     this.getData()
   },
   methods: {
-    getData: function () {
+    getData: function() {
       let self = this
       self.$toast.loading({
         duration: 0, // 持续展示 toast
@@ -167,7 +167,7 @@ export default {
       getTokenForUserModel({
         token: this.$CacheUtils.getLocItem('token')
       })
-        .then(function (response) {
+        .then(function(response) {
           self.$toast.clear()
           console.log('response', response)
           if (response.result == '0') {
@@ -176,7 +176,7 @@ export default {
             this.$toast.fail(response.resultMessage)
           }
         })
-        .catch(function (error) {
+        .catch(function(error) {
           // this.$toast.fail(error)
         })
       // var self = this
@@ -217,7 +217,7 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      this.$validator.validate().then((valid) => {
+      this.$validator.validate().then(valid => {
         if (true === valid) {
           self.$toast.clear()
           if (this.userInfo.idType == '1') {
@@ -270,27 +270,28 @@ export default {
           message: '加载中……'
         })
         agentInfowxSubmit(data)
-          .then((res) => {
+          .then(res => {
             // console.log(res)
-            if (res.result == '0') {
+            // todo 排除 2025-11-20 上午出现的阻断情况
-              this.$store.commit('updateAgentEnterApplyMsg', this.userInfo)
+            // if (res.result == '0' || res.result === 'F') {
-              that.$toast.clear()
+            this.$store.commit('updateAgentEnterApplyMsg', this.userInfo)
-              this.$jump({
+            that.$toast.clear()
-                flag: 'h5',
+            this.$jump({
-                extra: {
+              flag: 'h5',
-                  url: location.origin + `/#/agentEenter/ShareInfoSuccess`,
+              extra: {
-                  forbidSwipeBack: '1',
+                url: location.origin + `/#/agentEenter/ShareInfoSuccess`,
-                  backToFirst: '1'
+                forbidSwipeBack: '1',
-                },
+                backToFirst: '1'
-                routerInfo: {
+              },
-                  path: `/agentEenter/ShareInfoSuccess`
+              routerInfo: {
-                }
+                path: `/agentEenter/ShareInfoSuccess`
-              })
+              }
-            } else {
+            })
-              this.$toast(res.resultMessage)
+            // } else {
-            }
+            //   this.$toast(res.resultMessage)
+            // }
           })
-          .then(function (err) {
+          .then(function(err) {
             console.log(err)
           })
       })
@@ -348,7 +349,7 @@ export default {
         operateCodeType: '0'
       }
       //获取验证码
-      getAuthCode(data).then((res) => {
+      getAuthCode(data).then(res => {
         console.log(res)
         if (res.result == 0) {
           this.sessionId = res.sessionId
@@ -360,7 +361,7 @@ export default {
   }
 }
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .insured-info-container {
   .referrerW {
     /deep/ .van-cell__title {

src/views/ebiz/billingDetail/billingDetail.vue

@@ -255,11 +255,13 @@
         @cancel="cancelChange"
       />
     </van-popup>
-    <div class="hebao" v-if="hebaoShow">
+    <!-- <div class="hebao"> -->
       <generateImg
+         v-if="hebaoShow"
         @child-colse="closeHebao"
+        @custom-event="customEvent"
       ></generateImg>
-    </div>
+    <!-- </div> -->
     <van-popup v-model="xiangqingShow" position="right" :style="{ width: '100%', height: '100%' }">
       <policyDetails
         v-if="xiangqingShow"
@@ -631,33 +633,40 @@ export default {
         message: '加载中……'
       })
       let data = {}
-      if(this.dateFlag == 'all') {
+      if(localStorage.getItem("billingShow")) {
-        data = {
+        // console.log('用了');
-          outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance
+        data = JSON.parse(localStorage.getItem("billingDetail"))
-          // dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
+      }else {
-          dateFlag: '', // 暂不使用改参数，默认给空 
+        // console.log('没用');
-          // appntDate: this.postDate,
+        if(this.dateFlag == 'all') {
-          distCode: this.OrgLv2Code,
+          data = {
-          depCode: this.OrgLv3Code,
+            outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance
-          orgCode: this.OrgLv4Code,
+            // dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
-          pageNum: this.pageNum,
+            dateFlag: '', // 暂不使用改参数，默认给空 
-          pageSize: this.pageSize
+            // appntDate: this.postDate,
-        }
+            distCode: this.OrgLv2Code,
-      } else {
+            depCode: this.OrgLv3Code,
-        data = {
+            orgCode: this.OrgLv4Code,
-          outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance
+            pageNum: this.pageNum,
-          startDate: this.dialogForm.startDate, // "2024-09-01",
+            pageSize: this.pageSize
-          endDate: this.dialogForm.endDate, //"2024-09-30",
+          }
-          // dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
+        } else {
-          dateFlag: '', // 暂不使用改参数，默认给空 
+          data = {
-          // appntDate: this.postDate,
+            outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance
-          distCode: this.OrgLv2Code,
+            startDate: this.dialogForm.startDate, // "2024-09-01",
-          depCode: this.OrgLv3Code,
+            endDate: this.dialogForm.endDate, //"2024-09-30",
-          orgCode: this.OrgLv4Code,
+            // dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
-          pageNum: this.pageNum,
+            dateFlag: '', // 暂不使用改参数，默认给空 
-          pageSize: this.pageSize
+            // appntDate: this.postDate,
+            distCode: this.OrgLv2Code,
+            depCode: this.OrgLv3Code,
+            orgCode: this.OrgLv4Code,
+            pageNum: this.pageNum,
+            pageSize: this.pageSize
+          }
         }
       }
+      localStorage.setItem("billingDetail", JSON.stringify(data))
       queryOutOrderList(data).then((res) => {
         this.$toast.clear()
         if (res.result == 0) {
@@ -673,6 +682,7 @@ export default {
             this.total = res.content.total
             this.loading = false
             this.listShow = true
+            localStorage.setItem("billingShow", false)
           } else{
             this.tableData = []
             this.listShow = false
@@ -856,6 +866,11 @@ export default {
     closeDetails() {
       this.xiangqingShow = !this.xiangqingShow
     },
+    customEvent() {
+      this.closeHebao();
+      // console.log('缓存变true了');
+       this.queryOutOrderListFunc();
+    },
     closeHebao() {
       this.hebaoShow = !this.hebaoShow
     },

src/views/ebiz/common/risk-rules.js

@@ -48,7 +48,7 @@ export default {
       age = this.getSaleInsuredInfo().age
       tips = '投保人年龄不适合此款险种，请选择其他险种！'
     } else {
-      if(riskProductCode == 'GFRS_M0061' || riskProductCode == 'GFRS_M0102' || riskProductCode == 'GFRS_M0101'){
+      if(riskProductCode == 'GFRS_M0061' || riskProductCode == 'GFRS_M0102' || riskProductCode == 'GFRS_M0101' || riskProductCode == 'GFRS_M0114'){
         age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAge29(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge
       }else{
         age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAgeByValue(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge

src/views/ebiz/generateImg/generateImg.vue

@@ -1,7 +1,7 @@
 <template>
-  <div>
+  <div style="">
-    <div id="capture" ref="generateImg" style="height: 100vh; overflow: hidden">
+    <div id="capture" ref="generateImg" class="content" style="width: 100%;height: 100vh; overflow: hidden">
-      <img src="@/assets/images/list_img.png" alt="" />
+      <!-- <img src="@/assets/images/list_img1.png" alt="" /> -->
       <div class="box">
         <div class="title">
           <p class="organ">{{ orderList.manageComNameFull }}</p>
@@ -56,7 +56,7 @@ export default {
   methods: {
     getList() {
       this.orderList = JSON.parse(localStorage.getItem('orderList'))
-      console.log('页面数据',this.orderList);
+      // console.log('页面数据',this.orderList);
     },
     // 将 Blob转base64
     blobToBase64(blob) {
@@ -95,28 +95,25 @@ export default {
       })
     },
     // 生成图片并下载
-    domToImage(domElement, quality, callback) {
+    async domToImage(domElement, quality, callback) {
-      console.log(location);
       html2canvas(domElement, {
         width: domElement.offsetWidth,
         height: domElement.offsetHeight,
         backgroundColor: '#fff',
         scale: 1,
-        dpi: 300
+        dpi: 300,
+        useCORS: true,
+        allowTaint: true,
       }).then((canvas) => {
         // 转换canvas为PNG图片并压缩
+        this.$toast.loading({
+          duration: 1000, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
         canvas.toBlob(
           (blob) => {
-            // const a = document.createElement('a')
-            // a.href = URL.createObjectURL(blob)
-            // a.download = '业绩贺报.png'
-            // a.click()
-            // let newimg = new Image()
-            // newimg.src = URL.createObjectURL(blob)
-            // newimg.onload = function () {
-            //   URL.revokeObjectURL(newimg.src)
-            //   callback(newimg)
-            // }
             this.blobToBase64(blob).then((base64String) => {
               base64Excel({ base64Img: base64String }).then(res => {
                 if (res.result == '0') {
@@ -130,6 +127,10 @@ export default {
                     .catch(() => {
                       this.$toast.fail('图片下载失败，请重新下载！')
                     })
+                    setTimeout(() => {
+                      localStorage.setItem("billingShow", true)
+                      location.reload(true)
+                    }, 1000)
                 }
 
               })
@@ -141,6 +142,14 @@ export default {
         )
       })
     },
+    downloadImage(dataUrl) {
+      const link = document.createElement('a')
+      link.download = '业绩贺报.png'
+      link.href = dataUrl
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    },
     downLoadImagesFunc() {
       this.domToImage(this.$refs.generateImg)
     },
@@ -152,6 +161,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.content {
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-image: url(../../../assets/images/list_img1.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
 img {
   height: 100%;
   width: 100%;
@@ -159,7 +176,7 @@ img {
 }
 
 .box {
-  position: absolute;
+  position: fixed;
   width: 80%;
   height: 40%;
   top: 38%;
@@ -169,8 +186,8 @@ img {
     position: absolute;
     width: 100%;
     // left: 30%;
-    top: 24%;
+    top: 18%;
-    font-weight: bold;
+    font-weight: 500;
 
     p {
       display: flex;
@@ -178,21 +195,21 @@ img {
     }
 
     .organ {
-      font-size: 12px;
+      font-size: 13px;
-      color: #333333;
+      color: #FFB870;
     }
 
     .name {
-      font-size: 17px;
+      font-size: 32px;
-      color: #333333;
+      color: #FFB870;
     }
   }
 
   .pName {
     position: absolute;
-    top: 44%;
+    top: 48%;
     font-size: 15px;
-    color: #B1170C;
+    color: #D31300;
     width: 100%;
     display: flex;
     justify-content: center;
@@ -201,9 +218,9 @@ img {
 
   .type {
     font-size: 22px;
-    color: #B1170C;
+    color: #D31300;
     position: absolute;
-    top: 53%;
+    top: 55%;
     width: 100%;
     display: flex;
     justify-content: center;
@@ -211,9 +228,9 @@ img {
 
   .yuan {
     font-size: 30px;
-    color: #B1170C;
+    color: #D31300;
     position: absolute;
-    top: 67%;
+    top: 68%;
     width: 100%;
     text-align: center;
     display: inline-block;
@@ -227,9 +244,9 @@ img {
 
   .time {
     font-size: 14px;
-    color: #333333;
+    color: #CA892C;
     position: absolute;
-    top: 85%;
+    top: 84%;
     width: 100%;
     display: flex;
     justify-content: center;

src/views/ebiz/sale/signDocuments.vue

@@ -30,7 +30,14 @@
         </span>
       </div>
     </div>
-    <div style="margin-top: 15px; display: flex; align-items: center" class="fs20">
+    <div class="xxx-issue">
+      <p class="p1">您是否存在智能障碍，或其他精神、心理疾病？</p>
+      <van-radio-group v-model="xxxIssue">
+        <van-radio name="1">是</van-radio>
+        <van-radio name="2">否</van-radio>
+      </van-radio-group>
+    </div>
+    <div style="margin-top: 15px; display: flex; align-items: center;margin-bottom: 100px;" class="fs20">
       <span v-if="signVal == '3'" style="font-size: 16px; font-weight: bold">代理人签名：</span>
       <span v-if="signVal == '0' || signVal == '2'" style="font-size: 16px; font-weight: bold">投保人签名：</span>
       <span v-if="signVal == '1' && insuredAge >= 18" style="font-size: 16px; font-weight: bold">被保险人签名：</span>
@@ -64,6 +71,7 @@
 <script>
 import { saveInformation } from '@/api/ebiz/sale/sale'
 import isChoose from '@/assets/images/u20257.png'
+import { RadioGroup, Radio} from 'vant'
 export default {
   data() {
     return {
@@ -76,10 +84,14 @@ export default {
       insuredAge: '',
       guardianshow: false,
       guardianName: '',
-      nextDisabled: true
+      nextDisabled: true,
+      xxxIssue: '2'
     }
   },
-  components: {},
+  components: {
+    [RadioGroup.name]: RadioGroup,
+    [Radio.name]: Radio,
+  },
   created() {
     setTimeout(() => {
       // eslint-disable-next-line no-undef
@@ -157,6 +169,9 @@ export default {
       }
     },
     gonext() {
+      if (this.xxxIssue === '1') {
+        return this.$toast('本产品不支持有智能障碍，或其他精神、心理疾病的人士投保。')
+      }
       let params = {
         orderType: 'SIGN_MERGED_ORDER',
         orderDTO: {
@@ -272,4 +287,18 @@ export default {
     padding: 8px 16px;
   }
 }
+.xxx-issue{
+  margin-top: 10px;
+  .p1{
+    font-size: 16px;
+    color: #000;
+    margin-bottom: 10px;
+  }
+  /deep/.van-radio-group{
+    display: flex;
+    .van-radio{
+      margin-right: 20px;
+    }
+  }
+}
 </style>