From 9731571b44c31901c4d536c6c662832dca364a76 Mon Sep 17 00:00:00 2001
From: proudlx <965752348@qq.com>
Date: Sat, 24 Apr 2021 15:51:50 +0800
Subject: [PATCH] =?UTF-8?q?'=E9=99=A9=E7=A7=8D=E4=BC=A0=E5=8F=82'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/insureAgain/InsureInformation.vue    |  2 +-
 .../ebiz/insureAgain/ProductInformation.vue   | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/insureAgain/InsureInformation.vue b/src/views/ebiz/insureAgain/InsureInformation.vue
index 72c97e538..dbb502f4e 100644
--- a/src/views/ebiz/insureAgain/InsureInformation.vue
+++ b/src/views/ebiz/insureAgain/InsureInformation.vue
@@ -575,7 +575,7 @@ export default {
         })
         this.setInsuredCustomerMarriage(this.insuredPersonInfo.marriage)
         //是否长期
-        this.insuredPersonInfo.effectiveDateType = res.orderDTO.appntDTO.effectiveDateType == 'false' ? false : true
+        this.insuredPersonInfo.effectiveDateType = res.orderDTO.insuredDTOs[0].effectiveDateType == 'false' ? false : true
         if (this.insuredPersonInfo.homeProvince.length) {
           this.insuredHomeName = getAreaName([
             { code: this.insuredPersonInfo.homeProvince },
diff --git a/src/views/ebiz/insureAgain/ProductInformation.vue b/src/views/ebiz/insureAgain/ProductInformation.vue
index 612a03882..ff9ea63ea 100644
--- a/src/views/ebiz/insureAgain/ProductInformation.vue
+++ b/src/views/ebiz/insureAgain/ProductInformation.vue
@@ -362,7 +362,7 @@ export default {
     },
     nextStep() {
       this.commitReOrder()
-      return;
+      return
       if (this.needRead && !this.isRead) {
         Dialog.alert({
           title: '提示',
@@ -380,25 +380,37 @@ export default {
      */
     commitReOrder() {
       let additionals = []
-      this.checkboxResult.forEach((res) => {
-        this.additionalList.forEach((res2) => {
-          if (res2.riskCode === res) {
-            additionals.push(res2)
-          }
-        })
+      // this.checkboxResult.forEach((res) => {
+      //   this.additionalList.forEach((res2) => {
+      //     if (res2.riskCode === res) {
+      //       additionals.push(res2)
+      //     }
+      //   })
+      // })
+      this.additionalList.forEach((item) => {
+        if (item.riskCode == 'GFRS_A0008' && item.additionalInsuranceFlag == 1) {
+          this.checkboxResult.forEach((item2) => {
+            if (item.riskCode === item2) {
+              additionals.push(item)
+            }
+          })
+        }else{
+          additionals.push(item)
+        }
       })
-      this.riskDTOLst = [...this.mainList, ...additionals]
+      let riskDTOLst = [...this.mainList, ...additionals]
       // // todo start测试数据
       // this.riskDTOLst.forEach((res, index)=>{
       //   res.riskCode = 'GFRS_M0002'
       //   console.log(res, '=====================测试测试测试====================')
       // })
       // // todo end测试数据
-
+      let insureDTOS = Object.assign({},this.insuredDTOs);
+      insureDTOS.riskDTOLst = riskDTOLst;
       let data = {
         orderDTO: {
           appntDTO: this.appntDTO,
-          insuredDTOs: [this.insuredDTOs],
+          insuredDTOs: [insureDTOS],
           orderInfoDTO: {
             orderNo: CacheUtils.getLocItem('orderNo'),
             supportBank: '0'