From 7c096f283e4de7f93b81faa607c5bdf85e1d8d78 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Tue, 24 Nov 2020 18:14:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feature:=20=E6=83=A0=E6=A1=82=E4=BF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 增加惠桂保路由, 页面
---
 src/router/ebiz/hgb.js        |  21 ++++
 src/router/ebiz/index.js      |   4 +-
 src/views/ebiz/hgb/Detail.vue |  36 +++++++
 src/views/ebiz/hgb/index.vue  | 185 ++++++++++++++++++++++++++++++++++
 4 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 src/router/ebiz/hgb.js
 create mode 100644 src/views/ebiz/hgb/Detail.vue
 create mode 100644 src/views/ebiz/hgb/index.vue

diff --git a/src/router/ebiz/hgb.js b/src/router/ebiz/hgb.js
new file mode 100644
index 000000000..7456a7bb1
--- /dev/null
+++ b/src/router/ebiz/hgb.js
@@ -0,0 +1,21 @@
+// 惠桂保路由信息
+const HgbIndex = () => import('@/views/ebiz/hgb')
+const Detail = () => import('@/views/ebiz/hgb/Detail')
+export default [
+  {
+    name: 'HgbIndex',
+    path: '/hgb/index',
+    component: HgbIndex,
+    meta: {
+      title: '惠桂保客户清单'
+    }
+  },
+  {
+    name: 'HgbDetail',
+    path: '/hgb/orderDetail',
+    component: Detail,
+    meta: {
+      title: '保单详情'
+    }
+  }
+]
diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js
index efc2d8cd6..d8d6e6f67 100644
--- a/src/router/ebiz/index.js
+++ b/src/router/ebiz/index.js
@@ -25,6 +25,7 @@ import attendance from './attendance'
 
 import renewalManage from './renewalManage'
 import question from './question'
