Merge branch 'nbs' into hotfix/bug_nbs

src/api/ebiz/nbs/index.js

@@ -0,0 +1,67 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+//事件列表
+export function getList(data) {
+  return request({
+    url: getUrl('/proposal/nbs/getProposalNbsList', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function saveForm(data) {
+  return request({
+    url: getUrl('/proposal/nbs/saveOrUpdateProposalNbs', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function delNbs(data) {
+  return request({
+    url: getUrl('/proposal/nbs/deleteProposalNbs', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function completeNbs(data) {
+  return request({
+    url: getUrl('/proposal/nbs/modifyProposalNbsState', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function nbsDetail(data) {
+  return request({
+    url: getUrl('/proposal/nbs/getProposalNbsDemo', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function nbsChart(data) {
+  return request({
+    url: getUrl('/proposal/nbs/getProposalNbsStatistics', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function nbsTable(data) {
+  return request({
+    url: getUrl('/proposal/nbs/getProposalNbsStatisticsDetail', 1),
+    method: 'post',
+    data
+  })
+}
+
+export function makePDF(data) {
+  return request({
+    url: getUrl('/proposal/nbs/getPdfInfo', 1),
+    method: 'post',
+    data
+  })
+}

src/assets/js/common.js

@@ -206,5 +206,18 @@ export default {
       isWeixin: ua.match(/MicroMessenger/i),
       isDC: ua.match(/guofulife/i) //app环境
     }
+  },
+
+  deepCopy: function deepCopy(source) {
+    let result
+    if (Array.isArray(source)) {
+      result = source.map(v => deepCopy(v))
+    } else if (typeof source === 'object' && source !== null) {
+      result = {}
+      Object.keys(source).forEach(v => (result[v] = deepCopy(source[v])))
+    } else {
+      result = source
+    }
+    return result
   }
 }

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

@@ -1313,9 +1313,21 @@ export default {
     { id: 'EAM', text: '资深部经理' },
     { id: 'AD', text: '营业总监' }
   ],
-  relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }],
+  relationType: [
-  guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }],
+    { id: '0', text: '配偶' },
-  classification: [{ id: '0', text: '司内' }, { id: '1', 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: '安哥拉' },
@@ -1607,5 +1619,35 @@ export default {
     { id: '06', text: '医护' },
     { id: '07', text: '保险外勤' },
     { id: '08', text: '其它' }
+  ],
+  //对象
+  targetDictionary: [
+    { value: '本人', code: '00' },
+    { value: '配偶', code: '01' }
+  ],
+  nbsRelation: [
+    { name: '配偶', value: '00' },
+    { name: '子女', value: '01' },
+    { name: '本人父亲', value: '02' },
+    { name: '本人母亲', value: '03' },
+    { name: '配偶父亲', value: '04' },
+    { name: '配偶母亲', value: '05' }
+  ],
+  //顺位需求
+  necessaryDictionary: [
+    { code: '01', value: '生活费用' },
+    { code: '02', value: '父母孝养金' },
+    { code: '03', value: '房贷房租费用' },
+    { code: '04', value: '最后费用' },
+    { code: '05', value: '教育费用' },
+    { code: '06', value: '医疗费用' },
+    { code: '07', value: '资产传承' },
+    { code: '08', value: '其他费用' }
+  ],
+  //险种类型字典
+  insuranceDictionary: [
+    { code: '01', value: '寿险' },
+    { code: '02', value: '重疾' },
+    // { code: '03', value: '年金' }
   ]
 }

src/assets/sass/nbs.scss

@@ -0,0 +1,29 @@
+@mixin container {
+  box-sizing: border-box;
+  min-height: 100vh;
+  padding-bottom: 50px;
+  background: #fff;
+}
+.nbs-del,
+.nbs-add {
+  height: 32px;
+  width: 347px;
+  margin: 10px auto 0 auto;
+  line-height: 32px;
+}
+.nbs-del {
+  border: 1px solid #f2f2f2;
+  background-color: #f2f2f2;
+  font-size: 20px;
+  text-align: right;
+  /deep/ i {
+    position: relative;
+    top: 6px;
+    right: 5px;
+  }
+}
+.nbs-add {
+  border: 1px solid #e3e3e3;
+  text-align: center;
+  font-size: 14px;
+}

src/components/ebiz/FieldDatePicter.vue

@@ -29,6 +29,12 @@ export default {
         return new Date('2040-12-31')
       }
     },
+    minDate: {
+      type: Date,
+      default: () => {
+        return new Date('1900-01-01')
+      }
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -77,8 +83,8 @@ export default {
       currentDate: beforeDate.getBeforeYear(30), //当前时间的30年前
       showDataPicker: false,
       data: '', //时间插件绑定的值
-      date: '', //field显示的值
+      date: '' //field显示的值
-      minDate: new Date('1900-01-01') //因为VANT组件默认是十年前
+      //minDate: new Date('1900-01-01') //因为VANT组件默认是十年前
     }
   },
   components: {

src/config/index.js

@@ -11,7 +11,7 @@ let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl // 保融支付的收银台
 console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {
   case 'dev':
-    apiDomain = 'http://139.199.50.151:7000/api/v1' // 国富api
+    apiDomain = 'http://139.199.50.151:7000/api/v1' // 国富api ///api/v1
     imgDomain = 'http://211.159.248.123:7012/updown' // dev
     // 静态服务资源
     assetsUrl = 'http://139.199.50.151:8000/app/'

src/filters/index.js

@@ -133,6 +133,11 @@ export default {
     // }
 
     // return str
+
+    //摘自国富群：这个在报文转换的时候，核心返回“—”的时候，直接返回空。 @于维琦(于维琦) 前端如果保额为空，直接展示“—”@皮伟(皮伟) 你跟她碰一下怎么改
+    if (moneyStr === null) {
+      return '—'
+    }
     let str = ''
     if (flag) {
       str = (moneyStr + '').replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,')

src/router/ebiz/index.js

@@ -9,5 +9,6 @@ import product from './product'
 import agentEenter from './agentEenter.js'
 import milestone from './milestone'
 import poster from './poster'
-import report from "./report"
+import report from './report'
-export default [...proposal, ...sale, ...customer, ...my, ...serve, ...common, ...product, ...agentEenter, ...milestone, ...poster, ...report] //根据需要进行删减
+import nbs from './nbs'
+export default [...proposal, ...sale, ...customer, ...my, ...serve, ...common, ...product, ...agentEenter, ...milestone, ...poster, ...report, ...nbs] //根据需要进行删减

src/router/ebiz/nbs.js

@@ -0,0 +1,102 @@
+let nbsList = () => import('@/views/ebiz/nbs/List')
+let nbsNav = () => import('@/views/ebiz/nbs/Nav')
+let nbsChart = () => import('@/views/ebiz/nbs/Chart')
+let nbsResult = () => import('@/views/ebiz/nbs/Result')
+let nbsCrewList = () => import('@/views/ebiz/nbs/CrewList')
+let nbsBase = () => import('@/views/ebiz/nbs/Base')
+let nbsNecessary = () => import('@/views/ebiz/nbs/Necessary')
+let nbsPrepared = () => import('@/views/ebiz/nbs/Prepared')
+let nbsDetail = () => import('@/views/ebiz/nbs/Detail')
+let nbsPDF = () => import('@/views/ebiz/nbs/PDF')
+export default [
+  {
+    path: '/nbs/list',
+    name: 'nbsList',
+    component: nbsList,
+    meta: {
+      title: 'NBS智能分析',
+      index: 1
+    }
+  },
+  {
+    path: '/nbs/nav/:id?',
+    name: 'nbsNav',
+    component: nbsNav,
+    meta: {
+      title: 'NBS智能分析',
+      index: 2
+    }
+  },
+  {
+    path: '/nbs/chart',
+    name: 'nbsChart',
+    component: nbsChart,
+    meta: {
+      title: 'NBS智能分析统计',
+      index: 3
+    }
+  },
+  {
+    path: '/nbs/result/:id/:half/:nbsState',
+    name: 'nbsResult',
+    component: nbsResult,
+    meta: {
+      title: 'NBS智能分析结果',
+      index: 4
+    }
+  },
+  {
+    path: '/nbs/crew-list/:code',
+    name: 'nbsCrewList',
+    component: nbsCrewList,
+    meta: {
+      title: '人员清单',
+      index: 5
+    }
+  },
+  {
+    path: '/nbs/base',
+    name: 'nbsBase',
+    component: nbsBase,
+    meta: {
+      title: '基本资料',
+      index: 6
+    }
+  },
+  {
+    path: '/nbs/necessary',
+    name: 'nbsNecessary',
+    component: nbsNecessary,
+    meta: {
+      title: '应备费用',
+      index: 7
+    }
+  },
+  {
+    path: '/nbs/prepared',
+    name: 'nbsPrepared',
+    component: nbsPrepared,
+    meta: {
+      title: '已备费用',
+      index: 8
+    }
+  },
+  {
+    path: '/nbs/detail/:id/:state',
+    name: 'nbsDetail',
+    component: nbsDetail,
+    meta: {
+      title: '资料',
+      index: 9
+    }
+  },
+  {
+    path: '/nbs/pdf/:id',
+    name: 'nbsPDF',
+    component: nbsPDF,
+    meta: {
+      title: 'PDF',
+      index: 10
+    }
+  }
+]

src/views/app/Home.vue

@@ -26,6 +26,7 @@
           <li><router-link to="/my/UserIncome">收入</router-link></li>
           <li><router-link to="/serve/list">保单列表</router-link></li>
           <li><router-link to="/agentEenter/agentEenterBasicInfor">自助入司</router-link></li>
+          <li><router-link to="/nbs/list">nbs列表</router-link></li>
         </ul>
       </li>
     </ul>