项目数据统计新增字段--承保保费+1

项目数据统计新增字段--承保保费
项目成员分配以及项目数据统计增加条件判断
2025-12-08 17:36:44 +08:00 · 2024-06-03 10:52:42 +08:00 · 2024-06-03 10:28:13 +08:00 · 2024-05-26 16:15:42 +08:00 · 2024-05-25 17:09:43 +08:00 · 2024-05-09 10:03:06 +08:00
28 changed files with 19700 additions and 447 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/api/GBC/GBC.js
+++ b/src/api/GBC/GBC.js
@@ -88,4 +88,40 @@ export function getGBCappntConnectSave(data) {
    method: 'post',
    data
  })
-}
+}
+
+// 获取GBC一级产品
+export function getGBCRiskList(data) {
+  return request({
+    url: getUrl('/sale/product/getGBCRiskList ', 1),
+    method: 'post',
+    data
+  })
+}
+
+// GBC一级产品校验
+export function gbcAppntCheckProdect(data) {
+  return request({
+    url: getUrl('/sale/gbc/appnt/checkProdect ', 1),
+    method: 'post',
+    data
+  })
+}
+
+// GBC一级产品校验
+export function saveOrUpdateGbc(data) {
+  return request({
+    url: getUrl('/sale/gbc/appnt/saveOrUpdateGbc', 1),
+    method: 'post',
+    data
+  })
+}
+
+// GBC数据看板
+export function dataShow(data) {
+  return request({
+    url: getUrl('/sale/gbc/data/show', 1),
+    method: 'post',
+    data
+  })
+}
--- a/src/api/ebiz/sale/sale.js
+++ b/src/api/ebiz/sale/sale.js
@@ -396,4 +396,12 @@ export function changeOrderStatus(data) {
    method: 'post',
    data
  })
+}
+
+export function riskLevelCheck(data) {
+  return request({
+    url: getUrl('/sale/order/riskLevelCheck', 1),
+    method: 'post',
+    data
+  })
 }
--- a/src/assets/images/GBC/submitResult.png
+++ b/src/assets/images/GBC/submitResult.png
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -3891,6 +3891,38 @@ export default {
    {
      code: "GFRS_M0087__cashValue",
      label: "元"
+    },
+    {
+      code: "deathDisabilityInsurance",
+      label: "元"
+    },
+    {
+      code: "middleDiseaseMildillnessExemptionPremium",
+      label: "元"
+    },
+    {
+      code: "malignantTumorAdditionalInsurance",
+      label: "元"
+    },
+    {
+      code: "specCardiovascularCerebrovascularDiseasesInsurance",
+      label: "元"
+    },
+    {
+      code: "firstCriticalIllnessCareFund",
+      label: "元"
+    },
+    {
+      code: "firstModerateIllnessCareFund",
+      label: "元"
+    },
+    {
+      code: "firstLightIllnessCareFund",
+      label: "元"
+    },
+    {
+      code: "GFRS_M0086__cashValue",
+      label: "元"
    }
  ],
  // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，
