GBC富安一生产品利益展示字段加单位

src/assets/js/utils/countCredentialValidity.js

@@ -21,7 +21,7 @@ export default {
           return startDate = thisyear + '-02-28'
         }
       }else{
-        return startDate = String(Number(endDate.slice(0, 4)) - 5) + startDate.slice(4, 11)
+        return startDate = String(Number(endDate.slice(0, 4)) - 5) + endDate.slice(4, 11)
       }
     }
     /**

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

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

src/views/ebiz/common/CalculatePremium.vue

@@ -2364,7 +2364,7 @@
               this.saleInsuredInfo.sex,
               this.saleInsuredInfo.occupationCode,
               this.saleInsuredInfo.occupationName,
-              this.saleInsuredPersonInfo.insuredAge
+              this.saleInsuredInfo.age?this.saleInsuredInfo.age:this.saleInsuredInfo.insuredAge
             ]
           } else {
             ;[birthday, sex, occupationCode, occupationName, age] = [

src/views/ebiz/institutionalPerform/Organization.vue

@@ -94,30 +94,30 @@ export default {
         [
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收标保(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收标保(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' },
             { isInt: false, name: '承保同比', key: 'cbtb' },
             { isInt: false, name: '承保环比', key: 'cbhb' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' },
-            { isInt: false, name: '标保目标', key: 'bbmb' },
-            { isInt: false, name: '标保目标达成率', key: 'bbmbdcl' },
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
+            { isInt: false, name: '期交目标', key: 'bbmb' },
+            { isInt: false, name: '期交目标达成率', key: 'bbmbdcl' },
             { isInt: false, name: '差距', key: 'cj' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保标保(万元)', key: 'bzbf' }
+            { isInt: false, name: '承保期交(万元)', key: 'bzbf' }
           ]
         ],
         [
@@ -131,7 +131,7 @@ export default {
         ],
         [
           { isInt: false, name: '产品', key: 'productName' },
-          { isInt: false, name: '承保标保(万元)', key: 'cbbb' },
+          { isInt: false, name: '承保期交(万元)', key: 'cbbb' },
           { isInt: true, name: '承保件数(件)', key: 'cbItems' },
           { isInt: false, name: '保费占比(%)', key: 'percent' }
         ]

src/views/ebiz/institutionalPerform/Summarizing.vue

@@ -11,7 +11,7 @@
             <th>达成</th>
           </tr>
           <tr>
-            <td class="bleft bright">预收标保</td>
+            <td class="bleft bright">预收期交</td>
             <td class="bright">{{ performance.ysbb | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -19,7 +19,7 @@
             <td class="bright">{{ performance.ysjs | unitFilter(2) | blankFilter }}</td>
           </tr>
           <tr>
-            <td class="bleft bright">承保标保</td>
+            <td class="bleft bright">承保期交</td>
             <td class="bright">{{ performance.bzbf | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -29,43 +29,43 @@
         </table>
       </div>
     </div>
-    <div class="data-section">
-      <span ref="manpower" class="title">
-        人力
-      </span>
-      <div class="table-wrapper">
-        <table class="myTable" cellspacing="0" cellpadding="0">
-          <tr>
-            <th style="width: 50%;">人力指标</th>
-            <th>达成(人)</th>
-          </tr>
-          <tr>
-            <td class="bleft bright">活动人力</td>
-            <td class="bright">{{ manpower.hdrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">合格人力</td>
-            <td class="bright">{{ manpower.hgrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">桂冠人力</td>
-            <td class="bright">{{ manpower.ggrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">桂冠正式会员</td>
-            <td class="bright">{{ manpower.gghy | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">双冠人力</td>
-            <td class="bright">{{ manpower.sgrl | blankFilter }}</td>
-          </tr>
-          <tr>
-            <td class="bleft bright">新增人力</td>
-            <td class="bright">{{ manpower.xzrl | blankFilter }}</td>
-          </tr>
-        </table>
-      </div>
-    </div>
+<!--    <div class="data-section">-->
+<!--      <span ref="manpower" class="title">-->
+<!--        人力-->
+<!--      </span>-->
+<!--      <div class="table-wrapper">-->
+<!--        <table class="myTable" cellspacing="0" cellpadding="0">-->
+<!--          <tr>-->
+<!--            <th style="width: 50%;">人力指标</th>-->
+<!--            <th>达成(人)</th>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">活动人力</td>-->
+<!--            <td class="bright">{{ manpower.hdrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">合格人力</td>-->
+<!--            <td class="bright">{{ manpower.hgrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">桂冠人力</td>-->
+<!--            <td class="bright">{{ manpower.ggrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">桂冠正式会员</td>-->
+<!--            <td class="bright">{{ manpower.gghy | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">双冠人力</td>-->
+<!--            <td class="bright">{{ manpower.sgrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td class="bleft bright">新增人力</td>-->
+<!--            <td class="bright">{{ manpower.xzrl | blankFilter }}</td>-->
+<!--          </tr>-->
+<!--        </table>-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="data-section">
       <span ref="production" class="title">
         产品
@@ -77,7 +77,7 @@
         <table class="myTable" style="min-width: 140vw;" cellspacing="0" cellpadding="0">
           <tr>
             <th class="sticky">产品名称</th>
-            <th>承保标保(万元)</th>
+            <th>承保期交(万元)</th>
             <th>承保件数(件)</th>
             <th>保费占比(%)</th>
           </tr>

src/views/ebiz/institutionalPerform/UnderOffice.vue

@@ -125,7 +125,7 @@ export default {
       dayTimeCondition: currentDate,
       // 0: 标保, 1: 人力, 2: 产品
       typeIndex: 0,
-      dataTypes: ['标保', '人力指标', '产品'],
+      dataTypes: ['期交', '人力指标', '产品'],
       active: 0,
       // 侧边栏是否显示
       isSideBarShow: false,

src/views/ebiz/proposal/js/exhibitionMethod.js

@@ -150,7 +150,7 @@ export function relevanceByInsure(insured, insuredLabelResult, insuredResult, in
         let defaulValue = 'M' //档位默认值
         let radios = []
         if(currentInsuredInfo.L){
-          if(risk.mainRiskCode == 'GFRS_M0083') {
+          if(risk.mainRiskCode == 'GFRS_M0083' || risk.mainRiskCode == 'GFRS_M0085') {
             radios.push({
               label: '保证' + currentInsuredInfo.L,
               value: 'L'
@@ -163,7 +163,7 @@ export function relevanceByInsure(insured, insuredLabelResult, insuredResult, in
           }
         }
         if(currentInsuredInfo.M){
-          if(risk.mainRiskCode == 'GFRS_M0083') {
+          if(risk.mainRiskCode == 'GFRS_M0083' || risk.mainRiskCode == 'GFRS_M0085') {
             radios.push({
               label: '演示' + currentInsuredInfo.M,
               value: 'M'