diff --git a/src/api/ebiz/nbs/index.js b/src/api/ebiz/nbs/index.js
index 88fc08467..aa38d32d1 100644
--- a/src/api/ebiz/nbs/index.js
+++ b/src/api/ebiz/nbs/index.js
@@ -57,3 +57,11 @@ export function nbsTable(data) {
data
})
}
+
+export function makePDF(data) {
+ return request({
+ url: getUrl('/proposal/nbs/getPdfInfo', 1),
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
diff --git a/src/router/ebiz/nbs.js b/src/router/ebiz/nbs.js
index 7abcf869e..1bd0274c2 100644
--- a/src/router/ebiz/nbs.js
+++ b/src/router/ebiz/nbs.js
@@ -7,6 +7,7 @@ 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',
@@ -36,7 +37,7 @@ export default [
}
},
{
- path: '/nbs/result/:id',
+ path: '/nbs/result/:id/:half/:nbsState',
name: 'nbsResult',
component: nbsResult,
meta: {
@@ -88,5 +89,14 @@ export default [
title: '资料',
index: 9
}
+ },
+ {
+ path: '/nbs/pdf/:id',
+ name: 'nbsPDF',
+ component: nbsPDF,
+ meta: {
+ title: 'PDF',
+ index: 10
+ }
}
]
diff --git a/src/views/ebiz/nbs/List.vue b/src/views/ebiz/nbs/List.vue
index 93d7e48e8..ea1699cc6 100644
--- a/src/views/ebiz/nbs/List.vue
+++ b/src/views/ebiz/nbs/List.vue
@@ -22,7 +22,7 @@
>销售成功
资料
- 报告
+ 报告
删除
@@ -159,14 +159,15 @@ export default {
}
})
},
- entryReport(id) {
+ entryReport(id, flag) {
+ const state = this.params.nbsState
this.$jump({
flag: 'h5',
extra: {
- url: location.origin + `/#/nbs/result/${id}`
+ url: location.origin + `/#/nbs/result/${id}/${flag}/${state}`
},
routerInfo: {
- path: `/nbs/result/${id}`
+ path: `/nbs/result/${id}/${flag}/${state}`
}
})
}
diff --git a/src/views/ebiz/nbs/Nav.vue b/src/views/ebiz/nbs/Nav.vue
index 359b122f2..42d808941 100644
--- a/src/views/ebiz/nbs/Nav.vue
+++ b/src/views/ebiz/nbs/Nav.vue
@@ -32,7 +32,8 @@ import { nbsDetail, saveForm } from '@/api/ebiz/nbs'
export default {
data() {
return {
- status: -1 //-1还未填写 0填完基本信息 1填完应备费用 2填完已备费用
+ status: -1, //-1还未填写 0填完基本信息 1填完应备费用 2填完已备费用
+ half: null //这个值表示是否添加了配偶
}
},
created() {
@@ -44,7 +45,9 @@ export default {
nbsState: localStorage.getItem('nbsState')
}).then(res => {
if (res.result === '0') {
- this.status = Number(res.content.type)
+ const content = res.content
+ this.status = Number(content.type)
+ this.half = content.flag
} else {
this.$toast(res.resultMessage)
this.$jump({
@@ -96,10 +99,10 @@ export default {
this.$jump({
flag: 'h5',
extra: {
- url: location.origin + `/#/nbs/result/${id}`
+ url: location.origin + `/#/nbs/result/${id}/${this.half}/02`
},
routerInfo: {
- path: `/nbs/result/${id}`
+ path: `/nbs/result/${id}/${this.half}/02`
}
})
} else {
diff --git a/src/views/ebiz/nbs/PDF.vue b/src/views/ebiz/nbs/PDF.vue
new file mode 100644
index 000000000..43903f594
--- /dev/null
+++ b/src/views/ebiz/nbs/PDF.vue
@@ -0,0 +1,17 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ebiz/nbs/Result.vue b/src/views/ebiz/nbs/Result.vue
index 6f5621dfe..cede6c468 100644
--- a/src/views/ebiz/nbs/Result.vue
+++ b/src/views/ebiz/nbs/Result.vue
@@ -5,11 +5,46 @@
报告已生成,点击查看
-
经济支柱为客户本人
-
经济支柱为客户配偶
+
经济支柱为客户本人
+
经济支柱为客户配偶
+