From 41923a3860ad46eb903b605c7e952d3c40936aca Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Thu, 16 Apr 2020 10:25:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[fix]=20=E5=A2=9E=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=88=E6=8C=89=E6=8A=95=E4=BF=9D?=
 =?UTF-8?q?=E4=BA=BA=E5=A7=93=E5=90=8D=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=EF=BC=89=20=E5=A2=9E=E5=8A=A0=E5=BE=85=E6=89=BF=E4=BF=9D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 73 ++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 1d744aad5..2fabfbd1d 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="sale-list-container pb50">
+    <van-search placeholder="请输入投保人姓名" v-model="searchName" @change="searchList" @keyup.enter="searchList" />
     <van-sticky>
       <van-tabs :line-width="45" v-model="active" @change="tabChange" sticky>
         <van-tab name="uncommit" title="未提交"></van-tab>
         <van-tab name="commit" title="已提交"></van-tab>
+        <van-tab name="waitUnderwritten" title="待承保"></van-tab>
       </van-tabs>
     </van-sticky>
 
@@ -58,7 +60,7 @@
                 <span class="c-gray-darker fwb">首期总保费（元）</span>
                 <span class="yellow fwb">{{ order.firstPrem == 0 ? '0.00' : order.firstPrem | moneyFormat }}</span>
               </div>
-              <div class="pt15" v-if="active == 'commit'" style="border-top:1px solid #dadada">
+              <div class="pt15" v-if="active == 'commit' || active == 'waitUnderwritten'" style="border-top:1px solid #dadada">
                 <div>
                   <div class="w80 inline-b">
                     <van-tag plain color="#999999">投保单号</van-tag>
@@ -122,6 +124,7 @@
                   round
                   >去支付</van-button
                 >
+
                 <!-- <van-button
                   @click="goNucleus(order)"
                   v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '46'"
@@ -149,14 +152,15 @@
 </template>
 
 <script>
-import { Tabs, Tab, List, Tag, Sticky, Toast, Dialog } from 'vant'
-import { orderList, deleteOrderInfo, selfToHuman } from '@/api/ebiz/sale/sale'
+import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog } from 'vant'
+import { orderList, deleteOrderInfo, revokeOrder } from '@/api/ebiz/sale/sale'
 import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
 
 export default {
   name: 'saleList',
   components: {
+    [Search.name]: Search,
     [Tabs.name]: Tabs,
     [Tab.name]: Tab,
     [List.name]: List,
@@ -166,6 +170,7 @@ export default {
   },
   data() {
     return {
+      searchName: '',
       active: 'uncommit', //uncommit 表示未提交  commit表示已提交
       saleList: [],
       loading: false,
@@ -175,7 +180,15 @@ export default {
       error: false,
       finishedText: '没有更多了',
       pageSize: 5, //每页数据条数
-      isSuccess: false
+      isSuccess: false,
+      canRevoke: {
+        '02': true,
+        '14': true,
+        '19': true,
+        '48': true,
+        '49': true,
+        '55': true
+      }
     }
   },
   mounted() {
@@ -187,7 +200,8 @@ export default {
       let pageInfo = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        orderType: this.active
+        orderType: this.active,
+        name: this.searchName
       }
       this.getOrderList(pageInfo)
     },
@@ -345,6 +359,13 @@ export default {
       this.finishedText = '正在加载...'
       this.loadMore()
     },
+    searchList() {
+      this.currentPage = 1
+      this.saleList = []
+      ;[this.loading, this.finished] = [true, false]
+      this.finishedText = '正在加载...'
+      this.loadMore()
+    },
     //投保单详情
     goDetail(order) {
       window.localStorage.setItem('detailJump', '')
@@ -457,12 +478,50 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/sale/insuredInfo',
+          url: location.origin + '/#/sale/insuredInfo'
         },
         routerInfo: { path: '/sale/insuredInfo' }
       })
+    },
+    revokeOrder(order) {
+      this.$dialog
+        .confirm({
+          className: 'dialog-delete',
+          title: '提示',
+          message: '确认撤销投保单吗？',
+          cancelButtonColor: '#E9332E',
+          confirmButtonColor: '#FFFFFF'
+        })
+        .then(() => {
+          return revokeOrder({ id: order.orderInfoDTO.orderNo })
+        })
+        .then(res => {
+          if (res.result == 0) {
+            this.saleList = []
+            this.isSuccess = false
+            this.currentPage = 1
+            ;[this.loading, this.finished] = [true, false]
+            let pageInfo = {
+              pageNum: this.currentPage,
+              pageSize: this.pageSize,
+              orderType: this.active
+            }
+            this.loadMore(pageInfo)
+          } else {
+            Toast.fail(res.resultMessage)
+          }
+        })
+        .catch(() => {})
     }
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.van-search__content {
+  background: #fff !important;
+  border-radius: 10px;
+}
+.van-search {
+  background: none !important;
+}
+</style>

From d78b488c644644c37261198f9f46a2062673fa6e Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Thu, 16 Apr 2020 19:15:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=E3=80=90=E7=94=B5=E6=8A=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=B7=BB=E5=8A=A0=E6=8C=87=E5=AE=9A=E5=8F=97?=
 =?UTF-8?q?=E7=9B=8A=E4=BA=BA-=E5=8B=BE=E9=80=89=E5=90=8C=E8=A2=AB?=
 =?UTF-8?q?=E4=BF=9D=E4=BA=BA=EF=BC=88=E5=85=B3=E7=B3=BB=E4=B8=BA=E9=85=8D?=
 =?UTF-8?q?=E5=81=B6=EF=BC=89=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/AddBeneficiaryInfo.vue | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
