From 91dacd105d00d8b9828dfc93229000a45e508e4b Mon Sep 17 00:00:00 2001
From: proudlx <965752348@qq.com>
Date: Thu, 1 Apr 2021 22:03:56 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BF=9D=E8=B4=B9=E8=AF=95=E7=AE=97'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/insureAgain/ProductInformation.vue   | 60 ++++++++++++++-----
 src/views/ebiz/insureAgain/index.vue          | 20 +++----
 2 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/src/views/ebiz/insureAgain/ProductInformation.vue b/src/views/ebiz/insureAgain/ProductInformation.vue
index d163d3d0a..d50abe421 100644
--- a/src/views/ebiz/insureAgain/ProductInformation.vue
+++ b/src/views/ebiz/insureAgain/ProductInformation.vue
@@ -156,22 +156,50 @@ export default {
     this.riskDTOLst = this.insuredDTOs.riskDTOLst
     let trialInfos = []
     this.riskDTOLst.forEach((element, index) => {
-      trialInfos.push({
-        birthday: this.insuredDTOs.birthday,
-        insuYear: element.insuYear,
-        insuYearFlag: element.insuYearFlag,
-        medical: this.insuredDTOs.medical,
-        occupationCode: this.insuredDTOs.occupationCode,
-        occupationName: this.insuredDTOs.occupationName,
-        payEndYear: element.payEndYear,
-        payEndYearFlag: element.payEndYearFlag,
-        payIntv: element.payIntv,
-        platformType: 'app',
-        prem: element.prem,
-        productCode: element.riskCode,
-        sex: this.insuredDTOs.sex,
-        amt:element.amt,
-      })
+      if (element.isMainRisk == '0') {
+        trialInfos.push({
+          birthday: this.insuredDTOs.birthday,
+          insuYear: element.insuYear,
+          insuYearFlag: element.insuYearFlag,
+          medical: this.insuredDTOs.medical,
+          occupationCode: this.insuredDTOs.occupationCode,
+          occupationName: this.insuredDTOs.occupationName,
+          payEndYear: element.payEndYear,
+          payEndYearFlag: element.payEndYearFlag,
+          payIntv: element.payIntv,
+          platformType: 'app',
+          prem: element.prem,
+          productCode: element.riskCode,
+          sex: this.insuredDTOs.sex,
+          amt: element.amt
+        })
+      } else {
+        trialInfos.push({
+          birthday: this.insuredDTOs.birthday,
+          duty:element.dutyLst,
+          isMainRisk:element.isMainRisk,
+          isRemit:element.isRemit,
+          remitType:'',
+          showPrem:element.showPrem,
+          standPrem:element.standPrem,
+          trialType:'',
+
+          insuYear: element.insuYear,
+          insuYearFlag: element.insuYearFlag,
+          medical: this.insuredDTOs.medical,
+          occupationCode: this.insuredDTOs.occupationCode,
+          occupationName: this.insuredDTOs.occupationName,
+          payEndYear: element.payEndYear,
+          payEndYearFlag: element.payEndYearFlag,
+          payIntv: element.payIntv,
+          platformType: 'app',
+          
+          prem: element.prem,
+          productCode: element.riskCode,
+          sex: this.insuredDTOs.sex,
+          amt: element.amt
+        })
+      }
     })
     insureTrial({ trialInfos }).then((res) => {
       console.log(res.trialList)
diff --git a/src/views/ebiz/insureAgain/index.vue b/src/views/ebiz/insureAgain/index.vue
index 04a5e00b8..b8a2a5dfb 100644
--- a/src/views/ebiz/insureAgain/index.vue
+++ b/src/views/ebiz/insureAgain/index.vue
@@ -161,17 +161,17 @@ export default {
           // item.reInsuranceFlag = '3';
           // item.reInsuranceState = item4[Math.floor(Math.random()*item4.length)];
 
-          if (this.active === 'uncommit' && item.reInsuranceFlag === '3' && item.reInsuranceState === '0') {
-            if (item.newOrderStatus === null || item.newOrderStatus === '02' || item.newOrderStatus === '05' || item.newOrderStatus === '06' || item.newOrderStatus === '08' || item.newOrderStatus === '38' || item.newOrderStatus === '39' || item.newOrderStatus === '40' ) {
-              NewItems.push(item)
-            }
-          } else if(this.active === 'commit' && item.reInsuranceFlag === '3' && (item.reInsuranceState === '1' || item.reInsuranceState === '2' || item.reInsuranceState === '3')){
-            if (item.newOrderStatus === '07' || item.newOrderStatus === '19' || item.newOrderStatus === '55') {
-              NewItems.push(item)
-            }
-          }
+          // if (this.active === 'uncommit' && item.reInsuranceFlag === '3' && item.reInsuranceState === '0') {
+          //   if (item.newOrderStatus === null || item.newOrderStatus === '02' || item.newOrderStatus === '05' || item.newOrderStatus === '06' || item.newOrderStatus === '08' || item.newOrderStatus === '38' || item.newOrderStatus === '39' || item.newOrderStatus === '40' ) {
+          //     NewItems.push(item)
+          //   }
+          // } else if(this.active === 'commit' && item.reInsuranceFlag === '3' && (item.reInsuranceState === '1' || item.reInsuranceState === '2' || item.reInsuranceState === '3')){
+          //   if (item.newOrderStatus === '07' || item.newOrderStatus === '19' || item.newOrderStatus === '55') {
+          //     NewItems.push(item)
+          //   }
+          // }
 
-          // NewItems.push(item)
+          NewItems.push(item)
         }
       })
       console.log(NewItems, '======================NewItems===================')