Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev

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

@@ -165,7 +165,7 @@ export default {
       id: 6,
       text: '台湾居民来往大陆通行证'
     },
-   /* {
+    /* {
       id: 7,
       text: '其他',
       disabled: true
@@ -207,7 +207,7 @@ export default {
       id: 6,
       text: '台湾居民来往大陆通行证'
     },
-   /* {
+    /* {
       id: 7,
       text: '其他',
       disabled: true
@@ -828,6 +828,14 @@ export default {
     {
       id: '55',
       text: '支付失败'
+    },
+    {
+      id: '56',
+      text: '卡单投被保人信息保存成功'
+    },
+    {
+      id: '57',
+      text: '卡单保存账户信息成功'
     }
   ],
   // 产品编码
@@ -1446,21 +1454,9 @@ export default {
     { id: 'EAM', text: '资深部经理' },
     { id: 'AD', text: '营业总监' }
   ],
-  relationType: [
-    { id: '0', text: '配偶' },
-    { id: '1', text: '子女' },
-    { id: '2', text: '父母' }
-  ],
-  guarantRelationType: [
-    { id: '0', text: '亲属' },
-    { id: '1', text: '朋友' },
-    { id: '2', text: '同事' },
-    { id: '3', text: '其他' }
-  ],
-  classification: [
-    { id: '0', text: '司内' },
-    { id: '1', text: '司外' }
-  ],
+  relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }],
+  guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }],
+  classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }],
   //入司国籍/地区
   rsnativeplace: [
     { id: 'AGO', text: '安哥拉' },
@@ -1754,18 +1750,9 @@ export default {
     { id: '08', text: '其它' }
   ],
   // 申请人身份
-  applicantStatus: [
-    { id: '01', text: '本人' },
-    { id: '02', text: '监护人' }
-  ],
+  applicantStatus: [{ id: '01', text: '本人' }, { id: '02', text: '监护人' }],
   // 理赔申请人身份
-  lpApplicantStatus: [
-    { id: '1', text: '本人' },
-    { id: '2', text: '配偶' },
-    { id: '3', text: '父母' },
-    { id: '4', text: '子女' },
-    { id: '5', text: '其他' }
-  ],
+  lpApplicantStatus: [{ id: '1', text: '本人' }, { id: '2', text: '配偶' }, { id: '3', text: '父母' }, { id: '4', text: '子女' }, { id: '5', text: '其他' }],
   // 出险申请类型
   applyType: [
     {
@@ -2014,10 +2001,7 @@ export default {
     }
   ],
   //对象
-  targetDictionary: [
-    { value: '本人', code: '00' },
-    { value: '配偶', code: '01' }
-  ],
+  targetDictionary: [{ value: '本人', code: '00' }, { value: '配偶', code: '01' }],
   nbsRelation: [
     { name: '配偶', value: '00' },
     { name: '子女', value: '01' },
@@ -2038,11 +2022,7 @@ export default {
     { code: '08', value: '其他费用' }
   ],
   //险种类型字典
-  insuranceDictionary: [
-    { code: '01', value: '寿险' },
-    { code: '02', value: '重疾' },
-    { code: '03', value: '年金' }
-  ],
+  insuranceDictionary: [{ code: '01', value: '寿险' }, { code: '02', value: '重疾' }, { code: '03', value: '年金' }],
   // 活动量管理 - 人才库 - 状态
   talentPoolStatus: [
     { id: 0, text: '暂不考虑' },

src/views/ebiz/cardList/CardTotreasure.vue

@@ -40,22 +40,25 @@
             class="pb45"
           >
             <div v-if="isSuccess">
-              <div class="order-container" v-for="(orderItem, index) in orderList" :key="index">
-                <div class="fs14 fwb mb5">{{ orderItem.insuredDTOs[0].riskDTOLst[0].riskName }}</div>
+              <div class="order-container" v-for="(orderItem, index) in NewItems" :key="index">
+                <div class="fs14 fwb mb5">{{ orderItem.riskName }}</div>
                 <div>
-                  <span>投保单号：</span><span>{{ orderItem.orderInfoDTO.orderNo }}</span>
+                  <span>投保单号：{{ orderItem.orderNo }}</span>
                 </div>
                 <div>
-                  <span>投保人：</span><span>{{ orderItem.appntDTO.name }}</span>
+                  <span>投保人：{{ orderItem.appantName }}</span>
                 </div>
                 <div>
-                  <span>被保人：</span><span>{{ orderItem.insuredDTOs[0].name }}</span>
+                  <span>被保人：{{ orderItem.insuredName }}</span>
                 </div>
-                <div>
-                  <span>订单状态：</span><span>{{ orderItem.orderInfoDTO.orderStatus | statusFormat }}</span>
+                <div class="flex justify-content-s">
+                  <span>订单状态：{{ orderItem.orderStatus | statusFormat }}</span>
+                  <div v-if="orderItem.isCanPay && orderItem.orderStatus == '02'">
+                    <van-button round @click="goPay(orderItem.orderNo)" size="small" class="mr5" type="danger" v-no-more-click="1000">去支付</van-button>
+                  </div>
                 </div>
               </div>
-              <template v-if="orderList.length === 0">
+              <template v-if="NewItems.length === 0">
                 <li class="flex flex-direction-colunm align-items-c">
                   <img src="@/assets/images/pic_page-non.png" class="mt50" alt="" />
                   <p class="gray text-center pt20">暂无订单</p>
@@ -112,6 +115,9 @@
 <script>
 import { getCardList, getOrderList } from '@/api/ebiz/cardList/cardList.js'
 import { Tab, Tabs, List, Sticky } from 'vant'
+import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到订单状态
+import formatDate from '@/assets/js/utils/date-utils'
+
 export default {
   name: 'kadantoubao.vue',
   components: {
@@ -249,7 +255,6 @@ export default {
       }
       getCardList(data)
         .then(res => {
-          console.log('res', res)
           if (res.result == 0) {
             this.list = res.productList
           } else {
@@ -265,7 +270,6 @@ export default {
     getOrderList(data) {
       getOrderList(data).then(
         res => {
-          console.log('res=!===', res)
           if (res.result == '0') {
             this.isSuccess = true
             this.currentPage++
@@ -277,7 +281,6 @@ export default {
               return
             }
             let answerList = res.orderDTOPageInfo.list
-            console.log('answerList== ', answerList)
             this.orderList = this.orderList.concat(answerList)
             if (answerList.length == 0) {
               this.finishedText = ''
@@ -302,89 +305,57 @@ export default {
           console.log(error)
         }
       )
+    },
+
+    //去支付
+    goPay(val) {
+      localStorage.setItem('orderNo', JSON.stringify(parseInt(val)))
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#/cardList/pay`,
+          forbidSwipeBack: 1
+        },
+        routerInfo: {
+          path: `/cardList/pay`
+        }
+      })
     }
   },
   filters: {
     statusFormat(val) {
       let text
-      switch (val) {
-        case '07':
-          text = '公司谢绝'
-          break
-        case '02':
-          text = '待支付'
-          break
-        case '08':
-          text = '承保成功'
-          break
-        case '16':
-          text = '承保中'
-          break
-      }
+      dataDictionary.policyState.forEach(state => {
+        if (state.id == val) {
+          text = state.text
+        }
+      })
       return text
     }
+  },
+  computed: {
+    NewItems() {
+      let _this = this
+      // console.log(_this)
+      var NewItems = []
+      this.orderList.map(function(orderItem) {
+        let appntDateTime = '',
+          compareTime = '',
+          orderObj = {
+            riskName: orderItem.insuredDTOs[0].riskDTOLst[0].riskName,
+            orderNo: orderItem.orderInfoDTO.orderNo,
+            appantName: orderItem.appntDTO.name,
+            insuredName: orderItem.insuredDTOs[0].name,
+            orderStatus: orderItem.orderInfoDTO.orderStatus
+          }
+        appntDateTime = new Date(orderItem.orderInfoDTO.appntDate)
+        compareTime = new Date(formatDate.formatDate(new Date(orderItem.orderInfoDTO.appntDate), 'yyyy-MM-dd') + ' 23:59:00')
+        orderObj.isCanPay = appntDateTime < compareTime ? true : false
+        NewItems.push(orderObj)
+      })
+      return NewItems
+    }
   }
-  /*
-  
-  WAIT_CUSTOMER_CONFIRM("01", "待客户确认"),
-    WAIT_CUSTOMER_PAY("02", "待客户付款"),
-    WAIT_COMPANY_CONFIRM("03", "待公司确认"),
-    WAIT_CUSTOMER_UPLOAD("04", "待客户上载影像"),
-    OVERDUE_CLOSE("05", "逾期关闭"),
-    CUSTOMER_CANCEL("06", "客户撤销"),
-    COMPANY_REFUSE("07", "公司谢绝"),
-    ORDER_DEAL("08", "订单成交"),
-    REFUND_AFTER_DEAL("09", "订单退保"),
-    PAYMENT_SUCCESS("10", "订单待签单"),
-    WATI_CREATE_ELEC_CONT("11", "待生成电子保单"),
-    BACK_PASSING("12", "退保/领取审核中"),
-    FASTUNDERWRITING("13", "等待出单"),
-    PAYING("14", "支付中"),
-    WAITPAY("15", "支付受理中"),
-    WAIT_MANUL_UNDERWRITE("16", "承保中"),
-    FINISH_MANUL_UNDERWRITE("17", "手动承保完成"),
-    ALI_CLOUD_SYNC("18", "阿里云端数据同步中间状态"),
-    PAYMENT_FAILURE("19", "支付失败"),
-    ORDER_STATUS_WAITANSWERQUESTION("20", "待答问卷"),
-    ABS_APPOINT_SUSPENDED("21","ABS保单预约挂起中"),
-    ABS_CANCEL_APPOINT_SUSPENDED("22","ABS保单取消预约挂起中"),
-    CLAIM_SUSPENDED("23","理赔挂起中"),
-    POLICY_TERMINATED("24","保单终止"),
-    ABS_TRANSFER_SUSPENDED("25","ABS保单受益权转让挂起中"),
-    POLICY_FREEZE_SUSPENDED("26","保单冻结挂起中"),
-    POLICY_FREEZE_TRANSFER_SUSPENDED("27","冻结受益权转让挂起中"),
-    POLICY_CANCEL_FREEZE_TRANSFER_SUSPENDED("28","受益权还原挂起中"),
-    POLICY_TRANSFER_SUSPENDED("29","受益权转让挂起中"),
-    POLICY_TRANSFER_BACK_SUSPENDED("30","受益权还原挂起中"),
-    WAIT_PEOPLE_UNDERWRITING_CONFIRM("31","续保等待人核"),
-    ABNORMAL_HEALTH_NOTIFICATION("32","续保第一次健康告知异常"),
-    WAIT_HUMAN_TO_CORE("33","待人核导核心"),
-    SUCCESS_HUMAN_TO_CORE("34","人核导核心成功"),
-    APPNT_ORDER("35","投保人保存成功"),
-    INSURED_ORDER("36","被保人保存成功"),
-    BNF_ORDER("37","受益人人保存成功"),
-    ACCOUNT_ORDER("38","账户信息保存成功"),
-    RISK_ORDER("39","险种信息保存成功"),
-    IMPART_ORDER("40","告知信息保存成功"),
-    WAIT_BATCH_PAY("41", "待转批扣"),
-    SUCCESS_BATCH_PAY("42", "转批扣成功"),
-    SIGN_ORDER("43", "待签名"),
-    PLAN_TO_INSURANCE("44", "计划书转投保"),
-    CORE_PAY_FAIL("45","核心扣费失败"),
-    SELF_TO_HUMAN("46","自核不通过待转人核"),
-    HEXIN_TO_FAIL("47","核心系统繁忙，请稍后重试 "),
-    ACCOUNTNEW_ORDER("48","修改账户信息 "),
-    MEDIANEW_ORDER("49","修改银行影像信息"),
-    TREAT_PEOPLE("50","待人核"),
-    HUMAN_ING("51","人工核保中"),
-    PROBLEM_ING("52","问题件处理中"),
-    CORE_PENDING("53","核心待收费"),
-    CORE_DELAY("54","延期"),
-    EXCHANGE_PAY("55","换卡支付"),
-    CARD_INFO("56","卡单投被保人信息保存成功"),
-    CARD_ACCOUNT("57","卡单保存账户信息成功");
-  
-  * */
 }
 </script>