index 33225d971..33db8de85 100644
--- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue
+++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
@@ -217,7 +217,7 @@ import { selectComp } from './js/methods'
 let relationToInsured = [
   { id: 2, text: '配偶' },
   { id: 3, text: '父母' },
-  { id: 4, text: '子女' },
+  { id: 4, text: '子女' }
 ]
 
 export default {
@@ -233,7 +233,7 @@ export default {
     [Picker.name]: Picker,
     [Area.name]: Area,
     [IdentityCardScan.name]: IdentityCardScan,
-    [CustomerPicker.name]: CustomerPicker,
+    [CustomerPicker.name]: CustomerPicker
   },
   data() {
     return {
@@ -242,12 +242,12 @@ export default {
       sexRadio: [
         {
           label: '男',
-          value: '0',
+          value: '0'
         },
         {
           label: '女',
-          value: '1',
-        },
+          value: '1'
+        }
       ],
       currentPopupIndex: '',
       relationToAppnt: '',
@@ -294,7 +294,7 @@ export default {
         relationToInsured: '', //和被保人的关系
         lifeGrade: '',
         healthGrade: '',
-        bnfType: '0', //身故受益人
+        bnfType: '0' //身故受益人
       },
       areaList: areaList,
       occupationShowPicker: false,
@@ -306,7 +306,7 @@ export default {
       // area: '',
       // city: '',
       // province: ''
-      saleInsuredPersonInfo: JSON.parse(localStorage.saleInsuredPersonInfo), //被保人信息
+      saleInsuredPersonInfo: JSON.parse(localStorage.saleInsuredPersonInfo) //被保人信息
     }
   },
   mounted() {
@@ -370,15 +370,15 @@ export default {
         flag: 'goBack',
         extra: {
           refresh: '1', //是否返回后刷新0：否，1：是
-          index: '-1',
-        },
+          index: '-1'
+        }
       })
       this.$jump({
         flag: 'navigation',
         extra: {
           title: '指定受益人信息',
-          hiddenRight: '1',
-        },
+          hiddenRight: '1'
+        }
       })
       if (this.currentPopupIndex == 1) {
         this.customerShowPicker = false
@@ -391,8 +391,8 @@ export default {
         flag: 'navigation',
         extra: {
           title: '指定受益人信息',
-          hiddenRight: '1',
-        },
+          hiddenRight: '1'
+        }
       })
       this.occupationShowPicker = false
     },
@@ -414,7 +414,7 @@ export default {
       } else if (pickerType == '4') {
         this.columns = [
           { id: 0, text: '有' },
-          { id: 1, text: '无' },
+          { id: 1, text: '无' }
         ]
       } else if (pickerType == '5') {
         this.columns = DataDictionary.taxIdentity
@@ -600,8 +600,8 @@ export default {
         flag: 'navigation',
         extra: {
           title: '指定受益人信息',
-          hiddenRight: '1',
-        },
+          hiddenRight: '1'
+        }
       })
       // let { customerName, customerSex } = data
       this.userInfo.name = data.customerName //用户名
@@ -664,7 +664,7 @@ export default {
       // }
       console.log(insuredDetail)
       // 页面跳转
-      this.$validator.validate().then((valid) => {
+      this.$validator.validate().then(valid => {
         if (true === valid) {
           // 受益人是被保人的配偶
           if (this.userInfo.relationToInsured == '2') {
@@ -675,7 +675,7 @@ export default {
               }
             }
             //与被保人关系是配偶
-            let insuredInfo = JSON.parse(this.saleInsuredPersonInfo)
+            let insuredInfo = this.saleInsuredPersonInfo
             //如果投保人不是已婚
             if (insuredInfo.marriage != '1') {
               return this.$toast('与被保人关系有误')
@@ -805,7 +805,7 @@ export default {
             beneficiaries = JSON.parse(localStorage.beneficiaryInfo)
             // 收益份额不超过 100%
             let ratio = 0
-            beneficiaries.forEach((item) => {
+            beneficiaries.forEach(item => {
               ratio += parseInt(item.bnfLot)
             })
             ratio += parseInt(this.userInfo.bnfLot)
@@ -816,7 +816,7 @@ export default {
 
             if (this.userInfo.idNo != '') {
               // 受益人不能重复添加 (证件号码为基准)
-              let isDbAdd = beneficiaries.some((item) => {
+              let isDbAdd = beneficiaries.some(item => {
                 return item.idNo == this.userInfo.idNo
               })
               console.log(isDbAdd)
@@ -841,11 +841,11 @@ export default {
             flag: 'h5',
             extra: {
               url: location.origin + '/#/sale/beneficiary',
-              needRefresh: '1',
+              needRefresh: '1'
             },
             routerInfo: {
-              path: '/sale/beneficiary',
-            },
+              path: '/sale/beneficiary'
+            }
           })
         } else {
           this.$toast(this.$validator.errors.all()[0])
@@ -1042,15 +1042,15 @@ export default {
       // } else {
       //   this.idLimit = false
       // }
-    },
+    }
   },
   filters: {
-    idToText: filter.idToText,
+    idToText: filter.idToText
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
     next()
-  },
+  }
 }
 </script>
 <style lang="scss" scoped>

From 066265188c3d869677ef07d8cb756698b7dd2ae6 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 17 Apr 2020 13:18:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=9C=A8=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=88=B1=E6=98=93=E4=BF=9D?=
 =?UTF-8?q?=E7=9A=84=20riskType=EF=BC=88=E4=BA=A7=E5=93=81=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 2f03fa830..37e3fd574 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -931,6 +931,11 @@ export default {
       shortName: '寿险',
       name: '国富人寿国富栋梁定期寿险',
       code: 'GFRS_M0020'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿爱易保重大疾病保险',
+      code: 'GFRSPRO_M0021'
     }
   ],
   // 职级