From 5772945106d16ba5e548b00f49c1102b4dcff61d Mon Sep 17 00:00:00 2001
From: lihaoda <li.haoda@ebiz-fooge.com>
Date: Tue, 11 Feb 2020 17:32:04 +0800
Subject: [PATCH] fix

---
 src/assets/js/utils/data-dictionary.js |  2 +-
 src/views/ebiz/nbs/Detail.vue          | 37 +++++++++++++++++++++-----
 src/views/ebiz/nbs/List.vue            |  2 +-
 src/views/ebiz/nbs/Necessary.vue       |  6 ++---
 src/views/ebiz/nbs/Prepared.vue        |  4 +--
 5 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index adfa6157f..b5e82b507 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -1643,6 +1643,6 @@ export default {
   insuranceDictionary: [
     { code: '01', value: '寿险' },
     { code: '02', value: '重疾' },
-    { code: '03', value: '年金' }
+    // { code: '03', value: '年金' }
   ]
 }
diff --git a/src/views/ebiz/nbs/Detail.vue b/src/views/ebiz/nbs/Detail.vue
index 3ec0cbd93..e9c70922c 100644
--- a/src/views/ebiz/nbs/Detail.vue
+++ b/src/views/ebiz/nbs/Detail.vue
@@ -1,10 +1,22 @@
 <template>
   <div>
+    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">基本信息</p>
     <van-field readonly label="姓名" name="姓名" v-model="form.customerName"></van-field>
     <van-field readonly label="性别" name="性别" :value="getSex(form.customerSex)"></van-field>
     <van-field readonly label="出生日期" name="出生日期" v-model="form.birthday"></van-field>
-    <van-field required label="年龄" name="年龄" v-model="form.age" readonly></van-field>
-    <van-field required label="职业" name="职业" v-model="form.professionName" readonly></van-field>
+    <van-field label="年龄" name="年龄" v-model="form.age" readonly></van-field>
+    <!-- 为了让职业可以换行 -->
+    <!-- <van-field label="职业" name="职业" v-model="form.professionName" readonly></van-field> -->
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label">
+        <span>职业</span>
+      </div>
+      <div class="van-cell__value">
+        <div class="van-field__body" style="color: #323233;text-align: left">
+          {{form.professionName}}
+        </div>
+      </div>
+    </div>
     <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">家庭信息</p>
     <div class="relation">
       <div v-for="(item, index) in form.proposalNbsFamilyDTOLst" :key="index">
@@ -14,12 +26,23 @@
           <van-field readonly label="性别" name="性别" :value="getSex(item.familySex)"></van-field>
           <van-field readonly label="出生日期" name="出生日期" v-model="item.familyBirthday"></van-field>
           <van-field label="年龄" name="年龄" v-model="item.familyAge" readonly></van-field>
-          <van-field label="职业" name="职业" v-model="item.familyProfessionName" readonly></van-field>
+          <!-- 为了让职业可以换行 -->
+          <!-- <van-field label="职业" name="职业" v-model="item.familyProfessionName" readonly></van-field> -->
+          <div class="van-cell van-field">
+            <div class="van-cell__title van-field__label">
+              <span>职业</span>
+            </div>
+            <div class="van-cell__value">
+              <div class="van-field__body" style="color: #323233;text-align: left">
+                {{item.familyProfessionName}}
+              </div>
+            </div>
+          </div>
         </template>
       </div>
     </div>
 
-    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">基本信息</p>
+    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">需求顺位</p>
     <van-field readonly label="第一顺位需求" name="第一顺位需求" placeholder="请选择" :value="getNecessaryText(form.firstCostRequirements)"></van-field>
     <van-field readonly label="第二顺位需求" name="第二顺位需求" placeholder="请选择" :value="getNecessaryText(form.secondCostRequirements)"></van-field>
     <van-field readonly label="第三顺位需求" name="第三顺位需求" placeholder="请选择" :value="getNecessaryText(form.thirdCostRequirements)"></van-field>
@@ -59,7 +82,7 @@
       placeholder="请输入"
       v-model="form.wifeEstimateTotalassets"
     ></van-field>
-    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">其他费用</p>
+    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">其它费用</p>
     <div v-for="(item, index) in form.proposalNbsProjectCostInfoDTOLst" :key="index">
       <template v-if="item">
         <van-field readonly label="对象" name="对象" placeholder="请选择" :value="getTargetText(item.object)"></van-field>
@@ -82,12 +105,12 @@
     <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">收入及储蓄</p>
     <van-field readonly label="目前年收入（万元）" name="目前年收入（万元）" placeholder="请输入" v-model="form.myAnnualIncome"></van-field>
     <van-field readonly label="预计工作至（岁）" name="预计工作至（岁）" placeholder="请输入" v-model="form.myFutureWorkinglife"></van-field>