--- a/src/assets/js/utils/validator.js
+++ b/src/assets/js/utils/validator.js
@@ -59,16 +59,19 @@ Validator.extend('email', {
 Validator.extend('name', {
  getMessage: () => '姓名长度为2-120个字符之内，只能输入汉字或者英文',
  validate: value => {
+    return value
    // return /^[\u4e00-\u9fa5·]{1,15}$/.test(value)
-    return /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/.test(value);
+    // return /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/.test(value);
  }
 });
 //sale 投保名字 2个汉字，4个字母
 Validator.extend('salename', {
  getMessage: () => '亲，请确认您录入的姓名是否正确哦~',
  validate: value => {
+    return value
    // return /^[\u4e00-\u9fa5·]{1,15}$/.test(value)
-    return /^[\u4e00-\u9fa5·]{2,120}$|^[a-zA-Z\s]{4,120}$/.test(value);
+    // return /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/.test(value);
+    // return /^[\u4e00-\u9fa5·]{2,120}$|^[a-zA-Z\s]{4,120}$/.test(value);
  }
 });
 // sale -  详细地址 - 详细地址须同时包含汉字和数字，
--- a/src/components/common/SearchField.vue
+++ b/src/components/common/SearchField.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="search_box" ref="search_box">
-    <van-field :label="label" required>
+    <van-field :label="label" :class="{ 'van-cell--required': required }">
      <template #input>
        <input
          style="width: 100%; border: none"
@@ -40,6 +40,10 @@ export default {
    value: {
      type: String
    },
+    required: {
+      type: Boolean,
+      default: true
+    },
    isAsync: {
      type: Boolean,
      default: false
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -29,29 +29,29 @@ function getSearchString (key) {
  }
  return obj[key]
 }
-let apiVersion = 'v2'
-var ua = window.navigator.userAgent.toLowerCase()
-//通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
-if (localStorage.getItem('apiVersion')) {
-  apiVersion = localStorage.getItem('apiVersion')
-} else {
-  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-    //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
-    if (window.location.href.indexOf('apiVersion') > 0) {
-      apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
-    } else {
-      apiVersion = 'v3'
-    }
-  } else {
-    // 在app
-    if (navigator.userAgent.indexOf('JZG_') > 0) {
-      apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
-    }
-  }
-  window.localStorage.setItem('apiVersion', apiVersion)
-}
-// 可以多个接口域名，按需添加
-console.log('环境：', process.env.VUE_APP_FLAG)
+let apiVersion = 'v1'
+// var ua = window.navigator.userAgent.toLowerCase()
+// //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
+// if (localStorage.getItem('apiVersion')) {
+//   apiVersion = localStorage.getItem('apiVersion')
+// } else {
+//   if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+//     //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
+//     if (window.location.href.indexOf('apiVersion') > 0) {
+//       apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
+//     } else {
+//       apiVersion = 'v3'
+//     }
+//   } else {
+//     // 在app
+//     if (navigator.userAgent.indexOf('JZG_') > 0) {
+//       apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
+//     }
+//   }
+//   window.localStorage.setItem('apiVersion', apiVersion)
+// }
+// // 可以多个接口域名，按需添加
+// console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {
  case 'dev':
    apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/' + apiVersion // 国富api ///api/v1
--- a/src/router/GBC/index.js
+++ b/src/router/GBC/index.js
@@ -3,6 +3,8 @@ const GBC_home = () => import('@/views/GBC/home')
 const GBC_projectList = () => import('@/views/GBC/projectList')
 const GBC_projectDetail = () => import('@/views/GBC/projectDetail')
 const GBC_customerDetail = () => import('@/views/GBC/customerDetail')
+const GBC_InsuredInfo = () => import('@/views/GBC/InsuredInfo')
+const GBC_submitResult = () => import('@/views/GBC/submitResult')

 export default [
  {
@@ -41,4 +43,22 @@ export default [
      index: 1
    }
  },
+  {
+    path: '/GBC/InsuredInfo',
+    name: 'GBC_InsuredInfo',
+    component: GBC_InsuredInfo,
+    meta: {
+      title: '信息录入',
+      index: 1
+    }
+  },
+  {
+    path: '/GBC/submitResult',
+    name: 'GBC_submitResult',
+    component: GBC_submitResult,
+    meta: {
+      title: '提交结果',
+      index: 1
+    }
+  },
 ]
--- a/src/views/GBC/InsuredInfo.vue
+++ b/src/views/GBC/InsuredInfo.vue
--- a/src/views/GBC/customerDetail.vue
+++ b/src/views/GBC/customerDetail.vue
@@ -9,16 +9,20 @@
      </div>
      <div style="display: flex;font-size: 13px;color: #999;margin-top: 10px;">
        <span style="width: 25%;display: flex;align-items: flex-end;align-items: baseline;justify-content: center;">
-          <span style="color: #EC5449;font-size: 22px;margin-right: 7px;font-weight: bold;">{{infoContent.contSize}}</span>份
+          <span style="color: #EC5449;font-size: 22px;margin-right: 2px;font-weight: bold;">{{infoContent.contSize}}</span>
+          <span>份</span>
        </span>
        <span style="width: 25%;display: flex;align-items: flex-end;align-items: baseline;justify-content: center;">
-          <span style="color: #EC5449;font-size: 22px;margin-right: 7px;font-weight: bold;">{{infoContent.members.length}}</span>人
+          <span style="color: #EC5449;font-size: 22px;margin-right: 2px;font-weight: bold;">{{infoContent.members.length}}</span>
+          <span>人</span>
        </span>
        <span style="width: 25%;display: flex;align-items: flex-end;align-items: baseline;justify-content: center;">
-          <span style="color: #EC5449;font-size: 22px;margin-right: 7px;font-weight: bold;">{{infoContent.totalAmt}}</span>
+          <span style="color: #EC5449;font-size: 22px;margin-right: 2px;font-weight: bold;">{{infoContent.totalAmt}}</span>
+          <span>万元</span>
        </span>
        <span style="width: 25%;display: flex;align-items: flex-end;align-items: baseline;justify-content: center;">
-          <span style="color: #EC5449;font-size: 22px;margin-right: 7px;font-weight: bold;">{{infoContent.totalPrem}}</span>
+          <span style="color: #EC5449;font-size: 22px;margin-right: 2px;font-weight: bold;">{{infoContent.totalPrem}}</span>
+          <span>万元</span>
        </span>
      </div>
    </div>
@@ -131,22 +135,22 @@
            </div>
            <div style="padding: 10px 0px;">
              <div style="display: flex;line-height: 30px;align-items: center;">
-                <p style="width: 30%;color: #666;">投保人：</p>
+                <p style="width: 25%;color: #666;">投保人：</p>
                <p style="width: 25%;color: #000;">{{item.appntName}}</p>
                <p style="width: 25%;color: #666;">被保险人：</p>
-                <p style="width: 20%;color: #000;">{{item.insuredName}}</p>
+                <p style="width: 25%;color: #000;">{{item.insuredName}}</p>
              </div>
              <div style="display: flex;line-height: 30px;align-items: center;">
-                <p style="width: 30%;color: #666;">保额(元)：</p>
-                <p style="width: 25%;color: #000;">{{item.amt}}</p>
+                <p style="width: 25%;color: #666;">保额(元)：</p>
+                <p style="width: 25%;color: #000;">{{Number(item.amt).toFixed(2)}}</p>
                <p style="width: 25%;color: #666;">保费(元)：</p>
-                <p style="width: 20%;color: #000;">{{item.prem}}</p>
+                <p style="width: 25%;color: #000;">{{Number(item.prem).toFixed(2)}}</p>
              </div>
              <div style="display: flex;line-height: 30px;align-items: center;">
-                <p style="width: 30%;color: #666;">交费期间：</p>
+                <p style="width: 25%;color: #666;">交费期间：</p>
                <p style="width: 25%;color: #000;">{{item.paymentPeriod}}</p>
                <p style="width: 25%;color: #666;">保险期间：</p>
-                <p style="width: 20%;color: #000;">{{item.insuredPeriod}}</p>
+                <p style="width: 25%;color: #000;">{{item.insuredPeriod}}</p>
              </div>
              <div style="display: flex;line-height: 30px;align-items: center;">
                <p style="width: 30%;color: #666;">保险生效日期：</p>
@@ -224,12 +228,14 @@ export default {
      ],
      connectContent: "",
      maxLength: 500,
+      activeAppntId:'',
    }
  },
  created() {

  },
  mounted(){
+    this.activeAppntId = this.$route.query.appntId
    this.getGBCappntDetail()
  },
  methods: {
@@ -237,6 +243,7 @@ export default {
      this.activeMembersIndex = thisIndex
      this.infoContent.appntName = thisData.name
      this.infoContent.age = thisData.age
+      this.activeAppntId = thisData.appntId
      this.infoContent.gender = thisData.gender
      this.infoContent.mobile = thisData.mobile
      this.infoContent.departmentName = thisData.departmentName
@@ -257,12 +264,14 @@ export default {
    getGBCappntConnectSave(){
      let params = {
        "projectCode": this.$route.query.projectCode,
-        "appntId": this.$route.query.projectCode,
+        "appntId": this.activeAppntId,
        "connectContent": this.connectContent
      }
      getGBCappntConnectSave(params).then(res=>{
        if(res.result == 0) {
          this.$toast('保存成功')
+          this.connectContent = ''
+          this.activeConnectRecords = false
          this.getGBCappntDetail()
        } else {
          this.$toast(res.resultMessage)
@@ -275,7 +284,7 @@ export default {
        this.infoContent.appntType = value.id
        let params = {
          "projectCode": this.$route.query.projectCode,
-          "appntId": this.$route.query.appntId,
+          "appntId": this.activeAppntId,
          "appntType": this.infoContent.appntType
        }
        getGBCappntTypeSave(params).then(res=>{
--- a/src/views/GBC/projectDetail.vue
+++ b/src/views/GBC/projectDetail.vue
@@ -5,128 +5,176 @@
      <van-tab title="数据看板" name="dataBoard"></van-tab>
      <van-tab title="产品列表" name="productList"></van-tab>
    </van-tabs>
-    <div v-if="tabActive == 'customerList'">
-      <div style="display: flex;align-items: center;padding-left: 10px;background: #fff;">
-        <div style="width: 30%;">
-          <van-dropdown-menu :overlay="dropdownmenuoverlay">
-            <van-dropdown-item v-model="filterType" :options="filterTypeOption" @change="dropdownMenuChange"/>
-          </van-dropdown-menu>
-        </div>
-        <van-search v-if="filterType == 1 || filterType == 2 || filterType == 3" v-model="searchvalue" shape="round" @search="getGBCappntlist" placeholder="搜索客户姓名/部门/科室/服务人员" style="width: 70%;"/>
-        <div v-if="filterType == 4" style="display: flex;align-items: center;height: 54px;">
-          <div @click="toChooseDate('startDate')" style="background: #f5f5f5;height: 34px;border-radius: 17px;width: 90px;display: flex;align-items: center;padding:0px 10px;">
-            <van-icon name="notes-o" />
-            <span v-if="!startDate" style="font-size: 12px;margin-left: 5px;color: #666;">请选择日期</span>
-            <span v-if="startDate" style="font-size: 12px;margin-left: 5px;color: #333;">{{startDate}}</span>
+    <div style="height: calc(100vh - 50px);overflow: auto;">
+      <div v-if="tabActive == 'customerList'">
+        <div style="display: flex;align-items: center;padding-left: 10px;background: #fff;">
+          <div style="width: 30%;">
+            <van-dropdown-menu :overlay="dropdownmenuoverlay">
+              <van-dropdown-item v-model="filterType" :options="filterTypeOption" @change="dropdownMenuChange"/>
+            </van-dropdown-menu>
          </div>
-          <span style="margin: 0px 5px;font-size: 14px;">至</span>
-          <div @click="toChooseDate('endDate')" style="background: #f5f5f5;height: 34px;border-radius: 17px;width: 90px;display: flex;align-items: center;padding: 0px 10px;">
-            <van-icon name="notes-o" />
-            <span v-if="!endDate" style="font-size: 12px;margin-left: 5px;color: #666;">请选择日期</span>
-            <span v-if="endDate" style="font-size: 12px;margin-left: 5px;color: #333;">{{endDate}}</span>
-          </div>
-        </div>
-      </div>
-      <div style="padding: 0px 10px 10px;">
-        <div v-for="(item,index) in customerList" :key="index">
-          <div style="padding: 20px 20px 10px;border-radius: 5px;background: #fff;margin-top: 20px;">
-            <div style="display: flex;font-size: 14px;line-height: 30px;border-bottom: 1px solid #eee;padding-bottom: 10px;">
-              <div style="width: 55%;overflow: hidden;white-space: nowrap;">
-                <p>客户姓名：{{item.appntName}}</p>
-                <p>手机号码：{{item.mobile}}</p>
-                <p>服务组长：{{item.teamLeader}}</p>
-              </div>
-              <div style="width: 45%;overflow: hidden;white-space: nowrap;">
-                <p>部门/科室：{{item.departmentName}}</p>
-                <p>承包保单：{{item.contSize}}份</p>
-                <p>服务组员：{{item.teamMember}}</p>
-              </div>
+          <van-search v-if="filterType == 1 || filterType == 2 || filterType == 3" v-model="searchvalue" shape="round" @search="getGBCappntlist" placeholder="搜索客户姓名/部门/科室/服务人员" style="width: 70%;"/>
+          <div v-if="filterType == 4" style="display: flex;align-items: center;height: 54px;">
+            <div @click="toChooseDate('startDate')" style="background: #f5f5f5;height: 34px;border-radius: 17px;width: 90px;display: flex;align-items: center;padding:0px 10px;">
+              <van-icon name="notes-o" />
+              <span v-if="!startDate" style="font-size: 12px;margin-left: 5px;color: #666;">请选择日期</span>
+              <span v-if="startDate" style="font-size: 12px;margin-left: 5px;color: #333;">{{startDate}}</span>
            </div>
-            <div style="display: flex;justify-content: flex-end;margin-top: 10px;">
-              <van-button @click="goCustomerDetail(item)" type="danger" size="small" style="border-radius:5px;">查看编辑</van-button>
+            <span style="margin: 0px 5px;font-size: 14px;">至</span>
+            <div @click="toChooseDate('endDate')" style="background: #f5f5f5;height: 34px;border-radius: 17px;width: 90px;display: flex;align-items: center;padding: 0px 10px;">
+              <van-icon name="notes-o" />
+              <span v-if="!endDate" style="font-size: 12px;margin-left: 5px;color: #666;">请选择日期</span>
+              <span v-if="endDate" style="font-size: 12px;margin-left: 5px;color: #333;">{{endDate}}</span>
            </div>
          </div>
        </div>
-      </div>
-    </div>
-    <div v-if="tabActive == 'dataBoard'">
-      <div style="margin: 10px;padding: 10px;background: #fff;border-radius: 5px;">
-        <p style="font-size: 18px;line-height: 35px;font-weight: bold;">项目名称：国富人寿北京协和医院AA项目</p>
-        <p style="color: #a7a7a7;font-size: 14px;">数据截止日期：2024-03-30</p>
-        <div style="display: flex;justify-content: center;margin-top: 20px;">
-          <van-circle v-model="currentRate" color="#E9332E" :stroke-width="60" size="80px" :rate="85" :speed="100" :text="text" />
-        </div>
-        <p style="display: flex;justify-content: center;font-weight: bold;font-size: 14px;margin: 10px;">面谈转化率</p>
-        <div style="padding: 10px;background: rgba(251, 235, 230, 0.5);border-radius: 5px;display: flex;justify-content: flex-start;flex-wrap:wrap;">
-          <div v-for="(item,index) in dataList1" style="width: 33%;display: flex;justify-content: space-around;align-items: center;">
-            <div>
-              <div style="font-size: 12px;line-height: 22px;margin: 7px 0px;">
-                <p style="display: flex;justify-content: center;font-size: 14px;">{{item.value}}</p>
-                <p style="display: flex;justify-content: center;align-items: center;">
-                  <span class="colorBlock" :style="{background:colorList[index]}"></span>
-                  {{item.name}}
-                </p>
+        <div style="padding: 0px 10px 10px;">
+          <div v-for="(item,index) in customerList" :key="index">
+            <div style="padding: 20px 20px 10px;border-radius: 5px;background: #fff;margin-top: 20px;">
+              <div style="display: flex;font-size: 14px;line-height: 30px;border-bottom: 1px solid #eee;padding-bottom: 10px;">
+                <div style="width: 55%;overflow: hidden;white-space: nowrap;">
+                  <p>客户姓名：{{item.appntName}}</p>
+                  <p>手机号码：{{item.mobile}}</p>
+                  <p>服务组长：{{item.teamLeader}}</p>
+                </div>
+                <div style="width: 45%;overflow: hidden;white-space: nowrap;">
+                  <p>部门/科室：{{item.departmentName}}</p>
+                  <p>承保保单：{{item.contSize}}份</p>
+                  <p>服务组员：{{item.teamMember}}</p>
+                </div>
+              </div>
+              <div style="display: flex;justify-content: flex-end;margin-top: 10px;">
+                <van-button @click="goCustomerDetail(item)" type="danger" size="small" style="border-radius:5px;">查看编辑</van-button>
              </div>
            </div>
-<!--            <div v-if="(index + 1) % 3 != 0 || index < 2" style="width: 1px;background: #FFC9AF;height: 60%;"></div>-->
          </div>
        </div>
      </div>
-      <div style="margin: 10px;padding: 10px;background: #fff;border-radius: 5px;">
-        <div style="border-bottom: 1px dashed #666;padding-bottom: 15px;">
-          <p style="font-size: 18px;line-height: 35px;font-weight: bold;">项目成员分配</p>
-          <p style="color: #a7a7a7;font-size: 14px;">数据截止日期：2024-03-30</p>
-        </div>
-        <div style="margin-top: 10px;margin-bottom: 3px;background: rgba(255, 87, 83, 0.7);line-height: 30px;display: flex;align-items: center;color: #fff;font-size: 14px;">
-          <span style="width: 18%;display: flex;justify-content: center;">成员</span>
-          <span style="width: 22%;display: flex;justify-content: center;">角色</span>
-          <span style="width: 30%;display: flex;justify-content: center;">累计标保(元)</span>
-          <span style="width: 30%;display: flex;justify-content: center;">受理标保(元)</span>
-        </div>
-        <div>
-          <div v-for="item in dataList2" style="background: rgba(251, 235, 230, 0.44);margin-bottom: 1px;line-height: 30px;display: flex;align-items: center;color: #333;font-size: 13px;">
-            <span style="width: 18%;display: flex;justify-content: center;">{{item.name}}</span>
-            <span style="width: 22%;display: flex;justify-content: center;">{{item.role}}</span>
-            <span style="width: 30%;display: flex;justify-content: center;">{{item.value1}}</span>
-            <span style="width: 30%;display: flex;justify-content: center;">{{item.value2}}</span>
+      <div v-if="tabActive == 'dataBoard'">
+        <div style="margin: 10px;padding: 10px;background: #fff;border-radius: 5px;">
+          <p style="font-size: 18px;line-height: 35px;font-weight: bold;">项目名称：{{calGbcProject.projectName}}</p>
+          <p style="color: #a7a7a7;font-size: 14px;">数据截止日期：{{calGbcProject.endDate}}</p>
+          <div style="display: flex;justify-content: center;margin-top: 20px;">
+            <van-circle v-model="currentRate" color="#E9332E" :stroke-width="60" size="80px" :rate="interviewConversionRate" :speed="100" :text="text" />
+          </div>
+          <p style="display: flex;justify-content: center;font-weight: bold;font-size: 14px;margin: 10px;">面谈转化率</p>
+          <div style="padding: 10px;background: rgba(251, 235, 230, 0.5);border-radius: 5px;display: flex;justify-content: flex-start;flex-wrap:wrap;">
+            <div v-for="(item,index) in calGbcProjectDataList" style="width: 33%;display: flex;justify-content: space-around;align-items: center;">
+              <div>
+                <div style="font-size: 12px;line-height: 22px;margin: 7px 0px;">
+                  <p style="display: flex;justify-content: center;font-size: 14px;">{{item.value}}</p>
+                  <p style="display: flex;justify-content: center;align-items: center;">
+                    <span class="colorBlock" :style="{background:colorList[index]}"></span>
+                    {{item.name}}
+                  </p>
+                </div>
+              </div>
+              <!--            <div v-if="(index + 1) % 3 != 0 || index < 2" style="width: 1px;background: #FFC9AF;height: 60%;"></div>-->
+            </div>
+          </div>
+        </div>
+        <div style="margin: 10px;padding: 10px;background: #fff;border-radius: 5px;">
+          <div style="border-bottom: 1px dashed #666;padding-bottom: 15px;">
+            <p style="font-size: 18px;line-height: 35px;font-weight: bold;">项目成员分配</p>
+            <p v-if="calGbcPersonList.length != 0" style="color: #a7a7a7;font-size: 14px;">数据截止日期：{{calGbcPersonList[0].endDate}}</p>
+          </div>
+          <div style="margin-top: 10px;margin-bottom: 3px;background: rgba(255, 87, 83, 0.7);line-height: 30px;display: flex;align-items: center;color: #fff;font-size: 14px;">
+            <span style="width: 18%;display: flex;justify-content: center;">成员</span>
+            <span style="width: 22%;display: flex;justify-content: center;">角色</span>
+            <span style="width: 30%;display: flex;justify-content: center;">累计标保(元)</span>
+            <span style="width: 30%;display: flex;justify-content: center;">受理标保(元)</span>
+          </div>
+          <div>
+            <div v-for="item in calGbcPersonList" style="background: rgba(251, 235, 230, 0.44);margin-bottom: 1px;line-height: 30px;display: flex;align-items: center;color: #333;font-size: 13px;">
+              <span style="width: 18%;display: flex;justify-content: center;">{{item.personName}}</span>
+              <span style="width: 22%;display: flex;justify-content: center;">{{item.roleName}}</span>
+              <span style="width: 30%;display: flex;justify-content: center;">{{item.sumStandardPrem}}</span>
+              <span style="width: 30%;display: flex;justify-content: center;">{{item.sumAcceptedPrem}}</span>
+            </div>
          </div>
        </div>
-      </div>

-      <div style="margin: 10px;padding: 10px;background: #fff;border-radius: 5px;">
-        <div style="border-bottom: 1px dashed #666;padding-bottom: 15px;">
-          <p style="font-size: 18px;line-height: 35px;font-weight: bold;">项目数据统计</p>
-          <p style="color: #a7a7a7;font-size: 14px;">数据截止日期：2024-03-30</p>
-        </div>
-        <div style="margin-top: 10px;margin-bottom: 3px;background: rgba(255, 87, 83, 0.7);line-height: 30px;display: flex;align-items: center;color: #fff;font-size: 14px;">
-          <span style="width: 25%;display: flex;justify-content: center;">小组</span>
-          <span style="width: 25%;display: flex;justify-content: center;">组长</span>
-          <span style="width: 25%;display: flex;justify-content: center;">获客人数</span>
-          <span style="width: 25%;display: flex;justify-content: center;">获客率</span>
-        </div>
-        <div>
-          <div style="background: rgba(251, 235, 230, 0.44);margin-bottom: 1px;line-height: 30px;display: flex;align-items: center;color: #333;font-size: 13px;">
-            <span style="width: 50%;display: flex;justify-content: center;">项目合并</span>
-            <span style="width: 25%;display: flex;justify-content: center;">890</span>
-            <span style="width: 25%;display: flex;justify-content: center;">89%</span>
+        <div style="margin: 10px;padding: 10px;background: #fff;border-radius: 5px;">
+          <div style="border-bottom: 1px dashed #666;padding-bottom: 15px;">
+            <p style="font-size: 18px;line-height: 35px;font-weight: bold;">项目数据统计</p>
+            <p v-if="calGbcTeamList.length != 0" style="color: #a7a7a7;font-size: 14px;">数据截止日期：{{calGbcTeamList[0].endDate}}</p>
          </div>
-        </div>
-        <div>
-          <div v-for="(item,index) in dataList3" :key="index" style="background: rgba(251, 235, 230, 0.44);margin-bottom: 1px;line-height: 30px;display: flex;align-items: center;color: #333;font-size: 13px;">
-            <span style="width: 25%;display: flex;justify-content: center;">{{item.name}}</span>
-            <span style="width: 25%;display: flex;justify-content: center;">{{item.role}}</span>
-            <span style="width: 25%;display: flex;justify-content: center;">{{item.value1}}</span>
-            <span style="width: 25%;display: flex;justify-content: center;">{{item.value2}}</span>
+          <div style="overflow: auto;">
+            <table cellspacing=0 style="margin-top: 10px;">
+              <thead style="background: rgba(255, 87, 83, 0.7);color: #fff;">
+              <tr class="theadClass">
+                <th style="padding: 0px 40px;">小组</th>
+                <th>组长</th>
+                <th>承保保费(元)</th>
+                <th>获客人数</th>
+                <th>获客率</th>
+                <th>筛客人数</th>
+                <th>筛客率</th>
+                <th>累计标保(元)</th>
+                <th>承保人数</th>
+                <th>承保件数(件)</th>
+                <th>件均(元)</th>
+                <th>面谈转化率</th>
+                <th>受理承保率</th>
+                <th>受理标保(元)</th>
+                <th>受理件数</th>
+                <th>重疾险件数</th>
+                <th>重疾标保(元)</th>
+                <th>重疾件均(元)</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr class="tbodyClass">
+                <td colspan="2">项目合并</td>
+                <td>{{calGbcTeamTotalDTO.sumInsuredPrem}}</td>
+                <td>{{calGbcTeamTotalDTO.guestNum}}</td>
+                <td>{{calGbcTeamTotalDTO.guestRate}}</td>
+                <td>{{calGbcTeamTotalDTO.guestSelectNum}}</td>
+                <td>{{calGbcTeamTotalDTO.guestSelectRate}}</td>
+                <td>{{calGbcTeamTotalDTO.sumStandardPrem}}</td>
+                <td>{{calGbcTeamTotalDTO.sumInsuredNum}}</td>
+                <td>{{calGbcTeamTotalDTO.sumInsuredCases}}</td>
+                <td>{{calGbcTeamTotalDTO.averagePrem}}</td>
+                <td>{{calGbcTeamTotalDTO.interviewConversionRate}}</td>
+                <td>{{calGbcTeamTotalDTO.acceptedRate}}</td>
+                <td>{{calGbcTeamTotalDTO.sumAcceptedPrem}}</td>
+                <td>{{calGbcTeamTotalDTO.sumAcceptedCases}}</td>
+                <td>{{calGbcTeamTotalDTO.sumMajorDiseaseCases}}</td>
+                <td>{{calGbcTeamTotalDTO.sumMajorDiseasePrem}}</td>
+                <td>{{calGbcTeamTotalDTO.averageMajorDiseasePrem}}</td>
+              </tr>
+              <tr v-for="(item,index) in calGbcTeamList" :key="index" class="tbodyClass">
+                <td class="teamNameTdClass">{{item.teamName}}</td>
+                <td>{{item.leaderName}}</td>
+                <td>{{item.sumInsuredPrem}}</td>
+                <td>{{item.guestNum}}</td>
+                <td>{{item.guestRate}}</td>
+                <td>{{item.guestSelectNum}}</td>
+                <td>{{item.guestSelectRate}}</td>
+                <td>{{item.sumStandardPrem}}</td>
+                <td>{{item.sumInsuredNum}}</td>
+                <td>{{item.sumInsuredCases}}</td>
+                <td>{{item.averagePrem}}</td>
+                <td>{{item.interviewConversionRate}}</td>
+                <td>{{item.acceptedRate}}</td>
+                <td>{{item.sumAcceptedPrem}}</td>
+                <td>{{item.sumAcceptedCases}}</td>
+                <td>{{item.sumMajorDiseaseCases}}</td>
+                <td>{{item.sumMajorDiseasePrem}}</td>
+                <td>{{item.averageMajorDiseasePrem}}</td>
+              </tr>
+              </tbody>
+            </table>
          </div>
        </div>
      </div>
-    </div>
-    <div v-if="tabActive == 'productList'">
-      <div v-for="(item,index) in dataList4" @click="goProductDetail(item.productCode)" :key="index" style="background: #fff;border-radius: 5px;margin: 5px;display: flex;padding: 5px;">
-        <img :src="item.productImageUrl"  style="display: inline-block;width: 35%;border-radius: 5px;"/>
-        <div style="display: inline-block;width: 65%;padding-left: 10px;">
-          <p style="font-size: 16px;">{{item.productName}}</p>
-          <p style="font-size: 14px;color: #bdbdbd;margin-top: 20px;">{{item.productDesc}}</p>
+      <div v-if="tabActive == 'productList'">
+        <div v-for="(item,index) in dataList4" @click="goProductDetail(item.productCode)" :key="index" style="background: #fff;border-radius: 5px;margin: 5px;display: flex;padding: 5px;">
+          <img :src="item.productImageUrl"  style="display: inline-block;width: 35%;border-radius: 5px;"/>
+          <div style="display: inline-block;width: 65%;padding-left: 10px;">
+            <p style="font-size: 16px;">{{item.productName}}</p>
+            <p style="font-size: 14px;color: #bdbdbd;margin-top: 20px;">{{item.productDesc}}</p>
+          </div>
        </div>
      </div>
    </div>
@@ -140,7 +188,7 @@
 <script>
 import { Tab, Tabs, Search, DropdownMenu, DropdownItem, Circle } from 'vant'
 import { getList } from '@/api/ebiz/product/product.js'
-import { getGBCappntlist } from '@/api/GBC/GBC.js'
+import { getGBCappntlist, dataShow } from '@/api/GBC/GBC.js'
 export default {
  components: {
    [Tab.name]: Tab,
@@ -172,33 +220,20 @@ export default {
      customerList:[],
      currentRate: 0,
      colorList:['#E9332E','#CB9BFF','#54C6FA','#FF9B39','#60D64D','#4045F3','#FF59D9','#E8C0A2','#FCD338','#7584A2'],
-      dataList1:[
-        {name:'累计受理保费(元)',value:'150,000.00'},
-        {name:'累计标保(元)',value:'250,000.00'},
-        {name:'件均保费(元)',value:'130,000.00'},
-        {name:'件均保费(元)',value:'10856'},
-        {name:'累计受理件数(件)',value:'356'},
-        {name:'累计承保人数(人)',value:'9569'},
-        {name:'累计承保件数(件)',value:'262'},
-      ],
-      dataList2:[
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-        {name:'张大大',role:'项目经理',value1:'15,000.00',value2:'15,000.00'},
-      ],
-      dataList3:[
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
-        {name:'A组',role:'李艾',value1:'600',value2:'60'},
+      calGbcProject: {},
+      interviewConversionRate: 0,
+      calGbcProjectDataList:[
+        {name:'累计受理保费(元)',value:'150,000.00', code: 'sumAcceptedPrem'},
+        {name:'累计标保(元)',value:'250,000.00', code: 'sumStandardPrem'},
+        {name:'件均保费(元)',value:'130,000.00', code: 'averagePrem'},
+        {name:'累计受理人数(人)',value:'10856', code: 'sumAcceptedNum'},
+        {name:'累计受理件数(件)',value:'356', code: 'sumAcceptedCases'},
+        {name:'累计承保人数(人)',value:'9569', code: 'sumInsuredNum'},
+        {name:'累计承保件数(件)',value:'262', code: 'sumInsuredCases'},
      ],
+      calGbcPersonList:[],
+      calGbcTeamList:[],
+      calGbcTeamTotalDTO: {},
      dataList4:[],
    }
  },
@@ -206,10 +241,37 @@ export default {

  },
  mounted(){
+    document.title = this.$route.query.projectName
    this.getGBCappntlist()
    this.getProductList()
+    this.getDataShow()
  },
  methods: {
+    getDataShow() {
+      let params = {
+        projectCode: this.$route.query.projectCode
+      }
+      dataShow(params).then(res => {
+        this.calGbcPersonList = []
+        this.calGbcTeamList = []
+        if(res.result == '0') {
+          this.calGbcProject = res.content.calGbcProject
+          this.interviewConversionRate = Number(res.content.calGbcProject.interviewConversionRate)
+          for(let key in res.content.calGbcProject) {
+            this.calGbcProjectDataList.forEach(item => {
+              if(item.code == key) {
+                item.value = res.content.calGbcProject[key]
+              }
+            })
+          }
+          this.calGbcPersonList = res.content.calGbcPersonList
+          this.calGbcTeamList = res.content.calGbcTeamList
+          this.calGbcTeamTotalDTO = res.content.calGbcTeamTotalDTO
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
    dropdownMenuChange(value){
      this.filterType = value
      this.searchvalue = ''
@@ -302,9 +364,6 @@ export default {
      getList(params).then(res=>{
        if(res.result == '0') {
          this.dataList4 = this.dataList4.concat(res.productList)
-          this.dataList4 = this.dataList4.concat(res.productList)
-          this.dataList4 = this.dataList4.concat(res.productList)
-          this.dataList4 = this.dataList4.concat(res.productList)
        } else {
          this.$toast(res.resultMessage)
        }
@@ -376,4 +435,28 @@ export default {
  /deep/ [data-v-3f765cce] .van-dropdown-item__content{
    box-shadow: 0px 0px 5px 5px #f5f5f5;
  }
+  .theadClass{
+    th{
+      white-space: nowrap;
+      padding: 0px 10px;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 30px;
+    }
+  }
+  .tbodyClass{
+    background: rgba(251, 235, 230, 0.44);
+    line-height: 30px;
+    margin-bottom: 1px;
+    font-size: 13px;
+    /*color: #fff;*/
+    td{
+      text-align: center;
+      border-bottom:1px solid #fff;
+    }
+  }
+  .teamNameTdClass{
+    display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;
+    //width: 105px;
+  }
 </style>
--- a/src/views/GBC/projectList.vue
+++ b/src/views/GBC/projectList.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
-    <van-search v-model="searchvalue" shape="round" background="#fff" placeholder="搜索项目名称"/>
+    <van-search v-model="searchvalue" shape="round" background="#fff" @search="getGBCprojectlistByYear" placeholder="搜索项目名称"/>
    <div style="padding: 10px;">
      <van-collapse v-for="item in yearList" :key="item.year" v-model="activeNames" style="margin-top: 10px;border-radius: 5px;">
        <van-collapse-item :title="item.year" :name="item.year">
@@ -45,7 +45,7 @@ export default {
  methods: {
    getGBCprojectlistByYear(){
      let params = {
-
+        projectName: this.searchvalue
      }
      getGBCprojectlistByYear(params).then(res=>{
        if(res.result == '0') {
@@ -62,7 +62,8 @@ export default {
      this.$router.push({
        path:'/GBC/projectDetail',
        query:{
-          projectCode:data.projectCode
+          projectCode:data.projectCode,
+          projectName:data.projectName
        },
      })
    },
--- a/src/views/GBC/submitResult.vue
+++ b/src/views/GBC/submitResult.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <div style="text-align: center;margin-top: 10vh;">
+      <img :src="submitResultImg" style="width: 60vw;"/>
+    </div>
+    <p style="font-size: 20px;text-align: center;margin-top: 5vh;">提交成功</p>
+  </div>
+</template>
+
+<script>
+  import submitResultImg from '@/assets/images/GBC/submitResult.png'
+  export default {
+    data() {
+      return {
+        submitResultImg,
+      }
+    },
+    components: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    },
+
+    beforeRouteLeave(to, from, next) {
+      document.body.style.backgroundColor = ''
+      next()
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
--- a/src/views/ebiz/agentEenter/js/bankList.js
+++ b/src/views/ebiz/agentEenter/js/bankList.js
@@ -683,8 +683,8 @@ let bankListJson = [
  },
  {
    code: '50002',
-    name: '广西壮族自治区农村信用社联合社',
-    child: [{ code: '402611099974', name: '广西壮族自治区农村信用社联合社' }]
+    name: '广西农村商业联合银行股份有限公司',
+    child: [{ code: '402611099974', name: '广西农村商业联合银行股份有限公司' }]
  },
  {
    code: '20041',
--- a/src/views/ebiz/cardList/GroupAppntInfo.vue
+++ b/src/views/ebiz/cardList/GroupAppntInfo.vue
@@ -131,6 +131,29 @@
        placeholder='请选择'
        @click="toSelect('6')"
      />
+      <div class="p15 pl8 fs14" style="border-bottom: 1px solid #eee;display: flex;justify-content: space-between;align-items: center;" v-if="manageComCode == '45'">
+        <van-radio-group v-model="userInfo.isNewPeopleFlag" class="flex">
+          <label>
+            <i class="red">*</i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTip = true"/>
+      </div>
+      <van-field
+        v-if="userInfo.isNewPeopleFlag == 1"
+        :value="userInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('11')"
+      />
      <van-field
        v-model='userInfo.homeName'
        readonly
@@ -188,6 +211,17 @@
    <van-popup v-model='isScan2' position='bottom'>
      <IdentityCardScan @getScanInfo='getIdentityInfo'></IdentityCardScan>
    </van-popup>
+    <van-dialog v-model="isNewPeopleFlagTipshow" :showConfirmButton="false">
+      <div slot="title">
+        <p style="color: #E9332E;">新市民身份说明</p>
+      </div>
+      <div style="padding: 20px 30px 30px;font-size: 14px;">
+        <div style="line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 30px;">
+        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
+      </div>
+    </van-dialog>
  </div>
 </template>
 <script>
@@ -211,6 +245,7 @@ import OccupationForLoop from '@/components/ebiz/occipation/OccupationForLoop'
 import { selectComp, getIdentityInfo } from './js/methods'
 import Vue from 'vue'
 import { GoodsAction, GoodsActionIcon, GoodsActionButton } from 'vant'
+import riskRules from '@/views/ebiz/common/risk-rules'

 DataDictionary.relationToAppnt = DataDictionary.relationToAppnt.slice(0, 4)
 Vue.use(Checkbox).use(CheckboxGroup)
@@ -312,7 +347,9 @@ export default {
        mobile: '', //移动电话
        email: '', //电子邮箱
        schoolName: '',
-        className: ''
+        className: '',
+        isNewPeopleFlag: '', //新市民身份
+        npType: '', //新市民类型
        // effectiveDate: '' //指定生效日期
      },
      selectUser: '',
@@ -337,34 +374,15 @@ export default {
        load: false, //防止重复请求
        value: false
      },
-      occupationalType: DataDictionary.queryOccupationalByType[0].id
+      occupationalType: DataDictionary.queryOccupationalByType[0].id,
+      manageComCode: '',
+      isNewPeopleFlagTipshow: false,
    }
  },
  created() {
-    // document.body.style.backgroundColor = '#F5F5F5'
-    //如果是编辑进来
-    // if (this.$route.query.edit) {
-    //   getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {
-    //     if (res.result == 0) {
-    //       //投保人信息返显
-    //       this.userInfo = res.orderDTO.appntDTO
-    //       //是否长期
-    //       this.userInfo.effectiveDateType = res.orderDTO.appntDTO.effectiveDateType == 'false' ? false : true
-    //       //有无社保
-    //       this.userInfo.medical = '1'
-    //       //设为联系地址
-    //       this.userInfo.addressStatus = '0'
-    //       //证件类型
-    //       this.userInfo.idType = '1'
-    //       //国家/地区
-    //       this.userInfo.nativeplace = '1'
-    //       this.$utils.intLocalStorage(res)
-    //     }
-    //   })
-    // }
    this.userInfo.homeName = getAreaName([{ code: 450000 }, { code: 450100 }, { code: 450101 }]) //家庭地址
  },
-  mounted() {
+  async mounted() {
    let that = this
    setTimeout(() => {
      // eslint-disable-next-line no-undef
@@ -375,6 +393,8 @@ export default {
    }, 100)
    // 筛选按钮的点击事件
    window.appCallBack = this.appCallBack
+    let dataReturn = await riskRules.getAgentInfoFunc(this)
+    this.manageComCode = dataReturn.manageComCode
    if (this.$route.query.cardOrderNo) {
      this.cardOrderNo = this.$route.query.cardOrderNo
      //根据后台数据来展示
@@ -548,6 +568,8 @@ export default {
        this.columns = DataDictionary.workCondition
      } else if (pickerType == '8') {
        this.columns = DataDictionary.salarySource
+      } else if (pickerType == '11') {
+        this.columns = DataDictionary.npType
      }
    },
    //确认选择字段
@@ -585,6 +607,8 @@ export default {
        this.proScheme = value.text
        this.proSchemeCode = value.id
        this.chooseKind = value.label
+      } else if (this.pickerType === '11') {
+        this.userInfo.npType = value.id
      }
    },
    //证件起始截止日期
@@ -730,6 +754,8 @@ export default {
        let age = utilsAge.getAge(this.userInfo.birthday, new Date())
        // 长期按钮是否禁用
        this.effectiveDateTypeAble = age <= 45
+        this.userInfo.isNewPeopleFlag = data.isNewPeopleFlag //新市民身份
+        this.userInfo.npType = data.npType //新市民类型
        this.getRelatedData(this.userInfo.idNo, '1')
      }
      // console.log(data, val)
@@ -826,6 +852,12 @@ export default {
              }
            }
          }
+          if (this.manageComCode == '45' && (this.userInfo.isNewPeopleFlag == '' || this.userInfo.isNewPeopleFlag == null || this.userInfo.isNewPeopleFlag == undefined)) {
+            return this.$toast('投保人新市民身份不能为空')
+          }
+          if(this.manageComCode == '45' && this.userInfo.isNewPeopleFlag != '0' && !this.userInfo.npType) {
+            return this.$toast('投保人新市民类型不能为空')
+          }
          this.infoUpdate()
          // console.log('success')
        } else {
--- a/src/views/ebiz/cardList/GroupCheckInfo.vue
+++ b/src/views/ebiz/cardList/GroupCheckInfo.vue
@@ -12,7 +12,7 @@
    <van-cell-group class='mt10'>
      <p style='border-bottom: 1px solid #ebedf0' class='fs15 fwb pl10 pv12'>产品信息</p>
      <van-field :value='riskDTO.riskName' label='保障方案' name='保障方案' readonly />
-      <van-field value='保额' label='保险责任' name='保险责任' readonly />
+      <van-field class="dutyAmt" value='保额' label='保险责任' name='保险责任' readonly input-align="right"/>
      <div v-if='riskDTO.dutyLst && riskDTO.dutyLst.length>0'>
        <div class='duty' v-for='(item, index) in riskDTO.dutyLst' :key='index'>
          <van-field :value="item.amt/10000 +'万'" :label='item.dutyName' :name='item.dutyName' readonly />
@@ -194,4 +194,13 @@ export default {
    text-align: center;
  }
 }
+  .dutyAmt{
+    .van-field__label {
+      width: 60vw;
+    }
+
+    .van-field__control {
+      text-align: center;
+    }
+  }
 </style>
--- a/src/views/ebiz/cardList/GroupInsuredInfo.vue
+++ b/src/views/ebiz/cardList/GroupInsuredInfo.vue
@@ -147,6 +147,29 @@
        placeholder='请选择'
        @click="toSelect('66')"
      />
+      <div class="p15 pl8 fs14" style="border-bottom: 1px solid #eee;display: flex;justify-content: space-between;align-items: center;" v-if="manageComCode == '45'">
+        <van-radio-group v-model="insuredInfo.isNewPeopleFlag" class="flex">
+          <label>
+            <i class="red">*</i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTip = true"/>
+      </div>
+      <van-field
+        v-if="insuredInfo.isNewPeopleFlag == 1"
+        :value="userInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('npType')"
+      />
      <van-field
        v-model='insuredInfo.homeName'
        readonly
@@ -254,6 +277,17 @@
    <van-popup v-model='isScan2' position='bottom'>
      <IdentityCardScan @getScanInfo='getIdentityInfo'></IdentityCardScan>
    </van-popup>
+    <van-dialog v-model="isNewPeopleFlagTipshow" :showConfirmButton="false">
+      <div slot="title">
+        <p style="color: #E9332E;">新市民身份说明</p>
+      </div>
+      <div style="padding: 20px 30px 30px;font-size: 14px;">
+        <div style="line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 30px;">
+        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
+      </div>
+    </van-dialog>
  </div>
 </template>
 <script>
@@ -278,6 +312,7 @@ import { selectComp, getIdentityInfo } from './js/methods'
 import dateUtils from '@/assets/js/utils/date-utils'
 import Vue from 'vue'
 import { GoodsAction, GoodsActionIcon, GoodsActionButton } from 'vant'
+import riskRules from '@/views/ebiz/common/risk-rules'

 DataDictionary.relationToAppnt = DataDictionary.relationToAppnt.slice(0, 4)
 Vue.use(Checkbox).use(CheckboxGroup)
@@ -388,7 +423,9 @@ export default {
        email: '', //电子邮箱
        medical:'0',//有无社保
        schoolName: '',
-        className: ''
+        className: '',
+        isNewPeopleFlag: '', //新市民身份
+        npType: '', //新市民类型
        // effectiveDate: '' //指定生效日期
      },
      //被保人信息
@@ -446,7 +483,9 @@ export default {
      },
      occupationalType: DataDictionary.queryOccupationalByType[0].id,
      isInsuredCertiexpiredate:true, //被保人有效止期是否显示
-      isAppnt: false // 是否投被同人
+      isAppnt: false, // 是否投被同人
+      manageComCode: '',
+      isNewPeopleFlagTipshow: false,
    }
  },
  created() {
@@ -482,7 +521,7 @@ export default {
      this.expireDate = afterDate.getAfterDateTime(val,2)
    }
  },
-  mounted() {
+  async mounted() {
    let that = this
    window.appCallBack = this.appCallBack
    // 2516--除万福卡，投保人、被保险人年收入，默认为0，允许修改
@@ -496,6 +535,8 @@ export default {
    if (this.$route.query.cardOrderNo) {
      this.cardOrderNo = this.$route.query.cardOrderNo
    }
+    let dataReturn = await riskRules.getAgentInfoFunc(this)
+    this.manageComCode = dataReturn.manageComCode
    //根据后台数据来展示
    let cardInfoDTO = {
      orderNo: this.cardOrderNo
@@ -738,6 +779,8 @@ export default {
        // })
      } else if (pickerType == '22') {
       this.columns = DataDictionary.cardListInsuredIdType
+      } else if(pickerType == 'npType') {
+        this.columns = DataDictionary.npType
      }
    },
    //确认选择字段
@@ -823,6 +866,8 @@ export default {
          // this.isInsuredCertiexpiredate = true
        }
        this.insuredInfo.idType = value.id
+      } else if(this.pickerType == 'npType') {
+        this.userInfo.npType = value.id
      }
    },
    //试算逻辑
@@ -1086,6 +1131,8 @@ export default {
        // 长期按钮是否禁用
        this.effectiveDateTypeAbleInsured = age <= 45
        console.log(this.insuredInfo,'this.insuredInfo')
+        this.userInfo.isNewPeopleFlag = data.isNewPeopleFlag //新市民身份
+        this.userInfo.npType = data.npType //新市民类型
        this.getRelatedData(this.insuredInfo.idNo, '2')
      }
      // console.log(data, val)
@@ -1313,6 +1360,12 @@ export default {
          if (this.insuredInfo.effectiveDateType) {
            this.insuredInfo.certiexpiredate = '9999-12-31'
          }
+          if (this.manageComCode == '45' && (this.insuredInfo.isNewPeopleFlag == '' || this.insuredInfo.isNewPeopleFlag == null || this.insuredInfo.isNewPeopleFlag == undefined)) {
+            return this.$toast('投保人新市民身份不能为空')
+          }
+          if(this.manageComCode == '45' && this.insuredInfo.isNewPeopleFlag != '0' && !this.insuredInfo.npType) {
+            return this.$toast('投保人新市民类型不能为空')
+          }
          this.infoUpdate()
          // console.log('success')
        } else {
--- a/src/views/ebiz/cardList/PayResult.vue
+++ b/src/views/ebiz/cardList/PayResult.vue
@@ -25,9 +25,9 @@
    <div v-if="payStatus == '1'" class=" p10 pb250  bg-white">
      <span class="pt150 fs14"> 核心承保中，请您稍后查看</span>
      <div class="pt20 red"> 温馨提示：<br />
-        1.保单承保后，您或被保险人可拨打国富人寿客户服务电话（400-694-6688）、或登陆国富人寿官网（www.e-guofu.com）以及关注官方微信公众号【国富人寿保险】查询、下载电子保单。<br />
-        2.本保险产品提供电子发票。如您需要发票，您可以关注微信公众号【国富人寿保险】自助下载电子发票。<br />
-        3.为保障您的权益，投保成功后广西保险行业协会对您进行短信调研，了解您本次保险消费的相关情况，请您注意查看短信。如您满意，请回复“1”。如有疑问，可拨打国富人寿全国服务热线400-694-6688咨询。<br />
+        1.请关注微信公众号【国富人寿保险】查询、下载电子保单及电子发票。<br />
+        2.为保障您的权益，投保成功后广西保险行业协会对您进行短信调研，请您注意查看短信。如您满意，请回复“1”。<br />
+        如有疑问，可拨打国富人寿全国服务热线400-694-6688咨询。<br />
      </div>
    </div>
    <div v-if="payStatus == '2' || payStatus == '4' || payStatus == '8'" class=" p10 pb250  bg-white">
@@ -78,6 +78,7 @@ export default {
    let isWeixin = this.$utils.device().isWeixin //判断环境
    return {
      isWeixin,
+      orderNo: '',
      // 保融收银台返回的支付流水号
      paySeqNo: '',
      // 接口返回数据前，不做页面渲染
@@ -209,6 +210,10 @@ export default {
    } else {
      this.queryPayState()
    }
+    this.card.orderNo = window.localStorage.getItem('orderNo')
+    let orderDetail = JSON.parse(sessionStorage.orderDetail)
+    this.card.insuredName = orderDetail.insuredDTOs[0].name
+    this.card.cvalidate = orderDetail.insuredDTOs[0].riskDTOLst[0].cvaliDate
  },
  beforeRouteLeave(to, from, next) {
    document.body.style.backgroundColor = ''
--- a/src/views/ebiz/cardList/SignatureConfirmation.vue
+++ b/src/views/ebiz/cardList/SignatureConfirmation.vue
@@ -92,7 +92,7 @@ export default {
      //只有惠桂保团险添加此提示
      if( this.$route.query.isGroupCard == '1' ){
        Dialog.alert({
-          title: '温馨提示',
+          title: '投保提示',
          messageAlign: 'left',
          confirmButtonText: '确认',
          message: `1、您即将进入投保流程，为维护您的合法权益，投保时请您务必仔细阅读和确认保险条款、投保须知、免除保险人责任条款、犹豫期条款等页面所有内容。<br/>2.您的投保过程和操作将被记录。`,
--- a/src/views/ebiz/cardList/information.vue
+++ b/src/views/ebiz/cardList/information.vue
@@ -142,6 +142,29 @@
        placeholder='请选择'
        @click="toSelect('6')"
      />
+      <div class="p15 pl8 fs14" style="border-bottom: 1px solid #eee;display: flex;justify-content: space-between;align-items: center;" v-if="manageComCode == '45'">
+        <van-radio-group v-model="userInfo.isNewPeopleFlag" class="flex">
+          <label>
+            <i class="red">*</i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTipshow = true"/>
+      </div>
+      <van-field
+        v-if="userInfo.isNewPeopleFlag == 1"
+        :value="userInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('appntNpType')"
+      />
      <van-field
        v-model='userInfo.homeName'
        readonly
@@ -299,6 +322,29 @@
        placeholder='请选择'
        @click="toSelect('66')"
      />
+      <div class="p15 pl8 fs14" style="border-bottom: 1px solid #eee;display: flex;justify-content: space-between;align-items: center;" v-if="manageComCode == '45'">
+        <van-radio-group v-model="insuredInfo.isNewPeopleFlag" class="flex">
+          <label>
+            <i class="red">*</i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTipshow = true"/>
+      </div>
+      <van-field
+        v-if="insuredInfo.isNewPeopleFlag == 1"
+        :value="insuredInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('insuredNpType')"
+      />
      <van-field
        v-model='insuredInfo.homeName'
        readonly
@@ -432,6 +478,29 @@
        right-icon='arrow'
        placeholder='请选择'
      />
+      <div class="p15 pl8 fs14" style="border-bottom: 1px solid #eee;display: flex;justify-content: space-between;align-items: center;" v-if="manageComCode == '45'">
+        <van-radio-group v-model="userInfo.isNewPeopleFlag" class="flex">
+          <label>
+            <i class="red">*</i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTipshow = true"/>
+      </div>
+      <van-field
+        v-if="userInfo.isNewPeopleFlag == 1"
+        :value="userInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('appntNpType')"
+      />
      <van-field
        v-model='userInfo.homeName'
        readonly
@@ -467,7 +536,7 @@
      placeholder='请选择'
      @click="toSelect('10')"
    />
-    <van-field v-if="this.itemProductDTOS.productCode === 'GFRS_M0041'||this.itemProductDTOS.productCode === 'GFRS_M0052'||this.itemProductDTOS.productCode === 'GFRS_M0071'" v-model='cvaliDate' readonly label='生效日期' name='生效日期' placeholder='请输入' />
+    <van-field v-if="this.itemProductDTOS.productCode === 'GFRS_M0041'||this.itemProductDTOS.productCode === 'GFRS_M0052'||this.itemProductDTOS.productCode === 'GFRS_M0071'||this.itemProductDTOS.productCode === 'GFRS_M0091'" v-model='cvaliDate' readonly label='生效日期' name='生效日期' placeholder='请输入' />
    <FieldDatePicter
      v-else
      label='指定生效日期'
@@ -526,6 +595,10 @@
         ||this.itemProductDTOS.productCode === 'GFRS_M0052' || this.itemProductDTOS.productCode === 'GFRS_M0062' || this.itemProductDTOS.productCode === 'GFRS_M0063'||this.itemProductDTOS.productCode === 'GFRS_M0064'">
      注：为未成年子女投保的人身保险，在被保险人成年之前，因被保险人身故给付的保险金总和不得超过国务院保险监督管理机构规定的限额，身故给付的保险金额总和的约定也不得超过前述限额。但航空意外死亡保险金额及重大自然灾害意外死亡保险金额不计算在上述规定限额之中。
    </div>
+    <div class='tips'
+         v-if="this.itemProductDTOS.productCode === 'GFRS_M0091'">
+      注：为未成年子女投保的人身保险，在被保险人成年之前，因被保险人身故给付的保险金总和不得超过国务院保险监督管理机构规定的限额，身故给付的保险金额总和的约定也不得超过前述限额。
+    </div>
    <van-goods-action style='z-index: 99'>
      <van-button type='default' style='width: 50%; font-size: 14px; height: 40px; background: white'
      >总保费:<span style='color: red; font-weight: bold; font-size: 18px; font-weight: 400'>{{ allPrice }}</span
@@ -568,6 +641,17 @@
    <van-popup v-model='isScan2' position='bottom'>
      <IdentityCardScan @getScanInfo='getIdentityInfo'></IdentityCardScan>
    </van-popup>
+    <van-dialog v-model="isNewPeopleFlagTipshow" :showConfirmButton="false">
+      <div slot="title">
+        <p style="color: #E9332E;">新市民身份说明</p>
+      </div>
+      <div style="padding: 20px 30px 30px;font-size: 14px;">
+        <div style="line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 30px;">
+        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
+      </div>
+    </van-dialog>
  </div>
 </template>
 <script>
@@ -706,7 +790,9 @@ export default {
        mobile: '', //移动电话
        email: '', //电子邮箱
        schoolName: '',
-        className: ''
+        className: '',
+        isNewPeopleFlag: '', //新市民身份
+        npType: '', //新市民类型
        // effectiveDate: '' //指定生效日期
      },
      //被保人信息
@@ -735,7 +821,9 @@ export default {
        mobile: '', //移动电话
        email: '',//电子邮箱
        schoolName: '',
-        className: ''
+        className: '',
+        isNewPeopleFlag: '', //新市民身份
+        npType: '', //新市民类型
      },
      selectUser: '',
      areaList: areaList,
@@ -767,7 +855,9 @@ export default {
      },
      occupationalType: DataDictionary.queryOccupationalByType[0].id,
      isInsuredCertiexpiredate:true, //被保人有效止期是否显示
-      trialDTOS:[] //产品详情信息
+      trialDTOS:[], //产品详情信息
+      manageComCode: '',
+      isNewPeopleFlagTipshow: false,
    }
  },
  created() {  
@@ -868,7 +958,7 @@ export default {
    }
    //金掌桂无忧卡，少儿安康卡两款卡单产品关闭指定生效日功能，默认自承保之日起第四日零时生效
    //GFRS_M0052 国富人寿少儿安康保险产品组合、GFRS_M0041 国富无忧卡-国富人寿综合意外伤害保险计划
-    if (this.itemProductDTOS.productCode === 'GFRS_M0052' || this.itemProductDTOS.productCode === 'GFRS_M0041' || this.itemProductDTOS.productCode === 'GFRS_M0071') {
+    if (this.itemProductDTOS.productCode === 'GFRS_M0052' || this.itemProductDTOS.productCode === 'GFRS_M0041' || this.itemProductDTOS.productCode === 'GFRS_M0071'|| this.itemProductDTOS.productCode === 'GFRS_M0091') {
      this.cvaliDate = dateUtils.formatDate(afterDate.getAfterDays(Number(this.trialList[0].timeliness)), 'yyyy-MM-dd')
      //保险期间计算逻辑
      let val = this.cvaliDate
@@ -905,7 +995,9 @@ export default {
    }
    this.userInfo.homeName = getAreaName([{ code: 450000 }, { code: 450100 }, { code: 450101 }]) //家庭地址
  },
-  mounted() {
+  async mounted() {
+    let dataReturn = await riskRules.getAgentInfoFunc(this)
+    this.manageComCode = dataReturn.manageComCode
    // 2516--除万福卡，投保人、被保险人年收入，默认为0，允许修改
    if (this.itemProductDTOS.productCode != 'GFRS_M0032') {
      this.userInfo.averageAnnualIncome = '0'
@@ -941,7 +1033,6 @@ export default {
    }
  },
  methods: {
-     //试算逻辑国富万福卡GFRS_M0071
    insureTrial() {
      // if(this.insuredInfo.birthday || that.$route.query.relationToAppnt == '1'){
      if (this.userInfo.relationToInsured == 1) {
@@ -1039,9 +1130,11 @@ export default {
      let { code, name, healthGrade, lifeGrade } = data
      //校验主合同被保险人寿险职业等级
      //投保同人时，验证投保人职业，投被不同人时验证被保人职业
-      if(!(this.userInfo.relationToInsured != 1 && this.insureType === '1')){
-        if (riskRules.lifeGradeLimitCard(this.trialDTOS, this, lifeGrade)) {
-          return
+      if(this.itemProductDTOS.productCode != 'GFRS_M0091') {
+        if(!(this.userInfo.relationToInsured != 1 && this.insureType === '1')){
+          if (riskRules.lifeGradeLimitCard(this.trialDTOS, this, lifeGrade)) {
+            return
+          }
        }
      }
      
@@ -1058,10 +1151,14 @@ export default {
        this.userInfo.occupationName = name
        this.userInfo.occupationCode = code
        this.userInfo.occupationType = lifeGrade
+        this.userInfo.lifeGrade = lifeGrade
+        this.userInfo.healthGrade = healthGrade
      } else if (this.insureType === '2') {
        this.insuredInfo.occupationName = name
        this.insuredInfo.occupationCode = code
        this.insuredInfo.occupationType = lifeGrade
+        this.insuredInfo.lifeGrade = lifeGrade
+        this.insuredInfo.healthGrade = healthGrade
      }
    },
    /**
@@ -1327,7 +1424,12 @@ export default {
        } else {
          this.columns = DataDictionary.idType
        }
+      } else if(pickerType == 'appntNpType') {
+        this.columns = DataDictionary.npType
+      } else if(pickerType == 'insuredNpType') {
+        this.columns = DataDictionary.npType
      }
+
    },
    //确认选择字段
    onConfirm(value) {
@@ -1425,6 +1527,10 @@ export default {
          this.isInsuredCertiexpiredate = true
        }
        this.insuredInfo.idType = value.id
+      } else if (this.pickerType === 'appntNpType') {
+        this.userInfo.npType = value.id
+      } else if (this.pickerType === 'insuredNpType') {
+        this.insuredInfo.npType = value.id
      }
    },
    //证件起始截止日期
@@ -1664,9 +1770,13 @@ export default {
        let age = utilsAge.getAge(this.userInfo.birthday, new Date())
        // 长期按钮是否禁用
        this.effectiveDateTypeAble = age <= 45
+        this.userInfo.isNewPeopleFlag = data.isNewPeopleFlag //新市民身份
+        this.userInfo.npType = data.npType //新市民类型
        this.getRelatedData(this.userInfo.idNo, '1')
      } else if (this.selectUser == '1') {
-        let { customerName, customerSex } = data
+        let { customerName, customerSex, isNewPeopleFlag, npType } = data
+        this.insuredInfo.isNewPeopleFlag = isNewPeopleFlag //新市民身份
+        this.insuredInfo.npType = npType //新市民类型
        this.insuredInfo.name = customerName //用户名
        this.insuredInfo.sex = customerSex ? customerSex.toString() : '0' //性别
        this.insuredInfo.birthday = data.birthday //出生日期
@@ -1689,7 +1799,8 @@ export default {
          this.insuredInfo.certiexpiredate = '9999-12-31'
          this.effectiveDateTypeAbleInsured = true
          this.isInsuredCertiexpiredate = false
-        }else{
+        }
+        else{
          this.isInsuredCertiexpiredate = true
          // 因为学平险产品 和 少儿卡单 被保人证件类型只有身份证和户口本 所以回显被保人信息时 如果不是身份证和户口本 就隐藏被保人证件类型
          if ((this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050' 
@@ -1732,6 +1843,7 @@ export default {
        this.insuredInfo.lifeGrade = data.lifeGrade
        this.insuredInfo.occupationType = data.lifeGrade
        this.insuredInfo.healthGrade = data.healthGrade
+
        //除万福卡，投保人、被保险人年收入填写项去掉，默认为0，卡产品不满足反洗钱识别线
        this.insuredInfo.averageAnnualIncome = this.itemProductDTOS.productCode == 'GFRS_M0032' ? data.averageYearlyIncome : '0' //平均年收入
        //2516--三个学平险--被保险人婚姻默认未婚，允许修改
@@ -1760,9 +1872,12 @@ export default {
      // console.log(data, val)
    },
    nextStep() {
-      // console.log(this.userInfo.idType)
-      // console.log(this.userInfo.salarySource)
-      // console.log(this.userInfo.otherSalarySource)
+      if (this.manageComCode == '45' && (this.userInfo.isNewPeopleFlag == '' || this.userInfo.isNewPeopleFlag == null || this.userInfo.isNewPeopleFlag == undefined)) {
+        return this.$toast('投保人新市民身份不能为空')
+      }
+      if(this.manageComCode == '45' && this.userInfo.isNewPeopleFlag != '0' && !this.userInfo.npType) {
+        return this.$toast('投保人新市民类型不能为空')
+      }
      //表单校验, 成功跳转
      if (this.userInfo.relationToInsured == 1) {
        Object.assign(this.insuredInfo, this.userInfo)
@@ -1807,6 +1922,12 @@ export default {
          if (this.userInfo.relationToInsured == 2 && this.userInfo.sex == this.insuredInfo.sex) {
            return this.$toast('哦~配偶性别不能相同的哟~')
          }
+          if (this.manageComCode == '45' && (this.insuredInfo.isNewPeopleFlag == '' || this.insuredInfo.isNewPeopleFlag == null || this.insuredInfo.isNewPeopleFlag == undefined)) {
+            return this.$toast('被保人新市民身份不能为空')
+          }
+          if (this.manageComCode == '45' && this.insuredInfo.isNewPeopleFlag != '0' && !this.insuredInfo.npType) {
+            return this.$toast('被保人新市民类型不能为空')
+          }

          let age = utilsAge.getAge(this.userInfo.birthday, new Date())
          console.log('计算年龄', age)
@@ -1891,7 +2012,8 @@ export default {
              }
            }
          //如果证件类型是户口本
-          }else if(this.userInfo.idType == '2'){
+          }
+          else if(this.userInfo.idType == '2'){
            if (this.userInfo.nativeplace != '1') {
              return this.$toast('证件类型”为“身份证，国籍必须为中国哦')
            }
@@ -1942,7 +2064,7 @@ export default {
            //   return this.$toast('户口本的证件号码长度应等于18位')
            // }
          }
-          let insuredAge = utilsAge.getAge(this.insuredInfo.birthday, new Date())
+          let insuredAge = utilsAge.getAge(this.insuredInfo.birthday, new Date(this.cvaliDate))
          console.log('计算年龄', insuredAge)
          //如果证件类型是身份证或户口本
          if (this.insuredInfo.idType == '1') {
@@ -2019,7 +2141,8 @@ export default {
                return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年')
              }
            }
-          }else if (this.insuredInfo.idType == '2'){
+          }
+          else if (this.insuredInfo.idType == '2'){
            if (this.insuredInfo.nativeplace != '1') {
              return this.$toast('证件类型”为“身份证，国籍必须为中国哦')
            }
@@ -2069,7 +2192,8 @@ export default {
            // else if (this.insuredInfo.idNo.length != 18) {
            //   return this.$toast('户口本的证件号码长度应等于18位')
            // }
-          }else if (this.insuredInfo.idType == '3'){
+          }
+          else if (this.insuredInfo.idType == '3'){
            if (insuredAge >= 2) {
              return this.$toast('客户年龄在2周岁及以上，不能使用出生证作为有效证件')
            }
@@ -2092,7 +2216,8 @@ export default {
            if (insuredAge < 0) {
              return this.$toast('被保险人的年龄需要大于28天')
            }
-          } else if (this.itemProductDTOS.productCode === 'GFRS_M0041') {
+          }
+          else if (this.itemProductDTOS.productCode === 'GFRS_M0041') {
            console.log(this.proSchemeCode)
            if (this.proSchemeCode == '00000227') {
              if (insuredAge < 18) {
@@ -2120,35 +2245,21 @@ export default {
              return this.$toast('被保险人的年龄不可以超过65周岁')
            }
          }
-
-          //投保人需大于等于 18 周岁
-          // if (age < 18) {
-          //   return this.$toast('投保人必须是具有民事行为能力且有固定职业和收入的自然人，请确定')
-          // }
-
-          let insuredInfoAge = utilsAge.getAge(this.insuredInfo.birthday, new Date())
-          // if (this.itemProductDTOS.productCode === 'GFRS_M0049') {
-          //   //幼儿园：2岁≤被保险人≤7岁
-          //   if (insuredInfoAge < 2 || insuredInfoAge > 7) {
-          //     return this.$toast('被保险人年龄应为2岁-7岁，请重新选择。')
-          //   }
-          // } else if (this.itemProductDTOS.productCode === 'GFRS_M0048') {
-          //   //义务教育：5岁≤被保险人≤18岁
-          //   if (insuredInfoAge < 5 || insuredInfoAge > 18) {
-          //     return this.$toast('被保险人年龄应为5岁-18岁，请重新选择。')
-          //   }
-          // } else if (this.itemProductDTOS.productCode === 'GFRS_M0050') {
-          //   //高中及高等教育：15岁≤被保险人≤40岁
-          //   if (insuredInfoAge < 15 || insuredInfoAge > 40) {
-          //     return this.$toast('被保险人年龄应为15岁-40岁，请重新选择。')
-          //   }
-          // } else if (this.itemProductDTOS.productCode === 'GFRS_M0052') {
-          //   //GFRS-2641--少儿安康：17岁≤被保险人
-          //   if (insuredInfoAge > 17) {
-          //     return this.$toast('被保险人年龄应为0岁-17岁，请重新选择。')
-          //   }
-          // }
-
+          else if (this.itemProductDTOS.productCode === 'GFRS_M0091') {
+            console.log(this.proSchemeCode)
+            if (this.proSchemeCode == '06860438-B') {
+              if (insuredAge < 10) {
+                return this.$toast('被保险人的年龄需要大于10岁')
+              }
+            }
+            if (insuredAge < 0) {
+              return this.$toast('被保险人的年龄需要大于28天')
+            }
+            if (insuredAge > 65) {
+              return this.$toast('被保险人的年龄不可以超过65周岁')
+            }
+          }
+          let insuredInfoAge = utilsAge.getAge(this.insuredInfo.birthday, new Date(this.cvaliDate))
          if(this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050' 
          || this.itemProductDTOS.productCode == 'GFRS_M0052' ||this.itemProductDTOS.productCode === 'GFRS_M0062' || this.itemProductDTOS.productCode === 'GFRS_M0063' 
          || this.itemProductDTOS.productCode === 'GFRS_M0064'){
@@ -2267,6 +2378,27 @@ export default {
              this.insuredInfo.homeArea = '500243'
              break
          }
+          console.log(this.insuredInfo,'this.insuredInfo')
+          if(this.itemProductDTOS.productCode === 'GFRS_M0091'){
+            if(this.proSchemeCode == '06860438-A') {
+              if (Number(this.insuredInfo.lifeGrade) > 3) {
+                this.$toast('寿险职业等级不适合此款险种，请选择其他险种！')
+                return
+              }
+            }
+            if(this.proSchemeCode == '06860438-B') {
+              if (Number(this.insuredInfo.lifeGrade) > 4) {
+                this.$toast('寿险职业等级不适合此款险种，请选择其他险种！')
+                return
+              }
+            }
+            if(!this.proSchemeCode) {
+              if (Number(this.insuredInfo.lifeGrade) > 4) {
+                this.$toast('寿险职业等级不适合此款险种，请选择其他险种！')
+                return
+              }
+            }
+          }
          this.infoUpdate()
          // console.log('success')
        } else {
@@ -2412,6 +2544,9 @@ export default {
        return
      }
      params.orderDTO.insuredDTOs[0].riskDTOLst = riskDTOLst
+      if(params.orderDTO.insuredDTOs[0].occupationCode == '2099907') {
+        params.orderDTO.insuredDTOs[0].occupationType = '1'
+      }

      let resultData = await saveOrUpdateCard(params)
      if (resultData.result == 0) {
@@ -2595,7 +2730,9 @@ export default {
            homeAddress: '', //详细地址
            mobile: '', //移动电话
            email: '', //电子邮箱
-            effectiveDateType: false //是否长期
+            effectiveDateType: false, //是否长期
+            isNewPeopleFlag: '', //新市民身份
+            npType: '', //新市民类型
          }
          // 设置选中‘同投保人’的勾选项
          this.withRootUser.value = true
@@ -2718,7 +2855,7 @@ export default {
    //被保人职业变化时，重新调用试算接口
    'insuredInfo.occupationName': {
      handler(newV) {
-        if (newV && this.itemProductDTOS.productCode === 'GFRS_M0071') {
+        if (newV && (this.itemProductDTOS.productCode === 'GFRS_M0071' || this.itemProductDTOS.productCode === 'GFRS_M0091')) {
          this.insureTrial()
        }
      },
@@ -2728,8 +2865,7 @@ export default {
    //投被同人时，投保人职业变化时，重新调用试算接口
    'userInfo.occupationName': {
      handler(newV) {
-        // if (newV && this.itemProductDTOS.productCode === 'GFRS_M0071'&& this.userInfo.relationToInsured == 1) {
-        if (newV && this.itemProductDTOS.productCode === 'GFRS_M0071') {
+        if (newV && (this.itemProductDTOS.productCode === 'GFRS_M0071' || this.itemProductDTOS.productCode === 'GFRS_M0091')) {
          this.insureTrial()
        }
      },
--- a/src/views/ebiz/cardList/productDetails.vue
+++ b/src/views/ebiz/cardList/productDetails.vue
@@ -90,7 +90,7 @@ export default {
    gotoInformation() {         
      if(this.productType != '7'){  //7代表是团险 10卡单
        Dialog.confirm({
-          title: '温馨提示',
+          title: '投保提示',
          messageAlign: 'left',
          confirmButtonColor: '#ee0a24',
          confirmButtonText: '立即投保',
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -110,7 +110,8 @@
                      item.productCode == 'GFRS_M0051' ||
                      item.productCode == 'GFRS_M0054' ||
                      item.productCode == 'GFRS_M0073' ||
-                      item.productCode == 'GFRS_M0057'
+                      item.productCode == 'GFRS_M0057' ||
+                      item.productCode == 'GFRS_M0086'
                    )
                  "
                        class="fs14 w100"
@@ -128,7 +129,8 @@
                        item.productCode == 'GFRS_M0051' ||
                        item.productCode == 'GFRS_M0054' ||
                        item.productCode == 'GFRS_M0073' ||
-                        item.productCode == 'GFRS_M0057'
+                        item.productCode == 'GFRS_M0057' ||
+                        item.productCode == 'GFRS_M0086'
                      )
                    "
                          v-model="dutyItem.defaultDutyAmt"
@@ -136,7 +138,7 @@
                          :max="dutyItem.maxDutyAmt"
                          :show-plus="false"
                          :show-minus="false"
-                          :disabled="item.productCode == 'GFRS_A0012' || (item.productCode == 'GFRS_M0077' && !dutyItem.necess) || (item.productCode == 'GFRS_M0077' && dutyItem.duty == '311507')"
+                          :disabled="item.productCode == 'GFRS_M0088' || item.productCode == 'GFRS_A0012' || (item.productCode == 'GFRS_M0077' && !dutyItem.necess) || (item.productCode == 'GFRS_M0077' && dutyItem.duty == '311507')"
                          class="ml10 mr10"
                          @focus="focusStep"
                          @blur="blurStep(dutyItem, index,item.productCode)"
@@ -798,7 +800,6 @@
              }
            })
          }
-          console.log(item,'123231321321')
          let payEndYearVal
          //初始化时交费期间为一次性交清时，在就是中介渠道, 附加险GFRS_A0007，GFRS_A0009，GFRS_A0010去掉后，附加险list就为空--隐藏’附‘icon
          item.calFactorLst.map((i) => {
@@ -871,7 +872,6 @@
          //初始化数据试算
          this.getTrial()
        })
-        console.log(this.trialList, '')
        // 判断是否 含有 后台配置js验证函数
        if (localStorage.ruleExpression) {
          let ruleExpression = JSON.parse(localStorage.ruleExpression)
@@ -918,7 +918,7 @@
        let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo })
        this.chooseProducts.map((item) => {
          if (
-                  !(item.mainRiskCode === 'GFRS_M0016' ||item.mainRiskCode === 'GFRS_M0070' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0008' || item.productCode === 'GFRS_A0005')
+                  !(item.mainRiskCode === 'GFRS_M0016' ||item.mainRiskCode === 'GFRS_M0070' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0008' || item.productCode === 'GFRS_A0005' || item.productCode === 'GFRS_M0088')
          ) {
            //其他产品删掉两个字段
            let calFactorLst = item.calFactorLst
@@ -1053,6 +1053,34 @@
        // let productCode = this.chooseProducts[this.productIndex].productCode
        let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
        let currentEle = currentFactor[this.calFactorIndex]
+        console.log(currentEle.code)
+        if(currentEle.code == 'insuYear'){
+          if(value.value == '70') {
+            this.chooseProducts.forEach((item, index) => {
+              if (item.mainRiskCode == 'GFRS_M0086') {
+                item.calFactorLst.forEach((i) => {
+                  if (i.code == "inputAmt") {
+                    i.minPrem = 20
+                    i.displayAmount = 20
+                    i.defaultValue = 20
+                  }
+                })
+              }
+            })
+          } else if(value.value == '106') {
+            this.chooseProducts.forEach((item, index) => {
+              if (item.mainRiskCode == 'GFRS_M0086') {
+                item.calFactorLst.forEach((i) => {
+                  if (i.code == "inputAmt") {
+                    i.minPrem = 10
+                    i.displayAmount = 10
+                    i.defaultValue = 10
+                  }
+                })
+              }
+            })
+          }
+        }
        // let sex = this.saleInsuredPersonInfo.sex //0男 1女

        // //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1
@@ -1215,6 +1243,30 @@
            })
          }
        }
+        if (validateRiskCode === 'GFRS_M0088'){
+          if(dutyItem.duty == '411200' || dutyItem.duty == '411206' || dutyItem.duty == '411207'){
+            this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules.forEach((i) => {
+              if(i.duty == '411200' || i.duty == '411206' || i.duty == '411207'){
+                i.necess = dutyItem.necess
+              } else {
+                if(dutyItem.necess){
+                  i.necess = !dutyItem.necess
+                }
+              }
+            })
+          }
+          if(dutyItem.duty == '411200_GBC' || dutyItem.duty == '411206_GBC' || dutyItem.duty == '411207_GBC'){
+            this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules.forEach((i) => {
+              if(i.duty == '411200_GBC' || i.duty == '411206_GBC' || i.duty == '411207_GBC'){
+                i.necess = dutyItem.necess
+              } else {
+                if(dutyItem.necess){
+                  i.necess = !dutyItem.necess
+                }
+              }
+            })
+          }
+        }
        this.valiAndSend(dutyItem, productIndex)
      },
      valiAndSend(dutyItem, productIndex) {
@@ -1289,7 +1341,6 @@
          const rule = dutdutyGFRS_M0070RulesyRules[duty]
          const mutiple = rule.mutiple || DUTY_DEFAULT_MIN
          const min = rule.min || DUTY_DEFAULT_MIN
-          console.log(rule.min,'rule.min')
          if (!value || value < min || value % mutiple !== 0) {
            this.$toast(rule.msg)
            this.nextStepFlag = true
@@ -1565,7 +1616,6 @@
      },
      trialBeforeRule() {
        let that = this
-        console.log('走试算前规则')
        // 针对于国富人寿附加两全保险附加险(GFRS_A0011),缴费期间期间要等于主险的缴费期间
        let mainRiskInfo = this.getMainRiskInfo()
        this.chooseProducts.forEach((item) => {
@@ -2492,10 +2542,6 @@
        }
        else if (productCode == 'GFRS_M0035' || productCode == 'GFRS_M0044'
                || productCode == 'GFRS_M0056' || productCode == 'GFRS_M0057' || productCode == 'GFRS_M0060') {
-          console.log('defalutValue==', defalutValue)
-          console.log("currentEle['amt']==", currentEle['amt'])
-          console.log('riskFactor.rules', riskFactor.rules)
-          console.log('this.saleInsuredPersonInfo.insuredAge ', this.saleInsuredPersonInfo.insuredAge)
          //被保险人年龄如果在50-65区间
          if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
            //使用rules规则里的第二条控制保额份数
@@ -2715,6 +2761,21 @@
            }
          }
        }
+        else if (productCode == 'GFRS_M0087') {
+          if(this.saleInsuredPersonInfo.insuredAge>=18 && this.saleInsuredPersonInfo.insuredAge <= 40) {
+            currentEle['maxAmt'] = 70
+          }
+          else if(this.saleInsuredPersonInfo.insuredAge>=41 && this.saleInsuredPersonInfo.insuredAge <= 45) {
+            currentEle['maxAmt'] = 50
+          }
+          else if(this.saleInsuredPersonInfo.insuredAge>=46 && this.saleInsuredPersonInfo.insuredAge <= 50) {
+            currentEle['maxAmt'] = 40
+          }
+          else if(this.saleInsuredPersonInfo.insuredAge>=51 && this.saleInsuredPersonInfo.insuredAge <= 60) {
+            currentEle['maxAmt'] = 30
+          }
+          this.getTrial()
+        }
        else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') {
          if (Number(defalutValue) < Number(min)) {
            if (riskFactor.yearWay == "一次性交清") {
@@ -2769,9 +2830,6 @@
            }
          }
        }
-        // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex]
-        // defalutValue = value
-        console.log('进来几次')
        this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue))
      },
      //下一步
@@ -2875,7 +2933,8 @@
                      this.trialList[index].productCode == 'GFRS_M0054' ||
                      this.trialList[index].productCode == 'GFRS_M0073' ||
                      this.trialList[index].productCode == 'GFRS_M0077' ||
-                      this.trialList[index].productCode == 'GFRS_M0057'
+                      this.trialList[index].productCode == 'GFRS_M0057' ||
+                      this.trialList[index].productCode == 'GFRS_M0086'
              ) {
                riskItem['dutyLst'] = this.trialInfos[index].duty
              }
@@ -2925,8 +2984,6 @@
                }
              }
            }
-
-            // console.log(riskItem)
            riskItem = Object.assign(riskItem, this.trialInfos[index])
            riskDTOLst.push(riskItem)
          }
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -52,7 +52,7 @@
 <script>
 import { Cell, CellGroup, Tag, Radio, RadioGroup,Tab,Tabs} from 'vant'
 import { mainRiskList,mainRiskListProposal,calculatePremium,getActProductList } from '@/api/ebiz/common/common'
-import { getOrderDetail } from '@/api/ebiz/sale/sale'
+import { getOrderDetail, riskLevelCheck } from '@/api/ebiz/sale/sale'
 import { getDetail } from '@/api/ebiz/proposal/proposal.js'
 import riskRules from './risk-rules'
 export default {
@@ -70,7 +70,7 @@ export default {
    return {
      recommendType: '',   // 渠道控制
      isCrossChannel: 0,   // 是否选择交叉渠道列表 0-否 1-是
-      active: 2,
+      active: 'normal',
      specilFlag: '0',
      flag: true,
      list: [],
@@ -105,8 +105,6 @@ export default {
              } else if (res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0024' || res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0040') {
                this.specilFlag = '1'
              }
-              // 处理活动产品
-              // this.activeFlag = res.orderDTO.orderInfoDTO.activeType
              //isActivityCode 有值代表是活动，无值代表是普通产品
              this.isActivityCode = res.orderDTO.orderInfoDTO.activityCode
              // recommendType 03 银保渠道
@@ -145,26 +143,6 @@ export default {
    }
  },
  methods: {
-    // checkItemShow(item) {
-    //   if (this.activeFlag != 'KMH' && this.activeFlag != 'SQY') {
-    //     return true
-    //   }
-    //   let showFlag = false
-    //   if (item.activeLst && item.activeLst.length > 0) {
-    //     item.activeLst.forEach(subItem => {
-    //       if (this.activeFlag && this.activeFlag == 'KMH') {
-    //         if (subItem == 'KMH') {
-    //           showFlag = true;
-    //         }
-    //       }else if (this.activeFlag && this.activeFlag == 'SQY') {
-    //         if (subItem == 'SQY') {
-    //           showFlag = true;
-    //         }
-    //       }
-    //     })
-    //   }
-    //   return showFlag
-    // },
    onChangeMainList(name){
      if (name == 'cross') {
        this.isCrossChannel = '1';
@@ -224,24 +202,25 @@ export default {
        }
        
        if (this.list.length == 0) {
-          this.$dialog({ message: '暂无可选产品!' }).then(() => {
-            let thismyurl = ''
-            if (this.$route.query.orderNo) {
-              thismyurl = '?orderNo=' + this.$route.query.orderNo
-            } else if (this.$route.query.proposalOrderNo) {
-              thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
-            }
-            this.$jump({
-              flag: 'goBack',
-              // extra: {
-              //   url: location.origin + '/#/common/selectedProduct'
-              // },
-              routerInfo: {
-                type: 1,
-                path: '/common/selectedProduct' + thismyurl
-              }
-            })
-          })
+          this.$route('暂无可选产品')
+          // this.$dialog({ message: '暂无可选产品!' }).then(() => {
+          //   let thismyurl = ''
+          //   if (this.$route.query.orderNo) {
+          //     thismyurl = '?orderNo=' + this.$route.query.orderNo
+          //   } else if (this.$route.query.proposalOrderNo) {
+          //     thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+          //   }
+          //   this.$jump({
+          //     flag: 'goBack',
+          //     // extra: {
+          //     //   url: location.origin + '/#/common/selectedProduct'
+          //     // },
+          //     routerInfo: {
+          //       type: 1,
+          //       path: '/common/selectedProduct' + thismyurl
+          //     }
+          //   })
+          // })
        }
      }
    },
@@ -300,40 +279,63 @@ export default {
        }

        if (this.list.length == 0) {
-          this.$dialog({ message: '暂无可选产品!' }).then(() => {
-            let thismyurl = ''
-            if (this.$route.query.orderNo) {
-              thismyurl = '?orderNo=' + this.$route.query.orderNo
-            } else if (this.$route.query.proposalOrderNo) {
-              thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
-            }
-            this.$jump({
-              flag: 'goBack',
-              // extra: {
-              //   url: location.origin + '/#/common/selectedProduct'
-              // },
-              routerInfo: {
-                type: 1,
-                path: '/common/selectedProduct' + thismyurl
-              }
-            })
-          })
+          this.$route('暂无可选产品')
+          // this.$dialog({ message: '暂无可选产品!' }).then(() => {
+          //   let thismyurl = ''
+          //   if (this.$route.query.orderNo) {
+          //     thismyurl = '?orderNo=' + this.$route.query.orderNo
+          //   } else if (this.$route.query.proposalOrderNo) {
+          //     thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+          //   }
+          //   this.$jump({
+          //     flag: 'goBack',
+          //     // extra: {
+          //     //   url: location.origin + '/#/common/selectedProduct'
+          //     // },
+          //     routerInfo: {
+          //       type: 1,
+          //       path: '/common/selectedProduct' + thismyurl
+          //     }
+          //   })
+          // })
        }
      }
    },

    //下一步
    nextStep() {
-      console.log(this.result)
      if (!this.result) {
        this.$toast('请选择产品')
        return
      }
-      //置空产品
-      localStorage.chooseProducts = ''
-
-      //添加主险
-      this.addMainRisk()
+      if(localStorage.getItem('isFrom') == 'sale') {
+        let params = {
+          productCode: this.result.riskProductCode,
+          orderNo: this.$route.query.orderNo,
+        }
+        if(this.recommendType == '03' && !this.isActivityCode) {
+          params.productChannl = this.isCrossChannel
+        }
+        riskLevelCheck(params).then(res => {
+          if(res.result == 0) {
+            if(res.saLevelMatch == "Y"){
+              //置空产品
+              localStorage.chooseProducts = ''
+              //添加主险
+              this.addMainRisk()
+            } else {
+              this.$toast(res.resultMessage)
+            }
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+      } else {
+        //置空产品
+        localStorage.chooseProducts = ''
+        //添加主险
+        this.addMainRisk()
+      }
    },
    //储存主险
    async addMainRisk() {
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -750,6 +750,10 @@
        if (this.chooseProducts.length == 0) {
          return this.$toast('请添加产品')
        }
+        if(!this.isElecCont && localStorage.isFrom == 'sale') {
+          this.$toast('请选择保单形式')
+          return false
+        }
        //重新校验该产品是否需要为协同单位
        let flagCompany = await riskRules.checkCompany(this.chooseProducts[0].riskCode, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).workcompany,  JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).isAsync,this)
        if (flagCompany && localStorage.isFrom != 'proposal') {
@@ -817,6 +821,32 @@
              }
            }
          }
+          if(this.manageComCode == '45') {
+            console.log(this.chooseProducts)
+            if(this.appntDTO.age >= 60) {
+              this.chooseProducts.map(item => {
+                if (item.insuYearFlag == 'A' || (item.insuYearFlag == 'Y' && item.insuYear != '1')) {
+                  showFlag = true
+                  return true
+                }
+              })
+              if(!showFlag){
+                let doubleRecordRes = await getDoubleRecordProductLst({})
+                if(doubleRecordRes.result == 0){
+                  if(doubleRecordRes.content && doubleRecordRes.content.length != 0){
+                    doubleRecordRes.content.forEach(items=>{
+                      this.chooseProducts.map(item => {
+                        if (item.riskCode == items ) {
+                          showFlag = true
+                          return true
+                        }
+                      })
+                    })
+                  }
+                }
+              }
+            }
+          }
          if (showFlag) {
            this.thisdoubledialogshow = true
          } else {
@@ -961,35 +991,6 @@
          }
        })
      },
-      async showTipForDoubleRecord() {
-        //判断投保人年龄是否大于等于60岁
-        let showFlag = false
-        let age = this.appntDTO.birthday?utilsAge.getAge(this.appntDTO.birthday, new Date()):this.appntDTO.age
-        if (this.manageComCode == '52') {
-          this.chooseProducts.map(item => {
-            if (item.insuYearFlag == 'A' || (item.insuYearFlag == 'Y' && item.insuYear != '1')) {
-              showFlag = true
-              return true
-            }
-          })
-        }
-        if(showFlag){
-          let doubleRecordRes = await getDoubleRecordProductLst({})
-          if(doubleRecordRes.result == 0){
-            if(doubleRecordRes.content && doubleRecordRes.content.length != 0){
-              doubleRecordRes.content.forEach(items=>{
-                this.chooseProducts.map(item => {
-                  if (item.riskCode == items ) {
-                    showFlag = true
-                    return true
-                  }
-                })
-              })
-            }
-          }
-        }
-        return showFlag
-      },
      nextPageShow() {
        let thismyurl = ''
        if (this.$route.query.orderNo) {
@@ -1001,47 +1002,30 @@
        localStorage.fromAddBeneficiaryInfo = ''
        localStorage.removeItem('applicant')
        if(this.isFrom == 'sale') {
-          if(!this.isElecCont) {
-            this.$toast('请选择保单形式')
-            return false
+          let params = {
+            orderNO: this.$route.query.orderNo,
+            isElecCont: this.isElecCont
          }
-          else {
-            let params = {
-              orderNO: this.$route.query.orderNo,
-              isElecCont: this.isElecCont
+          if(this.isElecCont == '1') {
+            params.isElecCont = '0'
+          }
+          saveOrderType(params).then(res => {
+            if(res.result == 0) {
+              this.$jump({
+                flag: 'h5',
+                extra: {
+                  forbidSwipeBack: '1',
+                  url: location.origin + '/#' + thismyurl,
+                  needRefresh: '1'
+                },
+                routerInfo: {
+                  path: thismyurl
+                }
+              })
+            } else {
+              this.$toast(res.resultMessage)
            }
-              if(this.isElecCont == '1') {
-                params.isElecCont = '0'
-              }
-            saveOrderType(params).then(res => {
-              if(res.result == 0) {
-                this.$jump({
-                  flag: 'h5',
-                  extra: {
-                    forbidSwipeBack: '1',
-                    url: location.origin + '/#' + thismyurl,
-                    needRefresh: '1'
-                  },
-                  routerInfo: {
-                    path: thismyurl
-                  }
-                })
-              } else {
-                this.$toast(res.resultMessage)
-              }
-            })
-          //   this.$jump({
-          //     flag: 'h5',
-          //     extra: {
-          //       forbidSwipeBack: '1',
-          //       url: location.origin + '/#' + thismyurl,
-          //       needRefresh: '1'
-          //     },
-          //     routerInfo: {
-          //       path: thismyurl
-          //     }
-          //   })
-          }
+          })
        } else {
          this.$jump({
            flag: 'h5',
--- a/src/views/ebiz/proposal/Appnt.vue
+++ b/src/views/ebiz/proposal/Appnt.vue
@@ -310,10 +310,10 @@ export default {
      if(this.appntDTO.name == name){
        this.appntDTO.name = ''
      }
-      let ageRule = /^[a-zA-Z0-9\.\s\u4e00-\u9fa5]{2,120}$/
-      if (this.appntDTO.name && !ageRule.test(this.appntDTO.name)) {
-        return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
-      }
+      // let ageRule = /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/
+      // if (this.appntDTO.name && !ageRule.test(this.appntDTO.name)) {
+      //   return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字或者英文')
+      // }
      this.appntDTO.age = String(this.appntDTO.age)
      this.$validator.validate().then(valid => {
        if (true === valid) {
--- a/src/views/ebiz/proposal/InsuredPerson.vue
+++ b/src/views/ebiz/proposal/InsuredPerson.vue
@@ -339,10 +339,10 @@ export default {
      let localSex = this.insured.sex
      let relation = this.localInfo.relationToAppnt
      let resultSex = checkSex(cacheSex, localSex, relation)
-      let ageRule = /^[a-zA-Z0-9\.\s\u4e00-\u9fa5]{2,120}$/
-      if (this.insured.name && !ageRule.test(this.insured.name)) {
-        return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
-      }
+      // let ageRule = /^[a-zA-Z0-9\.\s\u4e00-\u9fa5]{2,120}$/
+      // if (this.insured.name && !ageRule.test(this.insured.name)) {
+      //   return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
+      // }
      if (!resultSex) {
        return Toast.fail('被保险人性别有误')
      }
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -1487,26 +1487,10 @@
          this.$CacheUtils.setLocItem('orderNo', resultData.orderNo)
          // localStorage.insuredDetail = JSON.stringify(this.userInfo)
          // 添加提示
-          let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-          if (age >= 60 && this.manageComCode == '45') {
-            this.thisdoubledialogshow = true
-            // this.$dialog
-            //         .alert({
-            //           message: '根据监管要求，本单需要您配合对销售过程进行录音录像！',
-            //           confirmButtonColor: '#000000',
-            //         })
-            //         .then(() => {
-            //           this.$jump({
-            //             flag: 'h5',
-            //             extra: {
-            //               url: location.origin + `/#/sale/insuredPerson?${str}` + '&orderNo=' + resultData.orderNo,
-            //             },
-            //             routerInfo: {
-            //               path: `/sale/insuredPerson?${str}` + '&orderNo=' + resultData.orderNo,
-            //             },
-            //           })
-            //         })
-          } else {
+          // let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+          // if (age >= 60 && this.manageComCode == '45') {
+          //   this.thisdoubledialogshow = true
+          // } else {
            this.$jump({
              flag: 'h5',
              extra: {
@@ -1516,7 +1500,7 @@
                path: `/sale/insuredPerson?${this.thismystr}` + '&orderNo=' + this.thismyorderNo,
              },
            })
-          }
+          // }
        } else {
          this.$toast(resultData.resultMessage)
        }
Author	SHA1	Message	Date
种岩宁	f085152e7e	项目数据统计新增字段--承保保费+1	2024-06-03 10:52:42 +08:00
种岩宁	64677c7046	项目数据统计新增字段--承保保费	2024-06-03 10:28:13 +08:00
liu.xiaofeng@ebiz-digits.com	d5ccffba9f	项目成员分配以及项目数据统计增加条件判断	2024-05-26 16:15:42 +08:00
liu.xiaofeng@ebiz-digits.com	169831792c	数据看板接口对接	2024-05-25 17:09:43 +08:00
liu.xiaofeng@ebiz-digits.com	6975dbd2a4	选择产品页面提交页面增加判断	2024-05-09 10:03:06 +08:00
liu.xiaofeng@ebiz-digits.com	0d07f33c20	双录改动	2024-05-08 22:48:51 +08:00
liu.xiaofeng@ebiz-digits.com	b4cdafbd9b	双录调整	2024-05-08 22:48:45 +08:00
liu.xiaofeng@ebiz-digits.com	88ade7e51c	广西壮族自治区农村信用社联合社需要改为广西农村商业联合银行股份有限公司	2024-04-28 14:59:03 +08:00
liu.xiaofeng@ebiz-digits.com	e5d01e1fe1	银保渠道调用产品销售权限增加接口入参字段productChannl	2024-04-26 18:43:16 +08:00
liu.xiaofeng@ebiz-digits.com	c3f62c0f0f	电投流程调用销售权限接口，其他的渠道不调	2024-04-26 18:43:12 +08:00
liu.xiaofeng@ebiz-digits.com	e949d990b9	关于产品风险等级与销售人员资质校验系统需求	2024-04-26 18:43:08 +08:00
liu.xiaofeng@ebiz-digits.com	3129686bc4	姓名录入校验修改	2024-04-25 17:35:38 +08:00
liu.xiaofeng@ebiz-digits.com	4286f43d85	卡单支付分享页面保障责任字段显示方式调整为右对齐	2024-04-19 16:03:23 +08:00
liu.xiaofeng@ebiz-digits.com	182ab6229c	卡单支付分享页面保障责任字段显示方式调整为右对齐	2024-04-19 16:03:20 +08:00
liu.xiaofeng@ebiz-digits.com	d27541f8fd	GBC渠道富安一生产品不同年龄最大保额限制	2024-04-15 09:28:49 +08:00
liu.xiaofeng@ebiz-digits.com	5a7f09f5d8	卡单签字确认页面阅读文件前弹窗提示内容修改	2024-04-15 09:28:45 +08:00
liu.xiaofeng@ebiz-digits.com	5818898564	职业限制逻辑修改	2024-04-15 09:28:41 +08:00
liu.xiaofeng@ebiz-digits.com	b1de132117	职业限制逻辑修改	2024-04-15 09:28:38 +08:00
liu.xiaofeng@ebiz-digits.com	2454b5ee44	职业限制逻辑修改	2024-04-15 09:28:34 +08:00
liu.xiaofeng@ebiz-digits.com	ea8eb2990a	投保年龄计算按照生效日来算	2024-04-15 09:28:30 +08:00
liu.xiaofeng@ebiz-digits.com	9a2845160c	卡单支付结果页面展示内容信息补全	2024-04-15 09:28:26 +08:00
liu.xiaofeng@ebiz-digits.com	566b497a75	卡单支付结果页面展示内容信息补全	2024-04-15 09:28:22 +08:00
liu.xiaofeng@ebiz-digits.com	0c451caf34	国富无忧安康卡-国富无忧综合意外伤害保险计划（2024版）投保信息页面增加备注信息	2024-04-15 09:28:19 +08:00
liu.xiaofeng@ebiz-digits.com	894a57801e	投保前提示弹窗标题修改支付成功后页面温馨提示语内容修改	2024-04-15 09:28:15 +08:00
liu.xiaofeng@ebiz-digits.com	17c4cc955b	职业限制修改	2024-04-15 09:28:11 +08:00
liu.xiaofeng@ebiz-digits.com	c1b4f6e1b7	国富无忧安康卡-国富无忧综合意外伤害保险计划（2024版）修改	2024-04-15 09:28:06 +08:00
liu.xiaofeng@ebiz-digits.com	8de047c8fa	国富无忧安康卡-国富无忧综合意外伤害保险计划（2024版）	2024-04-15 09:28:02 +08:00
liu.xiaofeng@ebiz-digits.com	9238ad698b	卡单投保学平险职业默认一般学生参数传递occupationType设置为1	2024-03-29 14:13:08 +08:00
liu.xiaofeng@ebiz-digits.com	1224b3e2d8	卡单投保学平险职业默认一般学生参数传递occupationType设置为1	2024-03-29 14:13:05 +08:00
liu.xiaofeng@ebiz-digits.com	8b96bea8e7	银保渠道吐过没有产品可选修改信息提示为请提示不再阻断	2024-03-29 09:44:42 +08:00
liu.xiaofeng@ebiz-digits.com	4dd71eb80d	GBC获客录入信息界面选择产品弹窗不勾选产品点击确定提示语修改	2024-03-13 20:57:08 +08:00
liu.xiaofeng@ebiz-digits.com	3aabd2cd47	GBC获客信息录入页面部门字段必填校验	2024-03-13 20:57:03 +08:00
liu.xiaofeng@ebiz-digits.com	ccc2bd1eaf	获客信息录入页面保存接口增加科室相关字段	2024-03-13 20:57:00 +08:00
liu.xiaofeng@ebiz-digits.com	502a35fdc0	获客投保人信息录入页面去掉校验	2024-03-13 20:56:57 +08:00
liu.xiaofeng@ebiz-digits.com	1364105990	获客功能提交页面更换图片	2024-03-13 20:56:53 +08:00
liu.xiaofeng@ebiz-digits.com	23f843f53b	获客功能保存接口对接	2024-03-13 20:56:50 +08:00
liu.xiaofeng@ebiz-digits.com	7a4de61cca	获客功能代码编辑	2024-03-13 20:56:46 +08:00
liu.xiaofeng@ebiz-digits.com	78f6343af3	信息录入页面优化代码	2024-03-13 20:56:43 +08:00
liu.xiaofeng@ebiz-digits.com	f4e8f8b4b0	信息录入页面底部提交按钮以及总保费的展示添加	2024-03-13 20:56:40 +08:00
liu.xiaofeng@ebiz-digits.com	2f93dbbc6d	信息录入页面底部提交按钮以及总保费的展示添加	2024-03-13 20:56:36 +08:00
liu.xiaofeng@ebiz-digits.com	2eadcc4c4e	GBC一级产品校验接口联调获取GBC一级产品接口联调新增提交结果页面添加样式	2024-03-13 20:56:32 +08:00
liu.xiaofeng@ebiz-digits.com	05b8dbb703	获客功能开发	2024-03-13 20:56:29 +08:00
liu.xiaofeng@ebiz-digits.com	141b9d6a24	获客功能开发	2024-03-13 20:56:26 +08:00
liu.xiaofeng@ebiz-digits.com	76a7e379b7	获客功能开发	2024-03-13 20:56:23 +08:00
liu.xiaofeng@ebiz-digits.com	07dc5fa96e	项目详情样式细调	2024-03-13 20:55:11 +08:00
liu.xiaofeng@ebiz-digits.com	fbe59da7fa	GBC项目列表页面搜索功能增加入参projectName	2024-03-13 20:55:08 +08:00
liu.xiaofeng@ebiz-digits.com	f2c230b3e7	客户列表编辑客户信息的时候切换人员不重新请求详情信息	2024-03-13 20:55:06 +08:00
liu.xiaofeng@ebiz-digits.com	14e236f9cc	当前激活的用户appntid 保存方式修改并修改保额保费的保留两位小数的写法	2024-03-13 20:55:03 +08:00
liu.xiaofeng@ebiz-digits.com	df590bc2d0	测试问题修改	2024-03-13 20:55:00 +08:00
liu.xiaofeng@ebiz-digits.com	a6a2e5b749	GBC客户管理错误字段修改	2024-03-13 20:54:57 +08:00
liu.xiaofeng@ebiz-digits.com	eebb84093f	产品列表修改	2024-03-13 20:54:54 +08:00
liu.xiaofeng@ebiz-digits.com	c11ba15a0f	首页去掉下拉刷新	2024-03-13 20:54:51 +08:00
liu.xiaofeng@ebiz-digits.com	e94249475e	首页怎么判断只有登录的时候调取项目列表接口	2024-03-13 20:54:48 +08:00
liu.xiaofeng@ebiz-digits.com	67148b4721	项目详情和客户编辑接口对接	2024-03-13 20:54:46 +08:00
liu.xiaofeng@ebiz-digits.com	bdbebc7ad8	首页小组编码字段修改电投投保人页面保存接口入参增加teamCode	2024-03-13 20:54:41 +08:00
liu.xiaofeng@ebiz-digits.com	6e58fbb33d	首页选择项目绑定的项目改为绑定小组	2024-03-13 20:54:15 +08:00
liu.xiaofeng@ebiz-digits.com	5104f52f40	数据看板页面以及产品列表页面和编辑客户信息页面基础代码编写	2024-03-13 20:53:34 +08:00
liu.xiaofeng@ebiz-digits.com	6baffe50a8	首页展示的项目列表数据后面增加显示小组名称	2024-03-13 20:44:04 +08:00
liu.xiaofeng@ebiz-digits.com	62de743fbc	数据存储由isFrom修改为branchType	2024-03-13 20:42:00 +08:00
liu.xiaofeng@ebiz-digits.com	6cd71bb8d5	首页增加方法判断当前是否是GBC渠道	2024-03-13 20:41:12 +08:00
liu.xiaofeng@ebiz-digits.com	e8453879a0	isFrom 由sessionstorage 改为localStorage	2024-03-13 20:40:34 +08:00
liu.xiaofeng@ebiz-digits.com	d57c539de4	GBC页面样式调整功能联调	2024-03-13 20:39:52 +08:00
liu.xiaofeng@ebiz-digits.com	b068888067	投保人页面获取代理人渠道信息	2024-03-13 20:37:45 +08:00
liu.xiaofeng@ebiz-digits.com	4190d65579	GBC功能开发	2024-03-13 20:36:40 +08:00
liu.xiaofeng@ebiz-digits.com	54f474dda2	首页样式修改	2024-03-13 20:32:47 +08:00
liu.xiaofeng@ebiz-digits.com	988efd34d1	首页调用获取代理人项目列表接口	2024-03-13 20:32:43 +08:00
liu.xiaofeng@ebiz-digits.com	0ad0575414	新增查询登录人所属项目列表接口并调整首页代码逻辑	2024-03-13 20:32:14 +08:00
liu.xiaofeng@ebiz-digits.com	3477f9ffd8	GBC首页页面基础代码编写	2024-03-13 20:32:10 +08:00
liu.xiaofeng@ebiz-digits.com	ccb2b12762	GBC新增首页路由和文件	2024-03-13 20:29:04 +08:00
liu.xiaofeng@ebiz-digits.com	1a5b8c2a9e	卡单投保被保人是否为新市民选择为是下方选择新市民类型选择后不显示	2024-03-13 12:42:33 +08:00
liu.xiaofeng@ebiz-digits.com	31b1485e23	卡单投保增加地区判断是否是广西地区动态控制新市民字段是否展示	2024-03-13 12:42:30 +08:00
liu.xiaofeng@ebiz-digits.com	0842b27a62	“投保人信息”及“被保险人信息”中增加字段“新市民身份”	2024-03-13 12:42:26 +08:00
liu.xiaofeng@ebiz-digits.com	65e41ed410	责任组联动功能代码逻辑编写	2024-03-12 13:50:59 +08:00
liu.xiaofeng@ebiz-digits.com	7739e8b90b	免赔额和免赔比例显示逻辑调整	2024-03-12 13:50:56 +08:00
liu.xiaofeng@ebiz-digits.com	33e6b150b4	嘉和保重大疾病2024年末现金价值增加單位	2024-03-12 13:50:47 +08:00
liu.xiaofeng@ebiz-digits.com	d037b8e36a	国富人寿嘉和保重大疾病保险（2024版）加字段	2024-03-12 13:50:43 +08:00
liu.xiaofeng@ebiz-digits.com	5a9512b5b7	嘉和保保期70最小保额为20万保期终身最小保额10万	2024-03-12 13:49:43 +08:00
liu.xiaofeng@ebiz-digits.com	570cc88b30	本产品建议“保至70周岁”的方案20万保额起投；“保至终身”的方案10万保额起投；	2024-03-12 13:49:39 +08:00
liu.xiaofeng@ebiz-digits.com	7ef7799545	嘉和保产品试算兼容	2024-03-12 13:49:35 +08:00