From dec1a98af24f53db6c02378d72b0a4372ecc4791 Mon Sep 17 00:00:00 2001
From: lihaoda <li.haoda@ebiz-fooge.com>
Date: Fri, 21 Feb 2020 15:55:29 +0800
Subject: [PATCH] fix

---
 src/views/ebiz/nbs/Base.vue     | 19 +++++++++++++------
 src/views/ebiz/nbs/Chart.vue    | 31 +++++++++++++++++++++++++++----
 src/views/ebiz/nbs/CrewList.vue |  1 +
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/views/ebiz/nbs/Base.vue b/src/views/ebiz/nbs/Base.vue
index ee7251a38..3d5b3d790 100644
--- a/src/views/ebiz/nbs/Base.vue
+++ b/src/views/ebiz/nbs/Base.vue
@@ -259,11 +259,18 @@ export default {
       this.$validator.validateAll().then(res => {
         if (res) {
           let familyList = this.form.proposalNbsFamilyDTOLst
-          //本人和配偶性别不能相同
-          let mySex = this.form.customerSex
-          if (familyList.some(v => v && v.relation === '00' && v.familySex === mySex)) {
-            this.$toast('本人和配偶性别不能相同')
-            return
+          //本人和配偶性别不能相同、父母性别验证
+          for (let i = 0; i < familyList.length; i++) {
+            let familyItem = familyList[i]
+            if (!familyItem) continue
+            if (familyItem.relation === '00' && familyItem.familySex === this.form.customerSex) {
+              this.$toast('本人和配偶性别不能相同')
+              return
+            } else if ((familyItem.relation === '02' || familyItem.relation === '04') && familyItem.familySex !== '0') {
+              this.$toast('父亲的性别必须是男')
+            } else if ((familyItem.relation === '03' || familyItem.relation === '05') && familyItem.familySex !== '1') {
+              this.$toast('母亲的性别必须是女')
+            }
           }
 
           //验证家庭信息
@@ -298,7 +305,7 @@ export default {
             } else {
               //如果不需要验证，说明这一项全部是空的，需要删掉
               //这里设置成null 后面会删掉
-              familyItem = null
+              familyList[i] = null
             }
           }
 
diff --git a/src/views/ebiz/nbs/Chart.vue b/src/views/ebiz/nbs/Chart.vue
index d9c0bdba0..373011233 100644
--- a/src/views/ebiz/nbs/Chart.vue
+++ b/src/views/ebiz/nbs/Chart.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="nbs-chart-container">
-    <div class="chart"></div>
+    <div class="chart">
+      <div class="chart-wrapper"></div>
+      <div class="chart-sum">{{ sum }}</div>
+    </div>
     <div class="list">
       <ul>
         <li v-for="item in data" @click="entryList(item.code)">
@@ -16,11 +19,12 @@ import { nbsChart } from '@/api/ebiz/nbs'
 export default {
   data() {
     return {
-      data: []
+      data: [],
+      sum: 0
     }
   },
   mounted() {
-    let chart = window.echarts.init(document.querySelector('.chart'))
+    let chart = window.echarts.init(document.querySelector('.chart-wrapper'))
     let option = {
       series: [
         {
@@ -59,9 +63,11 @@ export default {
             name = '销售成功'
             break
         }
+        let num = Number(v.amount)
+        this.sum += num
         return {
           name,
-          value: Number(v.amount),
+          value: num,
           code: v.nbsState
         }
       })
@@ -93,7 +99,24 @@ export default {
   height: 100vh;
 }
 .chart {
+  position: relative;
   flex-grow: 1;
+  &-wrapper {
+    position: relative;
+    z-index: 100;
+    height: 100%;
+    width: 100%;
+  }
+  &-sum {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    width: 100%;
+  }
 }
 .list {
   height: 207px;
diff --git a/src/views/ebiz/nbs/CrewList.vue b/src/views/ebiz/nbs/CrewList.vue
index 79e00ea60..1bd83fb76 100644
--- a/src/views/ebiz/nbs/CrewList.vue
+++ b/src/views/ebiz/nbs/CrewList.vue
@@ -61,6 +61,7 @@ export default {
     },
     entryResult(item) {
       let { orderNo, flag, nbsState } = item
+      if (nbsState === '01') return
       this.$jump({
         flag: 'h5',
         extra: {