-    <van-field readonly label="其他收入（万元/年）" name="其他收入（万元/年）" placeholder="请输入" v-model="form.myOtherRevenue"></van-field>
+    <van-field readonly label="其它收入（万元/年）" name="其它收入（万元/年）" placeholder="请输入" v-model="form.myOtherRevenue"></van-field>
     <van-field readonly label="预计可收年数（年）" name="预计可收年数（年）" placeholder="请输入" v-model="form.myOtherRevenueExpectedyear"></van-field>
     <van-field readonly label="现有储蓄（万元）" name="现有储蓄（万元）" placeholder="请输入" v-model="form.myAssets"></van-field>
     <van-field readonly label="配偶目前年收入（万元）" name="配偶目前年收入（万元）" placeholder="请输入" v-model="form.wifeAnnualIncome"></van-field>
     <van-field readonly label="配偶预计工作至（岁）" name="配偶预计工作至（岁）" placeholder="请输入" v-model="form.wifeFutureWorkinglife"></van-field>
-    <van-field readonly label="配偶其他收入（万元/年）" name="配偶其他收入（万元/年）" placeholder="请输入" v-model="form.wifeOtherRevenue"></van-field>
+    <van-field readonly label="配偶其它收入（万元/年）" name="配偶其它收入（万元/年）" placeholder="请输入" v-model="form.wifeOtherRevenue"></van-field>
     <van-field
       readonly
       label="配偶预计可收年数（年）"
diff --git a/src/views/ebiz/nbs/List.vue b/src/views/ebiz/nbs/List.vue
index adf2b3c75..1daef29c9 100644
--- a/src/views/ebiz/nbs/List.vue
+++ b/src/views/ebiz/nbs/List.vue
@@ -11,7 +11,7 @@
       <div v-for="(item, index) in list" :key="item.orderNo">
         <div class="text-center fs12 mv15">{{ item.dateOfEntry }}</div>
         <div class="bg-white m15 p15">
-          <div class="fs14">{{ item.customerName }}</div>
+          <div class="fs14">{{ item.customerName }}的智能分析</div>
           <div class="text-right mt5">
             <template v-if="params.nbsState === '01'">
               <van-button class="ml5" type="danger" size="small" round @click="edit(item.orderNo)">编辑</van-button>
diff --git a/src/views/ebiz/nbs/Necessary.vue b/src/views/ebiz/nbs/Necessary.vue
index ef5e3bc21..001b432d1 100644
--- a/src/views/ebiz/nbs/Necessary.vue
+++ b/src/views/ebiz/nbs/Necessary.vue
@@ -64,7 +64,7 @@
       placeholder="请输入"
       v-model="form.wifeEstimateTotalassets"
     ></van-field>
-    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">其他费用</p>
+    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">其它费用</p>
     <div v-for="(item, index) in form.proposalNbsProjectCostInfoDTOLst" :key="index">
       <template v-if="item">
         <van-field
@@ -101,7 +101,7 @@
         <div class="nbs-del" @click="del(index)"><van-icon name="delete"></van-icon></div>
       </template>
     </div>
-    <div class="nbs-add" @click="add">+ 添加其他费用</div>
+    <div class="nbs-add" @click="add">+ 添加其它费用</div>
     <van-button type="danger" class="bottom-btn" @click="submit" v-no-more-click="1000">完成</van-button>
 
     <!-- 顺位需求选择 -->
@@ -128,7 +128,7 @@ let necessaryDictionary = dataDictionary.necessaryDictionary
 //对象字典
 let targetDictionary = dataDictionary.targetDictionary
 
-//其他费用
+//其它费用
 let otherCost = {
   object: '',
   projectName: '',
diff --git a/src/views/ebiz/nbs/Prepared.vue b/src/views/ebiz/nbs/Prepared.vue
index b609415ff..c632a8bf1 100644
--- a/src/views/ebiz/nbs/Prepared.vue
+++ b/src/views/ebiz/nbs/Prepared.vue
@@ -33,12 +33,12 @@
     <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">收入及储蓄</p>
     <van-field clearable label="目前年收入（万元）" name="目前年收入（万元）" placeholder="请输入" v-model="form.myAnnualIncome"></van-field>
     <van-field clearable label="预计工作至（岁）" name="预计工作至（岁）" placeholder="请输入" v-model="form.myFutureWorkinglife"></van-field>
-    <van-field clearable label="其他收入（万元/年）" name="其他收入（万元/年）" placeholder="请输入" v-model="form.myOtherRevenue"></van-field>
+    <van-field clearable label="其它收入（万元/年）" name="其它收入（万元/年）" placeholder="请输入" v-model="form.myOtherRevenue"></van-field>
     <van-field clearable label="预计可收年数（年）" name="预计可收年数（年）" placeholder="请输入" v-model="form.myOtherRevenueExpectedyear"></van-field>
     <van-field clearable label="现有储蓄（万元）" name="现有储蓄（万元）" placeholder="请输入" v-model="form.myAssets"></van-field>
     <van-field clearable label="配偶目前年收入（万元）" name="配偶目前年收入（万元）" placeholder="请输入" v-model="form.wifeAnnualIncome"></van-field>
     <van-field clearable label="配偶预计工作至（岁）" name="配偶预计工作至（岁）" placeholder="请输入" v-model="form.wifeFutureWorkinglife"></van-field>
-    <van-field clearable label="配偶其他收入（万元/年）" name="配偶其他收入（万元/年）" placeholder="请输入" v-model="form.wifeOtherRevenue"></van-field>
+    <van-field clearable label="配偶其它收入（万元/年）" name="配偶其它收入（万元/年）" placeholder="请输入" v-model="form.wifeOtherRevenue"></van-field>
     <van-field
       clearable
       label="配偶预计可收年数（年）"