From 3eb82cffd899c94433c21e83e5cf70c48bd1a81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= <yang.huaxiang@ebiz-fooge.com>
Date: Wed, 4 Mar 2020 17:11:36 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-451=E3=80=900312=E3=80=91=E7=94=B5?=
 =?UTF-8?q?=E6=8A=95=E6=B7=BB=E5=8A=A0=E5=8F=8C=E5=BD=95=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=20=E9=99=A9=E7=A7=8D=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86=20--=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/SelectedProduct.vue | 96 +++++++++++------------
 1 file changed, 44 insertions(+), 52 deletions(-)

diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index b7f2c0e72..c8fdd1bac 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -243,18 +243,35 @@ export default {
           }
         }
       }
-      let showFlag = this.showTipForDoubleRecord()
-      if (showFlag) {
-        this.$dialog
-          .alert({
-            message: '年龄≥60周岁投保人，如果投保一年期以上产品，请根据监管要求对销售过程进行录音录像！',
-            confirmButtonColor: '#000000'
-          })
-          .then(() => {
-            this.nextPageShow()
-          })
+      let routerUrl
+      if (localStorage.isFrom == 'proposal') {
+        routerUrl = '/proposal/chooseInsuredPerson'
+        let page = this.$route.query.proposalEdit == '1' ? '-1' : '-2'
+
+        this.$jump({
+          flag: 'goBack',
+          extra: {
+            refresh: '1',
+            index: page
+          },
+          routerInfo: {
+            path: routerUrl
+          }
+        })
       } else {
-        this.nextPageShow()
+        let showFlag = this.showTipForDoubleRecord()
+        if (showFlag) {
+          this.$dialog
+            .alert({
+              message: '年龄≥60周岁投保人，如果投保一年期以上产品，请根据监管要求对销售过程进行录音录像！',
+              confirmButtonColor: '#000000'
+            })
+            .then(() => {
+              this.nextPageShow()
+            })
+        } else {
+          this.nextPageShow()
+        }
       }
     },
     //添加产品
@@ -275,16 +292,8 @@ export default {
       let age = utilsAge.getAge(this.appntDTO.birthday, new Date())
       if (age >= 60) {
         this.chooseProducts.map(item => {
-          // 保险期间大于1年
-          item.calFactorLst.map(subItem => {
-            if (subItem.code == 'insuYear') {
-              if (subItem.payEndYearFlag == 'A' || (subItem.payEndYearFlag == 'Y' && subItem.payEndYear != '1')) {
-                showFlag = true
-                return true
-              }
-            }
-          })
-          if (showFlag) {
+          if (item.insuYearFlag == 'A' || (item.insuYearFlag == 'Y' && item.insuYear != '1')) {
+            showFlag = true
             return true
           }
         })
@@ -292,37 +301,20 @@ export default {
       return showFlag
     },
     nextPageShow() {
-      let routerUrl
-      if (localStorage.isFrom == 'proposal') {
-        routerUrl = '/proposal/chooseInsuredPerson'
-        let page = this.$route.query.proposalEdit == '1' ? '-1' : '-2'
-
-        this.$jump({
-          flag: 'goBack',
-          extra: {
-            refresh: '1',
-            index: page
-          },
-          routerInfo: {
-            path: routerUrl
-          }
-        })
-      } else {
-        routerUrl = '/sale/beneficiary'
-        localStorage.beneficiaryInfo = ''
-        localStorage.fromAddBeneficiaryInfo = ''
-        localStorage.removeItem('applicant')
-        this.$jump({
-          flag: 'h5',
-          extra: {
-            url: location.origin + '/#' + routerUrl,
-            needRefresh: '1'
-          },
-          routerInfo: {
-            path: routerUrl
-          }
-        })
-      }
+      let routerUrl = '/sale/beneficiary'
+      localStorage.beneficiaryInfo = ''
+      localStorage.fromAddBeneficiaryInfo = ''
+      localStorage.removeItem('applicant')
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + '/#' + routerUrl,
+          needRefresh: '1'
+        },
+        routerInfo: {
+          path: routerUrl
+        }
+      })
     }
   }
 }