+import hgb from './hgb'
 export default [
   ...proposal,
   ...sale,
@@ -49,5 +50,6 @@ export default [
   ...attendance,
   ...congratulation,
   ...renewalManage,
-  ...question
+  ...question,
+  ...hgb
 ] //根据需要进行删减
diff --git a/src/views/ebiz/hgb/Detail.vue b/src/views/ebiz/hgb/Detail.vue
new file mode 100644
index 000000000..32a6afa50
--- /dev/null
+++ b/src/views/ebiz/hgb/Detail.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="hgb-detail bg-white mt10 p20">
+    <van-cell :title="row.rowName" :value="row[row.key] | blankFilter" v-for="(row, i) in rowInfos" :key="i" />
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      rowInfos: [
+        { rowName: '保单号', key: 'orderNumber' },
+        { rowName: '投保人姓名', key: 'applicantName' },
+        { rowName: '投保人电话', key: 'applicantPhone' },
+        { rowName: '被保人姓名', key: 'insuredName' },
+        { rowName: '被保人电话', key: 'insuredPhone' },
+        { rowName: '被保人性别', key: 'insuredGender' },
+        { rowName: '被保人出生日期', key: 'insuredBirthday' },
+        { rowName: '生效日', key: 'effectiveDate' },
+        { rowName: '到期日', key: 'expireDate' }
+      ]
+    }
+  },
+  filters: {
+    blankFilter(val) {
+      return val ? val : '-'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .van-cell::after {
+  border: none;
+}
+</style>
diff --git a/src/views/ebiz/hgb/index.vue b/src/views/ebiz/hgb/index.vue
new file mode 100644
index 000000000..ab61c1dc6
--- /dev/null
+++ b/src/views/ebiz/hgb/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="hgb bg-white">
+    <p class="title p15">惠桂保销售量</p>
+    <div class="order-count">
+      <div class="available-count">
+        <p class="count-num active">10000</p>
+        <p class="count-text active">生效单量</p>
+      </div>
+      <div class="unavailable-count">
+        <p class="count-num inactive">10000</p>
+        <p class="count-text inactive">失效单量</p>
+      </div>
+    </div>
+    <p class="title p15 search">
+      <span>惠桂保客户明细</span>
+      <van-icon name="search" @click="idSidebarShow = true" />
+    </p>
+    <div class="table-container">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>序号</th>
+            <th>生效日</th>
+            <th>投保人</th>
+            <th>分单日</th>
+            <th>到期日</th>
+          </tr>
+        </thead>
+        <tbody>
+          <template v-if="tableData.length">
+            <tr v-for="(data, i) in tableData" :key="i" @click="toDetail(data)">
+              <td>{{ i + 1 }}</td>
+              <td v-for="(value, key, j) in data" :key="j">
+                {{ value }}
+              </td>
+            </tr>
+          </template>
+          <tr v-else>
+            <td colspan="5">暂无数据</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!-- 弹出层 -->
+    <van-popup v-model="idSidebarShow" position="left" :style="{ width: '70vw', height: '100%' }">
+      <p class="p15 fw600">查找</p>
+      <van-field label="生效日" placeholder="请选择" readonly @click="isSearchDateShow = true" />
+      <van-field label="担保人" placeholder="请输入" />
+
+      <div class="btn-group">
+        <van-button size="small">取消</van-button>
+        <van-button size="small" type="danger">确定</van-button>
+      </div>
+
+      <transition name="van-slide-up">
+        <div class="search-date" v-show="isSearchDateShow">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="isSearchDateShow = false"
+            @cancel="isSearchDateShow = false"
+          />
+        </div>
+      </transition>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import { Popup, DatetimePicker, Field } from 'vant'
+export default {
+  name: 'HgbIndex',
+  components: {
+    [Popup.name]: Popup,
+    [DatetimePicker.name]: DatetimePicker,
+    [Field.name]: Field
+  },
+  data() {
+    return {
+      minDate: new Date(2020, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(),
+      idSidebarShow: false,
+      isSearchDateShow: false,
+      tableData: [],
+      form: {
+        availableDate: '',
+        applicant: ''
+      }
+    }
+  },
+  methods: {
+    toDetail(data) {
+      console.log(data)
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#/hgb/orderDetail`
+        },
+        routerInfo: { path: `/hgb/orderDetail` }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.hgb {
+  min-height: 100vh;
+  .search {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .search-date {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+  .btn-group {
+    width: 100%;
+    display: flex;
+    justify-content: space-evenly;
+    position: absolute;
+    bottom: 20px;
+  }
+  .order-count {
+    text-align: center;
+    display: flex;
+    justify-content: space-between;
+    width: 70vw;
+    margin: 0 auto;
+    border: 1px solid #e4e4e4;
+    border-radius: 15px;
+    .available-count {
+      border-right: 1px solid #e4e4e4;
+    }
+    .available-count,
+    .unavailable-count {
+      flex: 1;
+      padding: 30px;
+    }
+    .count-num {
+      font-size: 20px;
+      font-weight: bolder;
+    }
+    .count-text {
+      margin-top: 1em;
+      font-size: 14px;
+      font-weight: bolder;
+    }
+    .active {
+      color: #ff0000;
+    }
+    .inactive {
+      color: #949494;
+    }
+  }
+  .table-container {
+    padding: 2px;
+    .table {
+      font-size: 14px;
+      width: 100%;
+      border-collapse: collapse;
+      thead {
+        background-color: #ff0033;
+        color: #fff;
+        border: 1px solid #ff0033;
+      }
+      th {
+        font-weight: normal;
+        padding: 10px 0;
+      }
+      td {
+        text-align: center;
+        padding: 10px 0;
+        border: 1px solid #bcbcbc;
+      }
+    }
+  }
+}
+</style>

From be1c9bf7c9dcd961ce7a22ede4cf5924cf0bb0dc Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Wed, 25 Nov 2020 13:43:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feature:=20=E6=83=A0=E6=A1=82=E4=BF=9D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 调试数据查询接口
2. 增加分页, 筛选功能
---
 src/api/ebiz/hgb/index.js    |  11 ++++
 src/views/ebiz/hgb/index.vue | 108 ++++++++++++++++++++++++++++-------
 2 files changed, 99 insertions(+), 20 deletions(-)
 create mode 100644 src/api/ebiz/hgb/index.js

diff --git a/src/api/ebiz/hgb/index.js b/src/api/ebiz/hgb/index.js
new file mode 100644
index 000000000..f69846a76
--- /dev/null
+++ b/src/api/ebiz/hgb/index.js
@@ -0,0 +1,11 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+// 惠桂保数据查询
+export function selectHgb(data) {
+  return request({
+    url: getUrl('/sale/order/selectHgb', 1),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/ebiz/hgb/index.vue b/src/views/ebiz/hgb/index.vue
index ab61c1dc6..e679c0744 100644
--- a/src/views/ebiz/hgb/index.vue
+++ b/src/views/ebiz/hgb/index.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="hgb bg-white">
+  <div class="hgb bg-white pb60">
     <p class="title p15">惠桂保销售量</p>
     <div class="order-count">
       <div class="available-count">
-        <p class="count-num active">10000</p>
+        <p class="count-num active">{{ cvilNum }}</p>
         <p class="count-text active">生效单量</p>
       </div>
       <div class="unavailable-count">
-        <p class="count-num inactive">10000</p>
+        <p class="count-num inactive">{{ uncvilNum }}</p>
         <p class="count-text inactive">失效单量</p>
       </div>
     </div>
@@ -41,27 +41,32 @@
         </tbody>
       </table>
     </div>
+
+    <!-- 分页 -->
+    <div class="pagination bg-white" v-if="tableData.length">
+      <van-pagination v-model="currentPage" :total-items="totalItems" :items-per-page="10" />
+    </div>
+
     <!-- 弹出层 -->
-    <van-popup v-model="idSidebarShow" position="left" :style="{ width: '70vw', height: '100%' }">
+    <van-popup
+      @click.native.self="isSearchDateShow = false"
+      v-model="idSidebarShow"
+      position="left"
+      :style="{ width: '70vw', height: '100%' }"
+      @close="onSideBarClosed"
+    >
       <p class="p15 fw600">查找</p>
-      <van-field label="生效日" placeholder="请选择" readonly @click="isSearchDateShow = true" />
-      <van-field label="担保人" placeholder="请输入" />
+      <van-field v-model="param.startDate" label="生效日" placeholder="请选择" readonly @click="isSearchDateShow = true" />
+      <van-field v-model="param.prtName" maxlength="10" label="担保人" placeholder="请输入" />
 
       <div class="btn-group">
-        <van-button size="small">取消</van-button>
-        <van-button size="small" type="danger">确定</van-button>
+        <van-button size="small" @click="idSidebarShow = false">取消</van-button>
+        <van-button size="small" type="danger" @click="queryData">确定</van-button>
       </div>
 
       <transition name="van-slide-up">
         <div class="search-date" v-show="isSearchDateShow">
-          <van-datetime-picker
-            v-model="currentDate"
-            type="date"
-            :min-date="minDate"
-            :max-date="maxDate"
-            @confirm="isSearchDateShow = false"
-            @cancel="isSearchDateShow = false"
-          />
+          <van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onSearchDateConfirm" @cancel="isSearchDateShow = false" />
         </div>
       </transition>
     </van-popup>
@@ -69,18 +74,24 @@
 </template>
 
 <script>
-import { Popup, DatetimePicker, Field } from 'vant'
+import { Popup, DatetimePicker, Field, Pagination } from 'vant'
+import { selectHgb } from '@/api/ebiz/hgb'
+import dateUtil from '@/assets/js/utils/date-utils'
+
 export default {
   name: 'HgbIndex',
   components: {
     [Popup.name]: Popup,
     [DatetimePicker.name]: DatetimePicker,
-    [Field.name]: Field
+    [Field.name]: Field,
+    [Pagination.name]: Pagination
   },
   data() {
     return {
-      minDate: new Date(2020, 0, 1),
-      maxDate: new Date(2025, 10, 1),
+      totalItems: 0,
+      cvilNum: 0,
+      uncvilNum: 0,
+      maxDate: new Date(),
       currentDate: new Date(),
       idSidebarShow: false,
       isSearchDateShow: false,
@@ -88,10 +99,47 @@ export default {
       form: {
         availableDate: '',
         applicant: ''
+      },
+      currentPage: 1,
+      param: {
+        prtName: '',
+        startDate: '',
+        pageInfo: {
+          pageNum: 1,
+          pageSize: 10
+        }
       }
     }
   },
+  created() {
+    this.getData()
+  },
   methods: {
+    queryData() {
+      if (!this.param.startDate) {
+        return this.$toast('请选择生效日')
+      }
+      if (!this.param.prtName.trim()) {
+        return this.$toast('请输入担保人')
+      }
+      this.getData({ ...this.param })
+      this.idSidebarShow = false
+    },
+    onSearchDateConfirm(date) {
+      console.log(dateUtil.formatDate(date, 'yyyy-MM-dd'))
+      this.param.startDate = dateUtil.formatDate(date, 'yyyy-MM-dd')
+      this.isSearchDateShow = false
+    },
+    async getData(param) {
+      const res = await selectHgb(param ? param : this.param)
+      if (res.result === '0') {
+        this.cvilNum = res.content.cvilNum
+        this.uncvilNum = res.content.uncvilNum
+        this.totalItems = res.content.list.total
+      } else {
+        this.$toast(res.resultMessage)
+      }
+    },
     toDetail(data) {
       console.log(data)
       this.$jump({
@@ -101,6 +149,10 @@ export default {
         },
         routerInfo: { path: `/hgb/orderDetail` }
       })
+    },
+    onSideBarClosed() {
+      this.param.startDate = ''
+      this.param.prtName = ''
     }
   }
 }
@@ -181,5 +233,21 @@ export default {
       }
     }
   }
+
+  .pagination {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+}
+
+::v-deep .van-pagination__item {
+  color: #ff0033;
+}
+
+::v-deep .van-pagination__item--active {
+  background-color: #ff0033;
+  color: #fff;
 }
 </style>

From 73c9d0d5fb5f7c86449b89e73744d3e0a755e738 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Thu, 26 Nov 2020 10:18:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feature:=20=E6=83=A0=E6=A1=82=E4=BF=9D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 调试数据查询接口
2. 调试详情信息接口
---
 src/api/ebiz/hgb/index.js      |  8 +++++
 src/assets/js/utils/request.js |  8 ++---
 src/router/ebiz/hgb.js         |  3 +-
 src/views/ebiz/hgb/Detail.vue  | 53 +++++++++++++++++++++++++++++++---
 src/views/ebiz/hgb/index.vue   | 20 +++++++++----
 5 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/src/api/ebiz/hgb/index.js b/src/api/ebiz/hgb/index.js
index f69846a76..466b5075a 100644
--- a/src/api/ebiz/hgb/index.js
+++ b/src/api/ebiz/hgb/index.js
@@ -9,3 +9,11 @@ export function selectHgb(data) {
     data
   })
 }
+
+export function selectHgbDetail(data) {
+  return request({
+    url: getUrl('/sale/order/getHgbDetail', 1),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js
index 5949232a7..23b56eac4 100644
--- a/src/assets/js/utils/request.js
+++ b/src/assets/js/utils/request.js
@@ -79,14 +79,13 @@ let productStore = [
   '/customer/shop/getShareList' //查询分享轨迹(转发记录)
 ]
 
-// 卡单
-let cardList = []
-
 // 续期
 let renewalManage = [
   '/renewal/getRenewalList' //续期列表查询
 ]
 
+let hgb = ['/sale/order/selectHgb', '/sale/order/getHgbDetail']
+
 let whiteList = [
   '/customer/agent/getCustomersList',
   ...proposal,
@@ -97,7 +96,8 @@ let whiteList = [
   ...manpower,
   ...productStore,
   ...preserve,
-  ...renewalManage
+  ...renewalManage,
+  ...hgb
 ]
 
 // 创建axios实例
diff --git a/src/router/ebiz/hgb.js b/src/router/ebiz/hgb.js
index 7456a7bb1..926752131 100644
--- a/src/router/ebiz/hgb.js
+++ b/src/router/ebiz/hgb.js
@@ -12,8 +12,9 @@ export default [
   },
   {
     name: 'HgbDetail',
-    path: '/hgb/orderDetail',
+    path: '/hgb/orderDetail/:prtNo',
     component: Detail,
+    props: true,
     meta: {
       title: '保单详情'
     }
diff --git a/src/views/ebiz/hgb/Detail.vue b/src/views/ebiz/hgb/Detail.vue
index 32a6afa50..8b9e6805d 100644
--- a/src/views/ebiz/hgb/Detail.vue
+++ b/src/views/ebiz/hgb/Detail.vue
@@ -1,11 +1,17 @@
 <template>
   <div class="hgb-detail bg-white mt10 p20">
-    <van-cell :title="row.rowName" :value="row[row.key] | blankFilter" v-for="(row, i) in rowInfos" :key="i" />
+    <van-cell :title="row.rowName" :value="blankFilter(row.key)" v-for="(row, i) in rowInfos" :key="i" />
   </div>
 </template>
 
 <script>
+import { selectHgbDetail } from '@/api/ebiz/hgb'
 export default {
+  props: {
+    prtNo: {
+      type: String
+    }
+  },
   data() {
     return {
       rowInfos: [
@@ -18,12 +24,51 @@ export default {
         { rowName: '被保人出生日期', key: 'insuredBirthday' },
         { rowName: '生效日', key: 'effectiveDate' },
         { rowName: '到期日', key: 'expireDate' }
-      ]
+      ],
+      orderNumber: '',
+      applicantName: '',
+      applicantPhone: '',
+      insuredName: '',
+      insuredPhone: '',
+      insuredGender: '',
+      insuredBirthday: '',
+      effectiveDate: '',
+      expireDate: ''
     }
   },
-  filters: {
+  created() {
+    this.getData()
+  },
+  methods: {
+    async getData() {
+      const res = await selectHgbDetail({ policyNo: this.prtNo })
+      if (res.result === '0') {
+        if (res.content && res.content.data) {
+          let appntDTO = res.content.data.appntDTO
+          if (appntDTO) {
+            this.applicantName = appntDTO.name
+            this.applicantPhone = appntDTO.mobile
+          }
+          let insuredDTO = res.content.data.insuredDTOs[0]
+          if (insuredDTO) {
+            this.insuredName = insuredDTO.name
+            this.insuredPhone = insuredDTO.mobile
+            this.insuredGender = insuredDTO.sex === '0' ? '男' : insuredDTO.sex === '1' ? '女' : '-'
+            this.insuredBirthday = insuredDTO.birthday
+          }
+          let orderInfoDTO = res.content.data.orderInfoDTO
+          if (orderInfoDTO) {
+            this.orderNumber = orderInfoDTO.prtNo
+            this.effectiveDate = orderInfoDTO.cvaliDate
+            this.expireDate = orderInfoDTO.expiryDate
+          }
+        }
+      } else {
+        this.$toast(res.resultMessage)
+      }
+    },
     blankFilter(val) {
-      return val ? val : '-'
+      return this[val] ? this[val] : '-'
     }
   }
 }
diff --git a/src/views/ebiz/hgb/index.vue b/src/views/ebiz/hgb/index.vue
index e679c0744..2f62a21dd 100644
--- a/src/views/ebiz/hgb/index.vue
+++ b/src/views/ebiz/hgb/index.vue
@@ -22,7 +22,7 @@
             <th>序号</th>
             <th>生效日</th>
             <th>投保人</th>
-            <th>分单日</th>
+            <th>分单号</th>
             <th>到期日</th>
           </tr>
         </thead>
@@ -30,8 +30,8 @@
           <template v-if="tableData.length">
             <tr v-for="(data, i) in tableData" :key="i" @click="toDetail(data)">
               <td>{{ i + 1 }}</td>
-              <td v-for="(value, key, j) in data" :key="j">
-                {{ value }}
+              <td v-for="(key, j) in keys" :key="j">
+                {{ data[key] }}
               </td>
             </tr>
           </template>
@@ -44,7 +44,7 @@
 
     <!-- 分页 -->
     <div class="pagination bg-white" v-if="tableData.length">
-      <van-pagination v-model="currentPage" :total-items="totalItems" :items-per-page="10" />
+      <van-pagination v-model="currentPage" :total-items="totalItems" :items-per-page="10" @change="onPageChanged" />
     </div>
 
     <!-- 弹出层 -->
@@ -96,6 +96,7 @@ export default {
       idSidebarShow: false,
       isSearchDateShow: false,
       tableData: [],
+      keys: ['startDate', 'prtName', 'prtNo', 'endDate'],
       form: {
         availableDate: '',
         applicant: ''
@@ -115,6 +116,11 @@ export default {
     this.getData()
   },
   methods: {
+    onPageChanged(page) {
+      this.currentPage = page
+      this.param.pageInfo.pageNum = page
+      this.getData()
+    },
     queryData() {
       if (!this.param.startDate) {
         return this.$toast('请选择生效日')
@@ -132,10 +138,12 @@ export default {
     },
     async getData(param) {
       const res = await selectHgb(param ? param : this.param)
+      console.dir(res)
       if (res.result === '0') {
         this.cvilNum = res.content.cvilNum
         this.uncvilNum = res.content.uncvilNum
         this.totalItems = res.content.list.total
+        this.tableData = res.content.list.list
       } else {
         this.$toast(res.resultMessage)
       }
@@ -145,9 +153,9 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/hgb/orderDetail`
+          url: location.origin + `/#/hgb/orderDetail/${data.prtNo}`
         },
-        routerInfo: { path: `/hgb/orderDetail` }
+        routerInfo: { path: `/hgb/orderDetail/${data.prtNo}` }
       })
     },
     onSideBarClosed() {