From 9cd43f9b6015d16d51d232d88cdf8b0b3b5eb1a9 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Tue, 14 Apr 2020 10:24:32 +0800 Subject: [PATCH 01/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E9=80=80=E4=BF=9D=E3=80=91=E6=96=B0=E5=A2=9E=E9=80=80=E4=BF=9D?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E3=80=81=E4=BF=9D=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/index.js | 4 +- src/router/ebiz/preserve.js | 10 + src/views/ebiz/preserve/PolicyList.vue | 147 ++++++- src/views/ebiz/preserve/SurrenderTip.vue | 529 +++++++++++++++++++++++ 4 files changed, 687 insertions(+), 3 deletions(-) create mode 100644 src/views/ebiz/preserve/SurrenderTip.vue diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js index 89aa40040..7ee38d470 100644 --- a/src/router/ebiz/index.js +++ b/src/router/ebiz/index.js @@ -28,6 +28,6 @@ export default [ ...report, ...survey, ...nbs, - ...manpower - ...preserve + ...manpower, + ...preserve, ] //根据需要进行删减 diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index 0e21f2b8d..1929fb0a1 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -13,6 +13,7 @@ const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/BeneficiaryC const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') const autopayAuthorization = () => import('@/views/ebiz/preserve/AutopayAuthorization') +const surrenderTip = () => import('@/views/ebiz/preserve/SurrenderTip') export default [ { @@ -132,6 +133,15 @@ export default [ index: 12 } }, + { + path: '/preserve/surrenderTip', + name: 'surrenderTip', + component: surrenderTip, + meta: { + title: '退保协议', + index: 12 + } + }, { path: '/preserve/submitResult', name: 'submitResult', diff --git a/src/views/ebiz/preserve/PolicyList.vue b/src/views/ebiz/preserve/PolicyList.vue index 8f230b2ad..ddd7a71a4 100644 --- a/src/views/ebiz/preserve/PolicyList.vue +++ b/src/views/ebiz/preserve/PolicyList.vue @@ -1 +1,146 @@ - \ No newline at end of file + + + diff --git a/src/views/ebiz/preserve/SurrenderTip.vue b/src/views/ebiz/preserve/SurrenderTip.vue new file mode 100644 index 000000000..96c855534 --- /dev/null +++ b/src/views/ebiz/preserve/SurrenderTip.vue @@ -0,0 +1,529 @@ + + + + From 5041dfc24110382e065f7dbf1336925d96d5c82b Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 15 Apr 2020 21:59:10 +0800 Subject: [PATCH 02/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E7=BB=AD=E6=9C=9F=E8=B4=A6=E5=8F=B7=E5=8F=98=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AEmock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/request.js | 5 ++++- src/config/preserve.js | 6 ++++++ src/config/urlMap.js | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/config/preserve.js diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index e3f4096de..abdecd8a6 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -62,7 +62,10 @@ let survey = [ //'/customer/question/getTableId', // id 查询 -- ok '/customer/question/getAgentInfo' // 代理人详情 ] -let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey] +let preserve = [ + '/edor/customer/customerList' //客户搜索 +] +let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...preserve] // 创建axios实例 const service = axios.create({ diff --git a/src/config/preserve.js b/src/config/preserve.js new file mode 100644 index 000000000..8726735cb --- /dev/null +++ b/src/config/preserve.js @@ -0,0 +1,6 @@ +//保全 +let mockBaseUrl = 'http://mock-api.com/LwnaDLg1.mock' +export default { + '/edor/customer/customerList': mockBaseUrl + '/edor/customer/customerList', //客户搜索 + '/edor/customer/customerInfo': mockBaseUrl + '/edor/customer/customerInfo' //客户详情 +} diff --git a/src/config/urlMap.js b/src/config/urlMap.js index a75916286..7e6307d3c 100644 --- a/src/config/urlMap.js +++ b/src/config/urlMap.js @@ -11,6 +11,7 @@ import product from './product' import serve from './serve' import common from './common' import survey from './survey' +import preserve from './preserve' const mockBaseUrl = 'http://rap2api.taobao.org/app/mock' let baseObj = { @@ -18,6 +19,6 @@ let baseObj = { '/user/info': mockBaseUrl + '/223948/info', '/user/logout': mockBaseUrl + '/223948/logout' } -Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, survey) +Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, survey, preserve) export default baseObj From 2c5d5441978e870359ebbd12146d42391bb9f269 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 15 Apr 2020 22:00:22 +0800 Subject: [PATCH 03/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E7=BB=AD=E6=9C=9F=E3=80=91=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6=E6=8E=88=E6=9D=83=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/preserve/AutopayAuthorization.vue | 114 +++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/preserve/AutopayAuthorization.vue b/src/views/ebiz/preserve/AutopayAuthorization.vue index f95338a4f..2a872362f 100644 --- a/src/views/ebiz/preserve/AutopayAuthorization.vue +++ b/src/views/ebiz/preserve/AutopayAuthorization.vue @@ -1,4 +1,114 @@ \ No newline at end of file +
+
+ {{ `提示：阅读时长需在${time}秒以上` }} +
+

自动转账授权书

+

本人授权本人所在企业或国富人寿保险有限公司 (下称"国富人寿") 以下事项:

+

1、本人所在企业或国富人寿可从本投保页面上"银行信息"栏中的结算账户 (下称"结算账户") 中划扣本人应交付的保险费。

+

2、本人授权指定银行按本人所在企业或国富人寿保险费划转要求划扣保险费时,免于核对密码或签名。就上述授权转账事宜,本人声明确知并保证遵守如下规定:

+

+ 1、因账户内余额不足或其他非国富人寿原因导致保险费转账不成功的, 被保人应存入足够金额或重新提供有效结算账户,未及时支付保险费将导致当次投保申请失效。 +

+

2、本授权书为本人所在企业或国富人寿从本人指定的结算账户中扣款的授权证明,不作为收取现金的凭据。

+
+ + + + 本人确认已阅读 + 《国富人寿自动转账授权书》 + + +
+ +
+ 完成 +
+
+ + + \ No newline at end of file From 913ab8e7f25f95fdfb5a4203aca4e3192d6493d4 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 15 Apr 2020 22:03:04 +0800 Subject: [PATCH 04/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E7=BB=AD=E6=9C=9F=E3=80=91=E6=96=B0=E5=A2=9E=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=81=E7=BB=AD=E6=9C=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E7=A1=AE=E8=AE=A4=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/preserve/ImageUpload.vue | 448 ++++++++++++++++- .../ebiz/preserve/RenewalConfirmation.vue | 459 +++++++++++++++++- src/views/ebiz/preserve/RenewalInfo.vue | 332 ++++++++++++- 3 files changed, 1236 insertions(+), 3 deletions(-) diff --git a/src/views/ebiz/preserve/ImageUpload.vue b/src/views/ebiz/preserve/ImageUpload.vue index d3cafad27..5779885fd 100644 --- a/src/views/ebiz/preserve/ImageUpload.vue +++ b/src/views/ebiz/preserve/ImageUpload.vue @@ -1 +1,447 @@ - \ No newline at end of file + + + + + + diff --git a/src/views/ebiz/preserve/RenewalConfirmation.vue b/src/views/ebiz/preserve/RenewalConfirmation.vue index 4e81ad177..aed0f8dff 100644 --- a/src/views/ebiz/preserve/RenewalConfirmation.vue +++ b/src/views/ebiz/preserve/RenewalConfirmation.vue @@ -1 +1,458 @@ - \ No newline at end of file + + + + + + diff --git a/src/views/ebiz/preserve/RenewalInfo.vue b/src/views/ebiz/preserve/RenewalInfo.vue index c5e0dd4b5..f9a4156c9 100644 --- a/src/views/ebiz/preserve/RenewalInfo.vue +++ b/src/views/ebiz/preserve/RenewalInfo.vue @@ -1 +1,331 @@ - \ No newline at end of file + + + + + From 87614584cc5a49bb1ff6a744d1c7fcba8071a70e Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 15 Apr 2020 22:03:34 +0800 Subject: [PATCH 05/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E7=BB=AD=E6=9C=9F=E3=80=91=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 16 ++++++++++++++++ src/views/ebiz/preserve/Search.vue | 1 + 2 files changed, 17 insertions(+) diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index 34e4cb972..9a6b313eb 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -18,3 +18,19 @@ export function customerInfo(data) { data }) } +//保单列表 +export function policyList(data) { + return request({ + url: getUrl('/edor/customer/policyList', 1), + method: 'post', + data + }) +} +//续期账号变更 +export function renewalChange(data) { + return request({ + url: getUrl('/edor/item/change', 1), + method: 'post', + data + }) +} diff --git a/src/views/ebiz/preserve/Search.vue b/src/views/ebiz/preserve/Search.vue index 8352a4477..a673465df 100644 --- a/src/views/ebiz/preserve/Search.vue +++ b/src/views/ebiz/preserve/Search.vue @@ -149,6 +149,7 @@ export default { // delete res.content.coreCustomerDTOList //preserve-customerInfo -- 保全查询的客户详细信息 if (res.result == 0) { + res.content.entry = this.entry localStorage.setItem('preserve-customerInfo', JSON.stringify(res.content)) this.jupmTo(url) } else { From f45333d2676ac20f28ce2fae67572e34f1c348aa Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 15 Apr 2020 22:04:16 +0800 Subject: [PATCH 06/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E9=80=80=E4=BF=9D=E3=80=91=E6=96=B0=E5=A2=9E=E9=80=80=E4=BF=9D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E7=A1=AE=E8=AE=A4=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/preserve/SurrenderConfirmation.vue | 419 +++++++++++++++++- src/views/ebiz/preserve/SurrenderInfo.vue | 371 +++++++++++++++- 2 files changed, 788 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/preserve/SurrenderConfirmation.vue b/src/views/ebiz/preserve/SurrenderConfirmation.vue index 5627c94d6..65c647c46 100644 --- a/src/views/ebiz/preserve/SurrenderConfirmation.vue +++ b/src/views/ebiz/preserve/SurrenderConfirmation.vue @@ -1 +1,418 @@ - \ No newline at end of file + + + + + + diff --git a/src/views/ebiz/preserve/SurrenderInfo.vue b/src/views/ebiz/preserve/SurrenderInfo.vue index e680f7a0c..bb2b7df05 100644 --- a/src/views/ebiz/preserve/SurrenderInfo.vue +++ b/src/views/ebiz/preserve/SurrenderInfo.vue @@ -1 +1,370 @@ - \ No newline at end of file + + + + + + From eb3ee61e668c68b9f25ca799b02cc2a56206ea0d Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Thu, 16 Apr 2020 19:06:03 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E3=80=90new=E3=80=91=20=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 12 ++ src/config/preserve.js | 5 + src/config/urlMap.js | 3 +- src/router/ebiz/preserve.js | 12 +- src/views/ebiz/preserve/Progress.vue | 264 +++++++++++++++++++++++++++ 5 files changed, 294 insertions(+), 2 deletions(-) create mode 100644 src/config/preserve.js create mode 100644 src/views/ebiz/preserve/Progress.vue diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index e69de29bb..1d362ee25 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -0,0 +1,12 @@ +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' + +//获取海报类型 +export function progressListQuery(data) { + return request({ + url: getUrl('/edor/query/queryEdorList', 0), + method: 'post', + data + }) +} + diff --git a/src/config/preserve.js b/src/config/preserve.js new file mode 100644 index 000000000..206af0814 --- /dev/null +++ b/src/config/preserve.js @@ -0,0 +1,5 @@ +let mockBaseUrl = 'http://rap2.taobao.org:38080/app/mock/250585/' + +export default { + '/edor/query/queryEdorList': mockBaseUrl + '/edor/query/queryEdorList', +} diff --git a/src/config/urlMap.js b/src/config/urlMap.js index a75916286..6782f7e65 100644 --- a/src/config/urlMap.js +++ b/src/config/urlMap.js @@ -8,6 +8,7 @@ import sale from './sale' import customer from './customer' import my from './my' import product from './product' +import preserve from './preserve' import serve from './serve' import common from './common' import survey from './survey' @@ -18,6 +19,6 @@ let baseObj = { '/user/info': mockBaseUrl + '/223948/info', '/user/logout': mockBaseUrl + '/223948/logout' } -Object.assign(baseObj, proposal, sale, customer, my, product, serve, common, survey) +Object.assign(baseObj, proposal, sale, customer, my, product, preserve, serve, common, survey) export default baseObj diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index 904e25f3b..7375a2b37 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -12,6 +12,7 @@ const beneficiaryInfo = () => import('@/views/ebiz/preserve/BeneficiaryInfo') const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/BeneficiaryConfirmation') const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') +const Progress = () => import('@/views/ebiz/preserve/Progress') export default [ { @@ -130,5 +131,14 @@ export default [ title: '提交结果', index: 13 } - } + }, + { + path: '/preserve/Progress', + name: 'Progress', + component: Progress, + meta: { + title: '保全进度查询', + index: 14 + } + }, ] diff --git a/src/views/ebiz/preserve/Progress.vue b/src/views/ebiz/preserve/Progress.vue new file mode 100644 index 000000000..ac3a9fdd4 --- /dev/null +++ b/src/views/ebiz/preserve/Progress.vue @@ -0,0 +1,264 @@ + + + + + + From be6e381513b65f87ba5ae86a3e97e85ab412f5d7 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 20 Apr 2020 14:18:32 +0800 Subject: [PATCH 08/20] =?UTF-8?q?[new]=20=E5=AE=8C=E6=88=90=E6=8A=95?= =?UTF-8?q?=E4=BF=9D=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=88=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=89=20[fix]=20=E5=AE=8C=E5=96=84=E6=8A=95?= =?UTF-8?q?=E4=BF=9D=E8=BF=9B=E5=BA=A6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 8 + src/config/preserve.js | 1 + src/router/ebiz/preserve.js | 10 + src/views/ebiz/preserve/Progress.vue | 282 +++++++++++++++--- .../ebiz/preserve/detail/Beneficiary.vue | 257 ++++++++++++++++ src/views/ebiz/preserve/detail/Contact.vue | 159 ++++++++++ src/views/ebiz/preserve/js/data-dictionary.js | 36 +++ src/views/ebiz/preserve/js/utils.js | 4 + 8 files changed, 714 insertions(+), 43 deletions(-) create mode 100644 src/views/ebiz/preserve/detail/Beneficiary.vue create mode 100644 src/views/ebiz/preserve/detail/Contact.vue create mode 100644 src/views/ebiz/preserve/js/data-dictionary.js create mode 100644 src/views/ebiz/preserve/js/utils.js diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index d6b635a74..0071b7de4 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -9,6 +9,14 @@ export function progressListQuery(data) { }) } +export function progressDetailQuery(data) { + return request({ + url: getUrl('/edor/query/queryDetails', 0), + method: 'post', + data + }) +} + export function edorChange(data) { return request({ url: getUrl('/edor/item/change', 0), diff --git a/src/config/preserve.js b/src/config/preserve.js index dcc7ce4ea..7afca6e92 100644 --- a/src/config/preserve.js +++ b/src/config/preserve.js @@ -2,6 +2,7 @@ let mockBaseUrl = 'http://rap2.taobao.org:38080/app/mock/250585/' export default { '/edor/query/queryEdorList': mockBaseUrl + '/edor/query/queryEdorList', + '/edor/query/queryDetails': mockBaseUrl + '/edor/query/queryDetails', '/edor/customer/policyList': mockBaseUrl + '/edor/customer/policyList', '/edor/customer/customerInfo': mockBaseUrl + '/edor/customer/customerInfo', '/edor/customer/customerList': mockBaseUrl + '/edor/customer/customerList', diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index 7375a2b37..9247290d4 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -13,6 +13,7 @@ const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/BeneficiaryC const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') const Progress = () => import('@/views/ebiz/preserve/Progress') +const Contact = () => import('@/views/ebiz/preserve/detail/Contact') export default [ { @@ -141,4 +142,13 @@ export default [ index: 14 } }, + { + path: '/preserve/detail/Contact/:surrenderId', + name: 'Contact', + component: Contact, + meta: { + title: '联系方式变更', + index: 15 + } + }, ] diff --git a/src/views/ebiz/preserve/Progress.vue b/src/views/ebiz/preserve/Progress.vue index aaa52158d..f8e7889fd 100644 --- a/src/views/ebiz/preserve/Progress.vue +++ b/src/views/ebiz/preserve/Progress.vue @@ -14,48 +14,29 @@
-
{{ item.edorapplyNo }}
+
{{ item.edorapplyNo | date }}
-
-
- 客户 -
+
客户
{{ item.customerName }}
-
-
- 状态 -
- {{item.surrenderStatus}} +
状态
+ {{ item.surrenderStatus | idToText('preserveState') }}
-
-
- 保全项 -
- {{ item.surrenderType }} +
保全项
+ {{ item.surrenderType | idToText('preserveType') }}
-
- 查看详情 + 查看详情
@@ -70,7 +51,9 @@ + diff --git a/src/views/ebiz/preserve/detail/Contact.vue b/src/views/ebiz/preserve/detail/Contact.vue new file mode 100644 index 000000000..096fc9d14 --- /dev/null +++ b/src/views/ebiz/preserve/detail/Contact.vue @@ -0,0 +1,159 @@ + + + + + + diff --git a/src/views/ebiz/preserve/js/data-dictionary.js b/src/views/ebiz/preserve/js/data-dictionary.js new file mode 100644 index 000000000..f596cfec8 --- /dev/null +++ b/src/views/ebiz/preserve/js/data-dictionary.js @@ -0,0 +1,36 @@ +// 保全相关的数据字典 +export default { + preserveState: { + 0: '申请成功', + 1: '待导入核心', + 2: '保全失败', + 3: '保全申请失败待导入核心', + 4: '待打款', + 5: '保全成功', + 6: '转核' + }, + preserveType: { + 1: '联系方式变更', + 2: '受益人变更', + 3: '续期账号变更', + 4: '犹退', + 5: '退保' + }, + preserveUserType: { + 1: '联系方式变更保存的客户', + 2: '受益人变更保存的客户', + 3: '续期账号变更保存的客户', + 4: '犹退保存的客户', + 5: '退保保存的客户' + }, + preserveAccountType: { + 1: '联系方式变更保存的客户', + 2: '受益人变更保存的客户', + 3: '续期账号变更保存的客户', + 4: '犹退保存的客户', + 5: '退保保存的客户' + }, + route: { + 1: 'Contact' + } +} diff --git a/src/views/ebiz/preserve/js/utils.js b/src/views/ebiz/preserve/js/utils.js new file mode 100644 index 000000000..7d615c50b --- /dev/null +++ b/src/views/ebiz/preserve/js/utils.js @@ -0,0 +1,4 @@ + +export default { + +} From 0b18daab3dca26e8a2aa4fc2d67d6eaf33bf95fc Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 20 Apr 2020 16:42:33 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E3=80=90new=E3=80=91=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E4=BF=9D=E5=85=A8=E8=BF=9B=E5=BA=A6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=9A=E5=8F=97=E7=9B=8A=E4=BA=BA=E7=9B=B8=E6=83=85?= =?UTF-8?q?=E6=84=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/preserve.js | 21 ++ .../ebiz/preserve/detail/Beneficiary.vue | 226 +++++++------- .../ebiz/preserve/detail/BeneficiaryInfo.vue | 286 ++++++++++++++++++ src/views/ebiz/preserve/js/data-dictionary.js | 3 +- src/views/ebiz/preserve/js/methods.js | 95 ++++++ src/views/ebiz/preserve/js/verification.js | 52 ++++ 6 files changed, 569 insertions(+), 114 deletions(-) create mode 100644 src/views/ebiz/preserve/detail/BeneficiaryInfo.vue create mode 100644 src/views/ebiz/preserve/js/methods.js create mode 100644 src/views/ebiz/preserve/js/verification.js diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index 9247290d4..ea0d1d30f 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -14,6 +14,8 @@ const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') const Progress = () => import('@/views/ebiz/preserve/Progress') const Contact = () => import('@/views/ebiz/preserve/detail/Contact') +const Beneficiary = () => import('@/views/ebiz/preserve/detail/Beneficiary') +const BeneficiaryInfoD = () => import('@/views/ebiz/preserve/detail/BeneficiaryInfo') export default [ { @@ -151,4 +153,23 @@ export default [ index: 15 } }, + { + path: '/preserve/detail/Beneficiary/:surrenderId', + name: 'Beneficiary', + component: Beneficiary, + meta: { + title: '受益人', + index: 16 + } + }, + { + path: '/preserve/detail/BeneficiaryInfo', + name: 'BeneficiaryInfoD', + component: BeneficiaryInfoD, + meta: { + title: '指定受益人信息', + index: 17 + } + }, + ] diff --git a/src/views/ebiz/preserve/detail/Beneficiary.vue b/src/views/ebiz/preserve/detail/Beneficiary.vue index 73afdc423..edb485552 100644 --- a/src/views/ebiz/preserve/detail/Beneficiary.vue +++ b/src/views/ebiz/preserve/detail/Beneficiary.vue @@ -19,7 +19,7 @@
  • -
    +
    @@ -38,7 +38,7 @@
- - + --> - 提交申请 +
@@ -85,23 +85,23 @@ export default { } }, data() { - let feachData = { - surrenderDTOList: [ - { - surrenderId: '', - edorapplyNo: '', - surrenderType: '2', - bnfDTOs: [] - } - ] - } + // let feachData = { + // surrenderDTOList: [ + // { + // surrenderId: '', + // edorapplyNo: '', + // surrenderType: '2', + // bnfDTOs: [] + // } + // ] + // } return { - show: false, // 获取短信验证码 - codeDisabled: false, // 获取验证码按钮是否禁用 - timeId: null, // 计时器ID - countDown: 60, // 倒计时 - authCode: '', // 验证码 - feachData: feachData, + // show: false, // 获取短信验证码 + // codeDisabled: false, // 获取验证码按钮是否禁用 + // timeId: null, // 计时器ID + // countDown: 60, // 倒计时 + // authCode: '', // 验证码 + // feachData: feachData, type: '', isDisType: true, policy: null, @@ -110,16 +110,16 @@ export default { } }, created() { - progressDetailQuery({ - surrenderType : 1, + surrenderType : 2, surrenderId : this.$route.params.surrenderId }) .then(res => { - console.log(res); if(res.result == '0'){ - this.customerInfo = res.content.customerInfoDTOList[0] - this.surrenderResult = res.content.surrenderResult + this.policy = res.content.policyListDTOList[0] + this.insuredName = this.policy.insuredName + this.beneficiaries = res.content.bnfDTOs + this.type = this.beneficiaries[0].bnfType } else { this.$toast(res.resultMessage) } @@ -127,7 +127,6 @@ export default { .catch( (err) => { console.log(err); }) - // 获取保单列表存储的数据 // this.policy = JSON.parse(localStorage['preserve-policy']) // this.insuredName = this.policy.insuredName @@ -137,12 +136,13 @@ export default { mounted() {}, methods: { //告知信息 - nextStep() { - this.showAuth() - }, - detail(index) { + // nextStep() { + // this.showAuth() + // }, + detail(item) { // edit=0 - let path = '/preserve/BeneficiaryInfoDetail?edit=' + index + localStorage["preserve-userInfo"] = JSON.stringify(item) + let path = '/preserve/detail/BeneficiaryInfo' this.$jump({ flag: 'h5', extra: { @@ -154,90 +154,90 @@ export default { }) }, // 显示验证码 van-dialog - showAuth() { - this.show = true - }, - // 获取短信验证码 - getAuthCode() { - this.codeDisabled = true - //倒计时 - this.timeId = setInterval(() => { - this.countDown-- - if (this.countDown <= 0) { - window.clearInterval(this.timeId) - this.codeDisabled = false - this.countDown = 60 - } - }, 1000) + // showAuth() { + // this.show = true + // }, + // // 获取短信验证码 + // getAuthCode() { + // this.codeDisabled = true + // //倒计时 + // this.timeId = setInterval(() => { + // this.countDown-- + // if (this.countDown <= 0) { + // window.clearInterval(this.timeId) + // this.codeDisabled = false + // this.countDown = 60 + // } + // }, 1000) - getAuthCode({ - operateType: 'appntInfoEntry', - sessionId: '', - validateCode: '', - operateCode: this.customerMobile, - system: '', - operateCodeType: '0' - }).then(res => { - if (res.result == 0) { - this.sessionId = res.sessionId - } else { - this.$toast({ - message: res.resultMessage, - onClose: this.showAuth - }) - } - }) - }, - // 验证码确认事件 - async authConfirm() { - //清理计时器 - this.clearTimer() - this.changeSubmit() - }, - // 清理计时器 - clearTimer() { - window.clearInterval(this.timeId) - this.timeId = null - this.countDown = 60 - this.codeDisabled = false - }, - //提交变更申请 - async changeSubmit() { - if (!this.sessionId) { - this.$toast({ - message: '请先获取验证码', - onClose: this.showAuth - }) - return - } - let res = await autchCodeCheck({ - smsId: this.sessionId, - code: this.authCode - }) - if (res.result == 0) { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#/preserve/submitResult`, - backToFirst: '1' - }, - routerInfo: { - path: `/preserve/submitResult` - } - }) - } else { - this.show = false - this.$toast({ - message: res.resultMessage, - onClose: this.showAuth - }) - } - } + // getAuthCode({ + // operateType: 'appntInfoEntry', + // sessionId: '', + // validateCode: '', + // operateCode: this.customerMobile, + // system: '', + // operateCodeType: '0' + // }).then(res => { + // if (res.result == 0) { + // this.sessionId = res.sessionId + // } else { + // this.$toast({ + // message: res.resultMessage, + // onClose: this.showAuth + // }) + // } + // }) + // }, + // // 验证码确认事件 + // async authConfirm() { + // //清理计时器 + // this.clearTimer() + // this.changeSubmit() + // }, + // // 清理计时器 + // clearTimer() { + // window.clearInterval(this.timeId) + // this.timeId = null + // this.countDown = 60 + // this.codeDisabled = false + // }, + // //提交变更申请 + // async changeSubmit() { + // if (!this.sessionId) { + // this.$toast({ + // message: '请先获取验证码', + // onClose: this.showAuth + // }) + // return + // } + // let res = await autchCodeCheck({ + // smsId: this.sessionId, + // code: this.authCode + // }) + // if (res.result == 0) { + // this.$jump({ + // flag: 'h5', + // extra: { + // url: location.origin + `/#/preserve/submitResult`, + // backToFirst: '1' + // }, + // routerInfo: { + // path: `/preserve/submitResult` + // } + // }) + // } else { + // this.show = false + // this.$toast({ + // message: res.resultMessage, + // onClose: this.showAuth + // }) + // } + // } }, - beforeDestroy() { - //清理计时器 - this.clearTimer() - } + // beforeDestroy() { + // //清理计时器 + // this.clearTimer() + // } } diff --git a/src/views/ebiz/preserve/js/data-dictionary.js b/src/views/ebiz/preserve/js/data-dictionary.js index f596cfec8..3af1cc11d 100644 --- a/src/views/ebiz/preserve/js/data-dictionary.js +++ b/src/views/ebiz/preserve/js/data-dictionary.js @@ -31,6 +31,7 @@ export default { 5: '退保保存的客户' }, route: { - 1: 'Contact' + 1: 'Contact', + 2: 'Beneficiary' } } diff --git a/src/views/ebiz/preserve/js/methods.js b/src/views/ebiz/preserve/js/methods.js new file mode 100644 index 000000000..da4406408 --- /dev/null +++ b/src/views/ebiz/preserve/js/methods.js @@ -0,0 +1,95 @@ +//点击弹出组件 +export function selectComp(that, index, type = '') { + that.currentPopupIndex = index + let title = '' + if (index == 1) { + ;[that.customerShowPicker, title] = [true, '客户列表'] + } else if (index == 2) { + ;[that.occupationShowPicker, title] = [true, '职业类别'] + } else if (index == 3) { + if (type == '1') { + //投保人 + localStorage.scanFromInsured = 'true' + } else if (type == '2') { + //被保险人 + localStorage.scanFromInsured = 'false' + } + ;[that.isScan, title] = [true, '身份证扫描'] + } + + setTimeout(() => { + that.$jump({ + flag: 'navigation', + extra: { + title, + hiddenLeft: '1' + } + }) + closeBtn(that) + }, 400) +} + +// 关闭按钮的显示 +function closeBtn(that) { + that.$jump({ + flag: 'webview_right_button', + extra: { + btns: [ + { + img: that.$assetsUrl + 'images/del-close.png', + route: { flag: '', extra: {} } + } + ] + } + }) +} + +// 获取身份证扫描信息 +/** + * + * @param {*} that 上下文 + * @param {*} data 扫描数据 + * @param {*} type 1 投保人 2 被保险人 + */ +export function getIdentityInfo(that, data, type) { + console.log(data) + // 正面 + if (data.name && data.name != '待识别') { + that.userInfo.name = data.name + that.userInfo.idNo = data.idNo + that.userInfo.birthday = `${data.birthYear}-${data.birthMonth}-${data.birthDay}` + that.userInfo.sex = data.gender == '男' ? '0' : '1' + } + // 反面 + if (data.startDate && data.startDate != '待识别') { + that.userInfo.certificateValidate = `${data.startDate.substr(0, 4)}-${data.startDate.substr(5, 2)}-${data.startDate.substr(8, 2)}` + //that.userInfo.certificateValidate = `${data.startDate.substr(0, 4)}-${data.startDate.substr(4, 2)}-${data.startDate.substr(6, 2)}` + // 是否为长期身份证 + if (data.endDate != '长期') { + that.userInfo.certiexpiredate = `${data.endDate.substr(0, 4)}-${data.endDate.substr(5, 2)}-${data.endDate.substr(8, 2)}` + // that.userInfo.certiexpiredate = `${data.endDate.substr(0, 4)}-${data.endDate.substr(4, 2)}-${data.endDate.substr(6, 2)}` + that.effectiveDateTypeAble = true + that.idLimit = false + that.isRequired = true + } else { + // 勾选长期 + that.userInfo.effectiveDateType = true + // 长期按钮不禁用 + that.effectiveDateTypeAble = false + // 证件截止日期不需要校验 + that.certiexpiredateRequired = false + //截止日期不可编辑 + that.idLimit = true + that.isRequired = false + } + } + that.isScan = false + let title = type == '1' ? '投保人信息' : '被保险人信息' + that.$jump({ + flag: 'navigation', + extra: { + title, + hiddenRight: '1' + } + }) +} diff --git a/src/views/ebiz/preserve/js/verification.js b/src/views/ebiz/preserve/js/verification.js new file mode 100644 index 000000000..b42c40b4b --- /dev/null +++ b/src/views/ebiz/preserve/js/verification.js @@ -0,0 +1,52 @@ +import changeFifteenToEighteen from '@/assets/js/utils/changeFifteenToEighteen' +import idNoCheck from '@/assets/js/utils/idNoCheck' +import utilsAge from '@/assets/js/utils/age' + +//身份证带出出生日期,性别,年龄 +export function idToData(idNo) { + //非空 + if (!idNo.trim()) { + return { + text: '证件号码不能为空' + } + } + + // 证件号码规则校验 + if (!idNoCheck.isIdno(idNo)) { + return { + text: '您填写的证件号码有误' + } + } + + //如果是15位身份证号先转为18位 + if (idNo.length == 15) { + idNo = changeFifteenToEighteen(idNo) + } + let birthday = getBirthById(idNo) + let age = utilsAge.getAge(birthday, new Date()) + let sex = getSexById(idNo) + return { + birthday, + age, + sex + } +} + +function getBirthById(idNo) { + // 获取生日 + var year = idNo.substr(6, 4) + var month = idNo.substr(10, 2) + var day = idNo.substr(12, 2) + return year + '-' + month + '-' + day +} + +function getSexById(idNo) { + // 获取性别 + if (idNo.charAt(16) >= '0' && idNo.charAt(16) <= '9') { + if (parseInt(idNo.charAt(16)) % 2 == 0) { + return '1' + } else { + return '0' + } + } +} From a66c21601bb85629a351592bfda8540fd0192aa5 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Sun, 26 Apr 2020 16:30:24 +0800 Subject: [PATCH 10/20] =?UTF-8?q?[new]=20=E5=B0=86=E7=8A=B9=E9=80=80?= =?UTF-8?q?=E3=80=81=E9=80=80=E4=BF=9D=E3=80=81=E7=BB=AD=E6=9C=9F=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=8F=98=E6=9B=B4=E4=B8=89=E4=B8=AA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BB=8E=E5=90=84=E8=87=AA=E4=BF=9D=E5=85=A8=E7=A7=BB=E6=A4=8D?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/preserve.js | 33 ++- .../detail/CoolingOffperiodSurrender.vue | 234 ++++++++++++++++ src/views/ebiz/preserve/detail/Renewal.vue | 258 ++++++++++++++++++ src/views/ebiz/preserve/detail/Surrender.vue | 234 ++++++++++++++++ src/views/ebiz/preserve/js/data-dictionary.js | 7 +- 5 files changed, 762 insertions(+), 4 deletions(-) create mode 100644 src/views/ebiz/preserve/detail/CoolingOffperiodSurrender.vue create mode 100644 src/views/ebiz/preserve/detail/Renewal.vue create mode 100644 src/views/ebiz/preserve/detail/Surrender.vue diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index ea0d1d30f..39f283616 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -16,6 +16,9 @@ const Progress = () => import('@/views/ebiz/preserve/Progress') const Contact = () => import('@/views/ebiz/preserve/detail/Contact') const Beneficiary = () => import('@/views/ebiz/preserve/detail/Beneficiary') const BeneficiaryInfoD = () => import('@/views/ebiz/preserve/detail/BeneficiaryInfo') +const Renewal = () => import('@/views/ebiz/preserve/detail/Renewal') +const CoolingOffperiodSurrender = () => import('@/views/ebiz/preserve/detail/CoolingOffperiodSurrender') +const Surrender = () => import('@/views/ebiz/preserve/detail/Surrender') export default [ { @@ -163,7 +166,7 @@ export default [ } }, { - path: '/preserve/detail/BeneficiaryInfo', + path: '/preserve/detail/BeneficiaryInfo/:surrenderId', name: 'BeneficiaryInfoD', component: BeneficiaryInfoD, meta: { @@ -171,5 +174,31 @@ export default [ index: 17 } }, - + { + path: '/preserve/detail/CoolingOffperiodSurrender/:surrenderId', + name: 'CoolingOffperiodSurrender', + component: CoolingOffperiodSurrender, + meta: { + title: '犹豫期退保', + index: 18 + } + }, + { + path: '/preserve/detail/Surrender/:surrenderId', + name: 'Surrender', + component: Surrender, + meta: { + title: '退保', + index: 19 + } + }, + { + path: '/preserve/detail/Renewal/:surrenderId', + name: 'Renewal', + component: Renewal, + meta: { + title: '续期账号变更', + index: 20 + } + }, ] diff --git a/src/views/ebiz/preserve/detail/CoolingOffperiodSurrender.vue b/src/views/ebiz/preserve/detail/CoolingOffperiodSurrender.vue new file mode 100644 index 000000000..e3ecc24df --- /dev/null +++ b/src/views/ebiz/preserve/detail/CoolingOffperiodSurrender.vue @@ -0,0 +1,234 @@ + + + + + + diff --git a/src/views/ebiz/preserve/detail/Renewal.vue b/src/views/ebiz/preserve/detail/Renewal.vue new file mode 100644 index 000000000..4366c1b0f --- /dev/null +++ b/src/views/ebiz/preserve/detail/Renewal.vue @@ -0,0 +1,258 @@ + + + + + + diff --git a/src/views/ebiz/preserve/detail/Surrender.vue b/src/views/ebiz/preserve/detail/Surrender.vue new file mode 100644 index 000000000..e3ecc24df --- /dev/null +++ b/src/views/ebiz/preserve/detail/Surrender.vue @@ -0,0 +1,234 @@ + + + + + + diff --git a/src/views/ebiz/preserve/js/data-dictionary.js b/src/views/ebiz/preserve/js/data-dictionary.js index 3af1cc11d..a2b414e6b 100644 --- a/src/views/ebiz/preserve/js/data-dictionary.js +++ b/src/views/ebiz/preserve/js/data-dictionary.js @@ -13,7 +13,7 @@ export default { 1: '联系方式变更', 2: '受益人变更', 3: '续期账号变更', - 4: '犹退', + 4: '犹豫期退保', 5: '退保' }, preserveUserType: { @@ -32,6 +32,9 @@ export default { }, route: { 1: 'Contact', - 2: 'Beneficiary' + 2: 'Beneficiary', + 3: 'Renewal', + 4: 'CoolingOffperiodSurrender', + 5: 'Surrender' } } From 2a4a332aae4c554b448aa288cc3511d3f9d4c046 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 6 May 2020 13:27:34 +0800 Subject: [PATCH 11/20] =?UTF-8?q?[NEW]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=85=A8=E8=AF=A6=E6=83=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 11 +++++++++++ src/config/preserve.js | 1 + 2 files changed, 12 insertions(+) diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index 779a88c6e..7a5a89e10 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -1,6 +1,7 @@ import request from '@/assets/js/utils/request' import getUrl from '@/assets/js/utils/get-url' +//基本信息变更提交 export function edorChange(data) { return request({ url: getUrl('/edor/item/change', 0), @@ -17,6 +18,7 @@ export function customerList(data) { }) } +//签名信息保存 export function edorSignSave(data) { return request({ url: getUrl('/edor/sign/save', 0), @@ -33,3 +35,12 @@ export function customerInfo(data) { data }) } + +//保全详情查询 +export function queryDetails(data) { + return request({ + url: getUrl('/edor/query/queryDetails', 0), + method: 'post', + data + }) +} diff --git a/src/config/preserve.js b/src/config/preserve.js index 78caff926..9a4c2def7 100644 --- a/src/config/preserve.js +++ b/src/config/preserve.js @@ -6,4 +6,5 @@ export default { '/edor/customer/customerList': mockBaseUrl + '/edor/customer/customerList', '/edor/item/change': mockBaseUrl + '/edor/item/change', '/edor/sign/save': mockBaseUrl + '/edor/sign/save', + '/edor/query/queryDetails': mockBaseUrl + '/edor/query/queryDetails' } From 6c33e6166503c0e03fe97cced6c6960e9bb32df5 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 6 May 2020 13:28:22 +0800 Subject: [PATCH 12/20] =?UTF-8?q?[FIX=E3=80=90=E4=BF=9D=E5=85=A8-=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4=E3=80=91=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E9=98=85=E8=AF=BB=E9=A1=B5=E6=A0=B7=E5=BC=8F=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/preserve/ContacAgreement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/preserve/ContacAgreement.vue b/src/views/ebiz/preserve/ContacAgreement.vue index 0abd48252..fc34d200b 100644 --- a/src/views/ebiz/preserve/ContacAgreement.vue +++ b/src/views/ebiz/preserve/ContacAgreement.vue @@ -6,7 +6,7 @@ 本人确认已阅读 - 《国富人寿人身保险联系方式变更协议》 + 《国富人寿人身保险联系方式变更协议》
@@ -118,7 +118,7 @@ export default { } }) .catch(err => { - console.log(err); + console.log(err) }) } }, From 1744ac54ca41093d957e27160953161190889827 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 6 May 2020 13:31:20 +0800 Subject: [PATCH 13/20] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8-?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 18 +++- .../ebiz/preserve/ContactConfirmation.vue | 82 ++++++++++++++----- src/views/ebiz/preserve/ContactInfo.vue | 5 +- src/views/ebiz/preserve/HandleResult.vue | 34 ++++---- 4 files changed, 99 insertions(+), 40 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 63cb1d212..888b76c9c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -13,7 +13,9 @@ export default new Vuex.Store({ pageFlag: '', //理赔申请-区分被保险人/申请人页面flag agentEnterApplyMobil: '', //自助入司-新的被增员人填好的基础信息里的电话号码 agentEnterApplyIdNo: '', //自助入司-新的被增员人填好的基础信息里的证件号码 - refusalCause: '' //自助入司-查看审批流程-审批拒绝的原因 + refusalCause: '', //自助入司-查看审批流程-审批拒绝的原因 + surrenderId: '', //保全-保全主表id + eodrApplyNo: '' //保全-保全受理号 }, mutations: { //更新 理赔申请-区分被保险人/申请人页面flag @@ -28,6 +30,14 @@ export default new Vuex.Store({ //更新 自助入司-查看审批流程-审批拒绝的原因 updateRefusalCause(state, val) { state.refusalCause = val + }, + //更新 保全-保全主表id + updatePreserveSurrendId(state, val) { + state.surrenderId = val + }, + //更新 保全-保全受理号 + updatePreserveEodrApplyNo(state, val) { + state.eodrApplyNo = val } }, getters: { @@ -39,6 +49,12 @@ export default new Vuex.Store({ }, getRefusalCause(state) { return state.refusalCause + }, + getPreserveSurrendId(state) { + return state.surrenderId + }, + getPreserveEodrApplyNo(state) { + return state.eodrApplyNo } } }) diff --git a/src/views/ebiz/preserve/ContactConfirmation.vue b/src/views/ebiz/preserve/ContactConfirmation.vue index f764df15c..836458523 100644 --- a/src/views/ebiz/preserve/ContactConfirmation.vue +++ b/src/views/ebiz/preserve/ContactConfirmation.vue @@ -33,7 +33,7 @@
{{ customerInfo.address }}
-
{{ customerInfo.zipCode }}
+
{{ customerInfo.homeZip }}
{{ customerInfo.customerEmail }}
@@ -82,6 +82,7 @@ import { Field, CellGroup, Checkbox, Popup, Picker, Area, RadioGroup, Radio, Dialog } from 'vant' import getAreaName from '@/assets/js/utils/get-area-name' import { getAuthCode, autchCodeCheck } from '@/api/ebiz/sale/sale' +import { queryDetails } from '@/api/ebiz/preserve/preserve' export default { name: 'basicConfirmation', @@ -121,32 +122,72 @@ export default { signInvalid: '', customerMobile: '', submitForbidden: false, - read: false + read: false, + province: '', + city: '', + area: '' } }, async created() { this.read = this.$route.query.read + await this.queryDetails() await this.init() }, methods: { // 初始化数据 init() { - // 初始化内容 - this.customerInfo = JSON.parse(localStorage['preserve-customerInfo']) - this.customerInfoOld = JSON.parse(localStorage['preserve-customerInfo-old']) - // 判断 内容是否变化 - let keys = Object.keys(this.customerInfo) - for (let item of keys) { - this.changeInfo[item] = this.customerInfo[item] != this.customerInfoOld[item] - } - //地址特殊处理 - if (this.customerInfo.province && this.customerInfo.city && this.customerInfo.area) { - let tempHomeAdress = getAreaName([{ code: this.customerInfo.province }, { code: this.customerInfo.city }, { code: this.customerInfo.area }]).split('-') - this.province = tempHomeAdress[0] - this.city = tempHomeAdress[1] - this.area = tempHomeAdress[2] - } + return new Promise((resolve, reject) => { + // 初始化内容 + // this.customerInfo = JSON.parse(localStorage['preserve-customerInfo']) + // this.customerInfoOld = JSON.parse(localStorage['preserve-customerInfo-old']) + // 判断 内容是否变化 + let keys = Object.keys(this.customerInfo) + for (let item of keys) { + this.changeInfo[item] = this.customerInfo[item] != this.customerInfoOld[item] + } + //地址特殊处理 + if (this.customerInfo.province && this.customerInfo.city && this.customerInfo.area) { + let tempHomeAdress = getAreaName([{ code: this.customerInfo.province }, { code: this.customerInfo.city }, { code: this.customerInfo.area }]).split( + '-' + ) + this.province = tempHomeAdress[0] + this.city = tempHomeAdress[1] + this.area = tempHomeAdress[2] + } + resolve() + }) }, + + //保全详情查询 + queryDetails() { + return new Promise((resolve, reject) => { + let { surrenderId, eodrApplyNo } = this.getInfo() + queryDetails({ surrenderId, eodrApplyNo }).then(res => { + if (res.result == 0) { + let resData = res.content.content + console.log('11', resData) + resData.map(v => { + //isNewInfo-是否变更后信息 0-是 1-否 + if (v.isNewInfo == '0') { + this.customerInfo = v + } else { + this.customerInfoOld = v + } + }) + resolve() + } else { + this.$toast(res.resultMessage) + reject() + } + }) + }) + }, + + //获取保全主表id及保全受理号 + getInfo() { + return { surrenderId: this.$store.getters.getPreserveSurrendId, eodrApplyNo: this.$store.getters.getPreserveEodrApplyNo } + }, + // 显示验证码 van-dialog showAuth() { this.show = true @@ -209,12 +250,12 @@ export default { }, //提交变更申请 async changeSubmit() { - if(!this.sessionId){ + if (!this.sessionId) { this.$toast({ - message: "请先获取验证码", + message: '请先获取验证码', onClose: this.showAuth }) - return; + return } let res = await autchCodeCheck({ smsId: this.sessionId, @@ -238,7 +279,6 @@ export default { onClose: this.showAuth }) } - } }, beforeDestroy() { diff --git a/src/views/ebiz/preserve/ContactInfo.vue b/src/views/ebiz/preserve/ContactInfo.vue index 03bc2abb2..5fd9e6c89 100644 --- a/src/views/ebiz/preserve/ContactInfo.vue +++ b/src/views/ebiz/preserve/ContactInfo.vue @@ -90,7 +90,7 @@ export default { homePhone: '', isNewInfo: '' } - feachData.surrenderDTOList[0].customerInfoDTOList.push(customerInfo) + // feachData.surrenderDTOList[0].customerInfoDTOList.push(customerInfo) return { homeName: '', homeShow: false, @@ -130,11 +130,14 @@ export default { //表单校验 this.$validator.validate().then(valid => { if (true == valid) { + this.feachData.surrenderDTOList[0].customerInfoDTOList.push(this.customerInfo) edorChange(this.feachData) .then(res => { if (res.result == 0) { localStorage['preserve-customerInfo-old'] = localStorage['preserve-customerInfo'] localStorage['preserve-customerInfo'] = JSON.stringify(this.customerInfo) + this.$store.commit('updatePreserveSurrendId', res.content.surrenderId) + this.$store.commit('updatePreserveEodrApplyNo', res.content.eodrApplyNo) this.$jump({ flag: 'h5', extra: { diff --git a/src/views/ebiz/preserve/HandleResult.vue b/src/views/ebiz/preserve/HandleResult.vue index 22f05ef57..4bedd891d 100644 --- a/src/views/ebiz/preserve/HandleResult.vue +++ b/src/views/ebiz/preserve/HandleResult.vue @@ -17,6 +17,7 @@ export default { name: 'handleResult', data() { return { + path: '', //页面跳转路径 srcSuccess: this.$assetsUrl + 'images/success.png', entry: '', signInvalid: '', @@ -32,15 +33,14 @@ export default { // 此处处理 this.path switch (this.entry) { case 'contact': - path = '/preserve/ContactConfirmation?entry=contact' + this.path = '/preserve/ContactConfirmation?entry=contact' break default: this.path = '' break } }, - mounted() { - }, + mounted() {}, methods: { nextStep() { if (this.customerInfo.idType != '1') { @@ -72,21 +72,21 @@ export default { // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('face_auth', { number: this.customerInfo.idNo, //身份证号码 - name: this.customerInfo.name //姓名 - }) - // 跳过人脸识别 - // new Promise(resolve => { - // console.log('--跳过人脸识别--返回识别成功') - // resolve(JSON.stringify({ state: '1' })) - // }) - .then(data => { - if (JSON.parse(data).state == '1') { - this.jumpNextPage(this.path) - } else { - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_toast', '人脸检测失败') - } + name: this.customerInfo.customerName //姓名 }) + // 跳过人脸识别 + // new Promise(resolve => { + // console.log('--跳过人脸识别--返回识别成功') + // resolve(JSON.stringify({ state: '1' })) + // }) + .then(data => { + if (JSON.parse(data).state == '1') { + this.jumpNextPage(this.path) + } else { + // eslint-disable-next-line no-undef + EWebBridge.webCallAppInJs('webview_toast', '人脸检测失败') + } + }) } } // beforeRouteLeave(to, from, next) { From 19c240d8824137e0243500a35e7292ae1304c576 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 3 Jun 2020 09:29:14 +0800 Subject: [PATCH 14/20] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 68 +-- src/assets/js/utils/request.js | 3 +- src/config/preserve.js | 1 - src/router/ebiz/preserve.js | 72 +-- src/views/ebiz/preserve/README.md | 95 ++++ src/views/ebiz/preserve/Search.vue | 47 +- .../preserve/{ => bb}/ContacAgreement.vue | 0 .../preserve/{ => bb}/ContactConfirmation.vue | 0 .../ebiz/preserve/{ => bb}/ContactInfo.vue | 0 .../{ => bc}/BeneficiaryConfirmation.vue | 0 .../preserve/{ => bc}/BeneficiaryInfo.vue | 68 ++- .../preserve/{ => bc}/BeneficiaryInfoAdd.vue | 4 +- .../{ => bc}/BeneficiaryInfoDetail.vue | 4 +- src/views/ebiz/preserve/bc/ImageUpload.vue | 392 +++++++++++++++ .../preserve/{ => common}/HandleResult.vue | 0 .../ebiz/preserve/{ => common}/PolicyList.vue | 67 +-- .../preserve/{ => common}/SubmitResult.vue | 0 src/views/ebiz/preserve/components/Search.vue | 3 + .../ebiz/preserve/{ => ct}/ImageUpload.vue | 0 .../{ => ct}/SurrenderConfirmation.vue | 0 .../ebiz/preserve/{ => ct}/SurrenderInfo.vue | 0 .../ebiz/preserve/{ => ct}/SurrenderTip.vue | 0 src/views/ebiz/preserve/js/data-dictionary.js | 30 ++ .../{ => pc}/AutopayAuthorization.vue | 0 src/views/ebiz/preserve/pc/ImageUpload.vue | 447 ++++++++++++++++++ .../preserve/{ => pc}/RenewalConfirmation.vue | 0 .../ebiz/preserve/{ => pc}/RenewalInfo.vue | 0 src/views/ebiz/preserve/wt/ImageUpload.vue | 447 ++++++++++++++++++ 28 files changed, 1570 insertions(+), 178 deletions(-) create mode 100644 src/views/ebiz/preserve/README.md rename src/views/ebiz/preserve/{ => bb}/ContacAgreement.vue (100%) rename src/views/ebiz/preserve/{ => bb}/ContactConfirmation.vue (100%) rename src/views/ebiz/preserve/{ => bb}/ContactInfo.vue (100%) rename src/views/ebiz/preserve/{ => bc}/BeneficiaryConfirmation.vue (100%) rename src/views/ebiz/preserve/{ => bc}/BeneficiaryInfo.vue (75%) rename src/views/ebiz/preserve/{ => bc}/BeneficiaryInfoAdd.vue (99%) rename src/views/ebiz/preserve/{ => bc}/BeneficiaryInfoDetail.vue (98%) create mode 100644 src/views/ebiz/preserve/bc/ImageUpload.vue rename src/views/ebiz/preserve/{ => common}/HandleResult.vue (100%) rename src/views/ebiz/preserve/{ => common}/PolicyList.vue (64%) rename src/views/ebiz/preserve/{ => common}/SubmitResult.vue (100%) create mode 100644 src/views/ebiz/preserve/components/Search.vue rename src/views/ebiz/preserve/{ => ct}/ImageUpload.vue (100%) rename src/views/ebiz/preserve/{ => ct}/SurrenderConfirmation.vue (100%) rename src/views/ebiz/preserve/{ => ct}/SurrenderInfo.vue (100%) rename src/views/ebiz/preserve/{ => ct}/SurrenderTip.vue (100%) create mode 100644 src/views/ebiz/preserve/js/data-dictionary.js rename src/views/ebiz/preserve/{ => pc}/AutopayAuthorization.vue (100%) create mode 100644 src/views/ebiz/preserve/pc/ImageUpload.vue rename src/views/ebiz/preserve/{ => pc}/RenewalConfirmation.vue (100%) rename src/views/ebiz/preserve/{ => pc}/RenewalInfo.vue (100%) create mode 100644 src/views/ebiz/preserve/wt/ImageUpload.vue diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index 148a5999c..44985f9bd 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -1,18 +1,43 @@ import request from '@/assets/js/utils/request' import getUrl from '@/assets/js/utils/get-url' -//基本信息变更提交 -export function edorChange(data) { +//搜索客户 +export function customerList(data) { return request({ - url: getUrl('/edor/item/change', 0), + url: getUrl('/edor/customer/customerList', 1), method: 'post', data }) } -//搜索客户 -export function customerList(data) { +//保单列表 +export function policyList(data) { return request({ - url: getUrl('/edor/customer/customerList', 0), + url: getUrl('/edor/policy/policyList', 1), + method: 'post', + data + }) +} +//保全初始页信息查询(除续期账号变更外) +export function policyInfo(data) { + return request({ + url: getUrl('/edor/policy/policyInfo', 1), + method: 'post', + data + }) +} +//保全初始页信息查询-续期账号变更 +export function pcPolicyInfo(data) { + return request({ + url: getUrl('/edor/policy/pcPolicyInfo', 1), + method: 'post', + data + }) +} + +//受益人变更提交 +export function changeEdor(data) { + return request({ + url: getUrl('/edor/edor/changeEdor', 1), method: 'post', data }) @@ -21,37 +46,20 @@ export function customerList(data) { //签名信息保存 export function edorSignSave(data) { return request({ - url: getUrl('/edor/sign/save', 0), + url: getUrl('/edor/sign/save', 1), method: 'post', data }) } - -//客户详情 -export function customerInfo(data) { - return request({ - url: getUrl('/edor/customer/customerInfo', 0), - method: 'post', - data - }) -} - //保全详情查询 export function queryDetails(data) { return request({ - url: getUrl('/edor/query/queryDetails', 0), - method: 'post', - data - }) -} -//保单列表 -export function policyList(data) { - return request({ - url: getUrl('/edor/customer/policyList', 1), + url: getUrl('/edor/query/queryDetails', 1), method: 'post', data }) } + //续期账号变更 export function renewalChange(data) { return request({ @@ -60,11 +68,3 @@ export function renewalChange(data) { data }) } -//客户详情 -// export function customerInfo(data) { -// return request({ -// url: getUrl('/edor/customer/customerInfo', 0), -// method: 'post', -// data -// }) -// } diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index c0b764df1..85c6fb1c3 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -68,7 +68,8 @@ let manpower = [ //保全 let preserve = [ - '/edor/customer/customerList' //客户搜索 + '/edor/customer/customerList', //客户搜索 + '/edor/policy/policyList' //保单列表 ] let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...preserve, ...manpower] diff --git a/src/config/preserve.js b/src/config/preserve.js index 5a2a9cb59..c7ccc6039 100644 --- a/src/config/preserve.js +++ b/src/config/preserve.js @@ -1,7 +1,6 @@ // 保全 let mockBaseUrl = 'http://rap2.taobao.org:38080/app/mock/250585/' export default { - '/edor/customer/customerInfo': mockBaseUrl + '/edor/customer/customerInfo', //客户详情 '/edor/customer/customerList': mockBaseUrl + '/edor/customer/customerList', //客户搜索 '/edor/customer/policyList': mockBaseUrl + '/edor/customer/policyList', '/edor/item/change': mockBaseUrl + '/edor/item/change', diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index b4a5c3f48..91fd61f4d 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -1,22 +1,22 @@ //保全 定义相关组件 const search = () => import('@/views/ebiz/preserve/Search') -const imageUpload = () => import('@/views/ebiz/preserve/ImageUpload') -const handleResult = () => import('@/views/ebiz/preserve/HandleResult') -const submitResult = () => import('@/views/ebiz/preserve/SubmitResult') -const policyList = () => import('@/views/ebiz/preserve/PolicyList') -const renewalInfo = () => import('@/views/ebiz/preserve/RenewalInfo') -const renewalConfirmation = () => import('@/views/ebiz/preserve/RenewalConfirmation') -const contactInfo = () => import('@/views/ebiz/preserve/ContactInfo') -const contacAgreement = () => import('@/views/ebiz/preserve/ContacAgreement') -const contactConfirmation = () => import('@/views/ebiz/preserve/ContactConfirmation') -const beneficiaryInfo = () => import('@/views/ebiz/preserve/BeneficiaryInfo') -const beneficiaryInfoAdd = () => import('@/views/ebiz/preserve/BeneficiaryInfoAdd') -const beneficiaryInfoDetail = () => import('@/views/ebiz/preserve/BeneficiaryInfoDetail') -const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/BeneficiaryConfirmation') -const surrenderInfo = () => import('@/views/ebiz/preserve/SurrenderInfo') -const surrenderConfirmation = () => import('@/views/ebiz/preserve/SurrenderConfirmation') -const autopayAuthorization = () => import('@/views/ebiz/preserve/AutopayAuthorization') -const surrenderTip = () => import('@/views/ebiz/preserve/SurrenderTip') +const bcImageUpload = () => import('@/views/ebiz/preserve/bc/ImageUpload') +const handleResult = () => import('@/views/ebiz/preserve/common/HandleResult') +const submitResult = () => import('@/views/ebiz/preserve/common/SubmitResult') +const policyList = () => import('@/views/ebiz/preserve/common/PolicyList') +const renewalInfo = () => import('@/views/ebiz/preserve/pc/RenewalInfo') +const renewalConfirmation = () => import('@/views/ebiz/preserve/pc/RenewalConfirmation') +const autopayAuthorization = () => import('@/views/ebiz/preserve/pc/AutopayAuthorization') +const contactInfo = () => import('@/views/ebiz/preserve/bb/ContactInfo') +const contacAgreement = () => import('@/views/ebiz/preserve/bb/ContacAgreement') +const contactConfirmation = () => import('@/views/ebiz/preserve/bb/ContactConfirmation') +const beneficiaryInfo = () => import('@/views/ebiz/preserve/bc/BeneficiaryInfo') +const beneficiaryInfoAdd = () => import('@/views/ebiz/preserve/bc/BeneficiaryInfoAdd') +const beneficiaryInfoDetail = () => import('@/views/ebiz/preserve/bc/BeneficiaryInfoDetail') +const beneficiaryConfirmation = () => import('@/views/ebiz/preserve/bc/BeneficiaryConfirmation') +const surrenderInfo = () => import('@/views/ebiz/preserve/ct/SurrenderInfo') +const surrenderConfirmation = () => import('@/views/ebiz/preserve/ct/SurrenderConfirmation') +const surrenderTip = () => import('@/views/ebiz/preserve/ct/SurrenderTip') export default [ { @@ -29,7 +29,7 @@ export default [ } }, { - path: '/preserve/policyList', + path: '/preserve/common/policyList', name: 'policyList', component: policyList, meta: { @@ -38,7 +38,7 @@ export default [ } }, { - path: '/preserve/contactInfo', + path: '/preserve/bb/contactInfo', name: 'contactInfo', component: contactInfo, meta: { @@ -47,7 +47,7 @@ export default [ } }, { - path: '/preserve/contacAgreement', + path: '/preserve/bb/contacAgreement', name: 'contacAgreement', component: contacAgreement, meta: { @@ -56,7 +56,7 @@ export default [ } }, { - path: '/preserve/renewalInfo', + path: '/preserve/pc/renewalInfo', name: 'renewalInfo', component: renewalInfo, meta: { @@ -65,7 +65,7 @@ export default [ } }, { - path: '/preserve/beneficiaryInfo', + path: '/preserve/bc/beneficiaryInfo', name: 'beneficiaryInfo', component: beneficiaryInfo, meta: { @@ -74,7 +74,7 @@ export default [ } }, { - path: '/preserve/beneficiaryInfoAdd', + path: '/preserve/bc/beneficiaryInfoAdd', name: 'beneficiaryInfoAdd', component: beneficiaryInfoAdd, meta: { @@ -83,7 +83,7 @@ export default [ } }, { - path: '/preserve/beneficiaryInfoDetail', + path: '/preserve/bc/beneficiaryInfoDetail', name: 'beneficiaryInfoDetail', component: beneficiaryInfoDetail, meta: { @@ -92,7 +92,7 @@ export default [ } }, { - path: '/preserve/surrenderInfo', + path: '/preserve/ct/surrenderInfo', name: 'surrenderInfo', component: surrenderInfo, meta: { @@ -102,15 +102,15 @@ export default [ }, { path: '/preserve/imageUpload', - name: 'imageUpload', - component: imageUpload, + name: 'bcImageUpload', + component: bcImageUpload, meta: { - title: '影像上传', + title: '上传影像资料', index: 7 } }, { - path: '/preserve/handleResult', + path: '/preserve/common/handleResult', name: 'handleResult', component: handleResult, meta: { @@ -119,7 +119,7 @@ export default [ } }, { - path: '/preserve/beneficiaryConfirmation', + path: '/preserve/bc/beneficiaryConfirmation', name: 'beneficiaryConfirmation', component: beneficiaryConfirmation, meta: { @@ -128,7 +128,7 @@ export default [ } }, { - path: '/preserve/renewalConfirmation', + path: '/preserve/pc/renewalConfirmation', name: 'renewalConfirmation', component: renewalConfirmation, meta: { @@ -137,7 +137,7 @@ export default [ } }, { - path: '/preserve/contactConfirmation', + path: '/preserve/bb/contactConfirmation', name: 'contactConfirmation', component: contactConfirmation, meta: { @@ -146,7 +146,7 @@ export default [ } }, { - path: '/preserve/surrenderConfirmation', + path: '/preserve/ct/surrenderConfirmation', name: 'surrenderConfirmation', component: surrenderConfirmation, meta: { @@ -155,7 +155,7 @@ export default [ } }, { - path: '/preserve/autopayAuthorization', + path: '/preserve/pc/autopayAuthorization', name: 'autopayAuthorization', component: autopayAuthorization, meta: { @@ -164,7 +164,7 @@ export default [ } }, { - path: '/preserve/surrenderTip', + path: '/preserve/ct/surrenderTip', name: 'surrenderTip', component: surrenderTip, meta: { @@ -173,7 +173,7 @@ export default [ } }, { - path: '/preserve/submitResult', + path: '/preserve/common/submitResult', name: 'submitResult', component: submitResult, meta: { diff --git a/src/views/ebiz/preserve/README.md b/src/views/ebiz/preserve/README.md new file mode 100644 index 000000000..2640746b9 --- /dev/null +++ b/src/views/ebiz/preserve/README.md @@ -0,0 +1,95 @@ +# ebiz-h5-preserve + +## 介绍 + +## 保全项枚举（各个保全项文件夹也以此枚举命名） + + AA("AA","增加保险金额","AA","G"), + AC("AC","投保人资料变更","AC","U"), + AM("AM","投保人变更","AM","U"), + AP("AP","宽末处理方式变更","AP","U"), + AR("AR","保单账户部分领取","AR","P"), + AT("AT","年金险解除合同","AT","P"), + AX("AX","年金险协议减人","AX","U"), + AZ("AZ","年金险减人","AZ","U"), + BB("BB","客户基本资料变更","BB","U"), + BC("BC","受益人变更","BC","U"), + BE("BE","被保险人复效","BE","Q"), + BI("BI","银行信息变更","BI","U"), + BM("BM","红利领取方式变更","BM","U"), + BR("BR","保险期间恢复","BR","U"), + BS("BS","保险期间中断","BS","U"), + BZ("BZ","建工险保单中止","BZ","U"), + CA("CA","帐户金额转移","CA","P"), + CB("CB","退保回退","CB","G"), + CC("CC","建工险工程面积造价变更","CC","U"), + CD("CD","客户地址信息变更","CD","U"), + CM("CM","客户重要资料变更","CM","U"), + CS("CS","签名变更","CS","U"), + CT("CT","退保","CT","P"), + DA("DA","增加附加特约责任","DA","U"), + DB("DB","红利领取","DB","P"), + DT("DT","附加特约责任终止","DT","U"), + EB("EB","差错回退","EB","U"), + EF("EF","终止附加险","EF","P"), + EI("EI","延长保险期间","EI","G"), + EN("EN","续保方式变更","EN","U"), + ER("ER","满期降低保额续保","ER","G"), + ES("ES","终止险种","ES","P"), + FM("FM","交费期间变更","FM","U"), + GA("GA","年金转换","GA","U"), + GB("GB","领取年龄变更","GB","U"), + GC("GC","生存给付转账授权","GC","U"), + GM("GM","领取方式变更","GM","U"), + HI("HI","补充告知","HI","U"), + HJ("HJ","万能缓缴期","HJ","U"), + IC("IC","客户重要资料变更(保单层","IC","U"), + IG("IG","投连险提前通知领取","IG","P"), + IO("IO","职业变更","IO","U"), + IP("IP","追加保费","IP","G"), + IR("IR","更换被保险人","IR","U"), + IT("IT","投连险退保","IT","P"), + JB("JB","减保选择权","JB","U"), + LG("LG","生存给付柜面领取","LG","P"), + LN("LN","保单质押贷款","LN","P"), + LR("LR","保单遗失补发","LR","G"), + MF("MF","长险费用变更","MF","U"), + MR("MR","主险续保","MR","G"), + NC("NC","新增保险方案","NC","G"), + NI("NI","新增被保险人","NI","G"), + NP("NP","保单新增险种","NP","G"), + NR("NR","被保人增加险种","NR","G"), + NS("NS","新增附加险","NS","G"), + OP("OP","万能险部分领取","OP","G"), + PA("PA","投资计划变更","PA","U"), + PC("PC","续期交费信息变更","PC","U"), + PF("PF","保单冻结及解冻","PF","U"), + PG("PG","投连险随时领取","PG","G"), + PL("PL","保单挂失、解挂","PL","U"), + PM("PM","缴费频率变更","PM","U"), + PR("PR","保单迁移","PR","U"), + PT("PT","减少保险金额","PT","P"), + PU("PU","减额缴清","PU","G"), + RB("RB","保全回退","RB","G"), + RC("RC","交费提醒方式变更","RC","U"), + RD("RD","部分领取","RD","P"), + RE("RE","保单复效","RE","Q"), + RF("RF","贷款清偿","RF","G"), + RG("RG","满期领取","RG","P"), + RN("RN","不定期缴费","RN","P"), + RR("RR","无名单实名化","RR","U"), + SA("SA","建工险保单延期","SA","U"), + SC("SC","特约变更","SC","U"), + SF("SF","公共保额收付费","SF","G"), + SM("SM","服务类维护","SM","U"), + TA("TA","转养老金","TA","U"), + TI("TI","投连账户转换","TI","U"), + TR("TR","保费自垫清偿","TR","G"), + TS("TS","投连复缴","TS","G"), + VC("VC","保单归属规则维护","VC","U"), + VR("VR","被保险人归属规则变更","VR","U"), + WP("WP","万能追加保费","WP","G"), + WT("WT","犹豫期退保","WT","P"), + XS("XS","协议减保","XS","U"), + XT("XT","协议退保","XT","P"), + ZT("ZT","减少被保险人","ZT","P"); diff --git a/src/views/ebiz/preserve/Search.vue b/src/views/ebiz/preserve/Search.vue index a673465df..e982c675e 100644 --- a/src/views/ebiz/preserve/Search.vue +++ b/src/views/ebiz/preserve/Search.vue @@ -30,9 +30,15 @@ + + diff --git a/src/views/ebiz/preserve/HandleResult.vue b/src/views/ebiz/preserve/common/HandleResult.vue similarity index 100% rename from src/views/ebiz/preserve/HandleResult.vue rename to src/views/ebiz/preserve/common/HandleResult.vue diff --git a/src/views/ebiz/preserve/PolicyList.vue b/src/views/ebiz/preserve/common/PolicyList.vue similarity index 64% rename from src/views/ebiz/preserve/PolicyList.vue rename to src/views/ebiz/preserve/common/PolicyList.vue index d47e30914..419e3e607 100644 --- a/src/views/ebiz/preserve/PolicyList.vue +++ b/src/views/ebiz/preserve/common/PolicyList.vue @@ -1,22 +1,11 @@ + + diff --git a/src/views/ebiz/preserve/RenewalConfirmation.vue b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue similarity index 100% rename from src/views/ebiz/preserve/RenewalConfirmation.vue rename to src/views/ebiz/preserve/pc/RenewalConfirmation.vue diff --git a/src/views/ebiz/preserve/RenewalInfo.vue b/src/views/ebiz/preserve/pc/RenewalInfo.vue similarity index 100% rename from src/views/ebiz/preserve/RenewalInfo.vue rename to src/views/ebiz/preserve/pc/RenewalInfo.vue diff --git a/src/views/ebiz/preserve/wt/ImageUpload.vue b/src/views/ebiz/preserve/wt/ImageUpload.vue new file mode 100644 index 000000000..5779885fd --- /dev/null +++ b/src/views/ebiz/preserve/wt/ImageUpload.vue @@ -0,0 +1,447 @@ + + + + + + From 02dfc2fee7d84cc3b0be591403ba8a2daada9f3d Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Wed, 3 Jun 2020 17:59:05 +0800 Subject: [PATCH 15/20] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?= =?UTF-8?q?=E5=8F=97=E7=9B=8A=E4=BA=BA-=E5=88=9D=E5=A7=8B=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E3=80=81=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8F=97=E7=9B=8A=E4=BA=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=9B=E4=BF=9D=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/ebiz/preserve.js | 2 +- .../ebiz/preserve/bc/BeneficiaryInfo.vue | 65 +++++++++++----- .../ebiz/preserve/bc/BeneficiaryInfoAdd.vue | 76 +++++++++++-------- src/views/ebiz/preserve/bc/ImageUpload.vue | 32 +------- src/views/ebiz/preserve/common/PolicyList.vue | 28 +++++-- 5 files changed, 114 insertions(+), 89 deletions(-) diff --git a/src/router/ebiz/preserve.js b/src/router/ebiz/preserve.js index 91fd61f4d..820e0d0f7 100644 --- a/src/router/ebiz/preserve.js +++ b/src/router/ebiz/preserve.js @@ -101,7 +101,7 @@ export default [ } }, { - path: '/preserve/imageUpload', + path: '/preserve/bc/imageUpload', name: 'bcImageUpload', component: bcImageUpload, meta: { diff --git a/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue b/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue index a83ad1ca3..c059e3e6d 100644 --- a/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue +++ b/src/views/ebiz/preserve/bc/BeneficiaryInfo.vue @@ -18,8 +18,8 @@
    -
  • -
    +
  • +
    @@ -69,19 +69,30 @@ export default { beneficiaries: [] // 指定受益人列表 } }, - created() { + async created() { // 获取保单列表存储的数据 - this.policy = JSON.parse(localStorage['preserve-policy']) this.customerInfo = JSON.parse(localStorage['preserve-customerInfo']) //客户详情 + this.policy = JSON.parse(localStorage['preserve-policy']) + if (localStorage.fromAddBC) { + this.beneficiaries = this.policy.bnfDTOs + this.type = this.beneficiaries.some(i => { + //isLegal:法定标记 1-是法定受益人 0-是指定受益人 + return i.isNewInfo == '0' && i.isLegal == '0' //新增受益人存在指定受益人 + }) + ? '2' + : '1' + } else { + await this.getPolicyInfo() + this.type = this.beneficiaries.some(i => { + return i.isNewInfo == '1' && i.isLegal == '0' //初始化受益人存在指定受益人 + }) + ? '2' + : '1' + } this.insuredName = this.policy.insuredName - this.getPolicyInfo() - /*this.type = this.policy.bnfDTOs[0].bnfType if (this.type == 2) { this.isDisType = true } - - this.beneficiaries = this.policy.bnfDTOs - */ }, mounted() {}, methods: { @@ -95,16 +106,24 @@ export default { mobile: this.customerInfo.mobile, name: this.customerInfo.name } - policyInfo(data).then(res => { - if (res.result == '0') { - this.beneficiaries = res.content.cont.bcBnfList - this.type = this.beneficiaries[0].isLegal == '1' ? '1' : '2' //isLegal:法定标记 1-是法定受益人 0-是指定受益人 - if (this.type == 2) { - this.isDisType = true + return new Promise((resolve, reject) => { + policyInfo(data).then( + res => { + if (res.result == '0') { + this.beneficiaries = res.content.cont.bcBnfList + //isNewInfo 是否新信息 0-是 1-否 + this.beneficiaries.forEach(item => { + item.isNewInfo = '1' + }) + resolve() + } else { + reject(this.$toast(res.resultMessage)) + } + }, + error => { + reject(console.log(error)) } - } else { - this.$toast(res.resultMessage) - } + ) }) }, //下一步 @@ -113,6 +132,13 @@ export default { this.$toast('受益人列表不能为空') return } + let beneRatio = 0 + this.beneficiaries.forEach(item => { + beneRatio += Number(item.bnfLot) + }) + if (beneRatio != 100 && !(this.beneficiaries.length == 1 && this.beneficiaries[0].isLegal == '1')) { + return this.$toast('受益人受益比例不合法') + } let feachData = { platformType: 'APP', edorType: 'BC', @@ -124,6 +150,7 @@ export default { if (res.result == 0) { this.policy.bnfDTOs = this.beneficiaries localStorage['preserve-policy'] = JSON.stringify(this.policy) + localStorage.removeItem('fromAddBC') let path = '' if (this.type != 2) { path = '/preserve/common/HandleResult?entry=BC' @@ -188,7 +215,7 @@ export default { editBeneficiary(index) { this.policy.bnfDTOs = this.beneficiaries localStorage['preserve-policy'] = JSON.stringify(this.policy) - let path = '/preserve/BeneficiaryInfoAdd?edit=' + index + let path = '/preserve/bc/BeneficiaryInfoAdd?edit=' + index this.$jump({ flag: 'h5', extra: { diff --git a/src/views/ebiz/preserve/bc/BeneficiaryInfoAdd.vue b/src/views/ebiz/preserve/bc/BeneficiaryInfoAdd.vue index c39c8effb..035db2f99 100644 --- a/src/views/ebiz/preserve/bc/BeneficiaryInfoAdd.vue +++ b/src/views/ebiz/preserve/bc/BeneficiaryInfoAdd.vue @@ -66,7 +66,7 @@ name="证件截止日期" :required="isRequired" :defaultDate="new Date()" - :value.sync="userInfo.effectiveDate" + :value.sync="userInfo.idExpDate" type="date" @confirm="onDateConfirm($event, '1')" ref="effectiveDate" @@ -104,7 +104,7 @@ name="受益比例" placeholder="请输入" required - v-validate="'required|onlyNumber'" + v-validate="'required|onlyInteger'" maxlength="3" clearable /> @@ -225,29 +225,33 @@ export default { marriage: '', isRequired: '', //长期前是否有* userInfo: { - bnfId: '', - bnfType: '2', + bnfType: '1', //受益人类别 0-生存受益人 1-身故受益人 + isLegal: '0', //1-法定受益人 0-指定受益人 + bnfNo: '1', + relationToInsured: '', //受益人和被保人关系 + bnfOrder: 1, bnfGrade: '', name: '', sex: '0', - nationality: '1', - birthday: '', + isNewInfo: '0', //是否是新信息 0-是 1-否 idType: '1', idNo: '', - certificateValidate: '', - effectiveDate: '', - effectiveDateType: false, //是否长期 - bnfNo: '1', - bnfOrder: 1, - bnfLot: '', + idExpDate: '', //证件截止日期 phone: '', + birthday: '', + nationality: '1', + email: '', province: '', city: '', - area: '', - postalAddress: '', - email: '', + postalAddress: '', //详细地址 occupationCode: '', - occupationName: '' // 职业中文 + occupationType: '', + occupationName: '', + area: '', + bnfLot: '', //受益比例 + + // certificateValidate: '', + effectiveDateType: false //是否长期 }, areaList: areaList, occupationShowPicker: false, @@ -260,6 +264,11 @@ export default { created() { this.policy = JSON.parse(localStorage['preserve-policy']) this.bnfDTOs = this.policy.bnfDTOs + this.bnfDTOs.map(i => { + if (i.idExpDate == '9999-01-01') { + i.effectiveDateType = true + } + }) if (this.$route.query.edit) { this.editIndex = this.$route.query.edit this.userInfo = this.bnfDTOs[this.$route.query.edit] @@ -305,7 +314,7 @@ export default { ;[this.userInfo.nationality, this.nationality] = [value.id, value.text] } else if (this.pickerType == '2') { this.idLimit = false - this.userInfo.idNo = this.userInfo.effectiveDate = this.userInfo.birthday = '' + this.userInfo.idNo = this.userInfo.idExpDate = this.userInfo.birthday = '' // this.userInfo.sex = '0' this.effectiveDateTypeAble = false //身份证以外的证件类型可以使用长期 @@ -336,7 +345,7 @@ export default { this.userInfo.effectiveDateType = false //如果录入日期早于当前日期 if (Date.parse(val) < Date.parse(new Date())) { - this.userInfo.effectiveDate = '' + this.userInfo.idExpDate = '' this.$refs.effectiveDate.date = '' return this.$toast('您的证件已过期') } @@ -358,7 +367,7 @@ export default { } //出生证有效期 if (this.userInfo.idType == '3') { - if (Date.parse(this.userInfo.effectiveDate) - Date.parse(val) > Date.parse('1973-01-01')) { + if (Date.parse(this.userInfo.idExpDate) - Date.parse(val) > Date.parse('1973-01-01')) { this.userInfo.birthday = '' this.$refs.birthday.date = '' return this.$toast('出生证有效期或出生日期有误') @@ -388,7 +397,7 @@ export default { if (data.idEffectEndDate == '9999-01-01') { this.userInfo.effectiveDateType = true //是否长期 } else { - this.userInfo.effectiveDate = data.idEffectEndDate //证件截止日期 + this.userInfo.idExpDate = data.idEffectEndDate //证件截止日期 } this.userInfo.occupationCode = data.occupationCode //职业类别编码 this.userInfo.occupationName = data.occupationName //职业类别名称 @@ -444,22 +453,22 @@ export default { //年龄在0-15周岁之间 if (age <= 15) { - if (Date.parse(this.userInfo.effectiveDate) - Date.parse(new Date()) > Date.parse('1975-01-01')) { - this.userInfo.effectiveDate = '' + if (Date.parse(this.userInfo.idExpDate) - Date.parse(new Date()) > Date.parse('1975-01-01')) { + this.userInfo.idExpDate = '' this.$refs.effectiveDate.date = '' return this.$toast('证件有效期不正常，未满16周岁的公民身份证有效期应小于等于5年') } //年龄在 16-25 周岁之间 } else if (age >= 16 && age <= 25) { - if (Date.parse(this.userInfo.effectiveDate) - Date.parse(new Date()) > Date.parse('1980-01-01')) { - this.userInfo.effectiveDate = '' + if (Date.parse(this.userInfo.idExpDate) - Date.parse(new Date()) > Date.parse('1980-01-01')) { + this.userInfo.idExpDate = '' this.$refs.effectiveDate.date = '' return this.$toast('证件有效期不正常，16周岁至25周岁公民身份证有效期应小于等于10年') } //年龄在 26-45 周岁之间 } else if (age >= 26 && age <= 45) { - if (Date.parse(this.userInfo.effectiveDate) - Date.parse(new Date()) > Date.parse('1990-01-01')) { - this.userInfo.effectiveDate = '' + if (Date.parse(this.userInfo.idExpDate) - Date.parse(new Date()) > Date.parse('1990-01-01')) { + this.userInfo.idExpDate = '' this.$refs.effectiveDate.date = '' return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年') } @@ -517,15 +526,22 @@ export default { this.bnfDTOs[this.editIndex] = this.userInfo } this.policy.bnfDTOs = this.bnfDTOs + this.policy.bnfDTOs.map(i => { + if (i.effectiveDateType) { + i.idExpDate = '9999-01-01' + } + delete i.effectiveDateType + }) + localStorage.fromAddBC = true localStorage['preserve-policy'] = JSON.stringify(this.policy) this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/preserve/BeneficiaryInfo', + url: location.origin + '/#/preserve/bc/BeneficiaryInfo', needRefresh: '1' }, routerInfo: { - path: '/preserve/BeneficiaryInfo' + path: '/preserve/bc/BeneficiaryInfo' } }) } else { @@ -554,7 +570,7 @@ export default { effectiveDataTypeChange(val) { //勾选长期状态时,证件截止日期置空 if (val) { - this.userInfo.effectiveDate = '' + this.userInfo.idExpDate = '' this.effectiveDateRequired = false } else { this.effectiveDateRequired = true @@ -564,7 +580,7 @@ export default { getIdentityInfo(data) { console.log(data) if (data.name && data.name != '待识别') { - this.userInfo.effectiveDate = data.endDate + this.userInfo.idExpDate = data.endDate this.userInfo.name = data.name this.userInfo.idNo = data.idNo } diff --git a/src/views/ebiz/preserve/bc/ImageUpload.vue b/src/views/ebiz/preserve/bc/ImageUpload.vue index 48445ac35..6fafef359 100644 --- a/src/views/ebiz/preserve/bc/ImageUpload.vue +++ b/src/views/ebiz/preserve/bc/ImageUpload.vue @@ -16,7 +16,7 @@ :after-read="afterRead" :before-delete="beforeDelete" class="mt10 ml20" - :max-count="1" + :max-count="2" @delete="deleteImg" />
    @@ -355,36 +355,6 @@ export default { } }) } - }, - computed: { - listenChange() { - const { fileListIdFront, fileListIdBack, fileListBank } = this - return { - fileListIdFront, - fileListIdBack, - fileListBank - } - } - }, - watch: { - listenChange(val) { - if ( - (val.fileListIdFront.length != '0' && - val.fileListIdBack.length != '0' && - val.fileListBank.length != '0' && - (this.entry == 'surrender' || this.entry == 'hesitateSurrender') && - this.accountType == '1') || - (this.entry == 'renewal' && val.fileListBank.length != '0') || - (val.fileListIdFront.length != '0' && - val.fileListIdBack.length != '0' && - (this.entry == 'surrender' || this.entry == 'hesitateSurrender') && - this.accountType == '0') - ) { - this.isDisabled = false - } else { - this.isDisabled = true - } - } } } diff --git a/src/views/ebiz/preserve/common/PolicyList.vue b/src/views/ebiz/preserve/common/PolicyList.vue index 419e3e607..692ccae42 100644 --- a/src/views/ebiz/preserve/common/PolicyList.vue +++ b/src/views/ebiz/preserve/common/PolicyList.vue @@ -70,19 +70,31 @@ export default { policyList: [] //保单列表 } }, - mounted() { + async mounted() { + if (localStorage['preserve-policy']) { + localStorage.removeItem('preserve-policy') + } this.entry = this.$route.query.entry - this.getPolicyList({ customerNo: this.customerInfo.customerNo, edorType: this.entry }) + await this.getPolicyList({ customerNo: this.customerInfo.customerNo, edorType: this.entry }) }, methods: { //获取保单列表 getPolicyList(data) { - policyList(data).then(res => { - if (res.result == '0') { - this.policyList = res.content.policyDTOList - } else { - this.$toast(res.content) - } + return new Promise((resolve, reject) => { + policyList(data).then( + res => { + if (res.result == '0') { + this.policyList = res.content.policyDTOList + resolve() + } else { + this.$toast(res.content) + reject() + } + }, + error => { + reject(console.log(error)) + } + ) }) }, From f70d800586a22d4b189974f0c86af4fff328ba6c Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 4 Jun 2020 14:14:24 +0800 Subject: [PATCH 16/20] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?= =?UTF-8?q?=E4=BF=9D=E5=85=A8=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/preserve/preserve.js | 8 + src/assets/js/utils/request.js | 3 +- src/views/ebiz/preserve/Progress.vue | 322 +++--------------- src/views/ebiz/preserve/Search.vue | 1 + .../preserve/bc/BeneficiaryInfoDetail.vue | 4 +- src/views/ebiz/preserve/js/data-dictionary.js | 93 +++-- 6 files changed, 127 insertions(+), 304 deletions(-) diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js index 44985f9bd..acbee4395 100644 --- a/src/api/ebiz/preserve/preserve.js +++ b/src/api/ebiz/preserve/preserve.js @@ -43,6 +43,14 @@ export function changeEdor(data) { }) } +//保全进度查询列表 +export function queryEdorList(data) { + return request({ + url: getUrl('/edor/edor/queryEdorList', 1), + method: 'post', + data + }) +} //签名信息保存 export function edorSignSave(data) { return request({ diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index 85c6fb1c3..046d56327 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -69,7 +69,8 @@ let manpower = [ //保全 let preserve = [ '/edor/customer/customerList', //客户搜索 - '/edor/policy/policyList' //保单列表 + '/edor/policy/policyList', //保单列表 + '/edor/edor/queryEdorList' //保全进度查询 ] let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...preserve, ...manpower] diff --git a/src/views/ebiz/preserve/Progress.vue b/src/views/ebiz/preserve/Progress.vue index 9137220f8..0d120f5f1 100644 --- a/src/views/ebiz/preserve/Progress.vue +++ b/src/views/ebiz/preserve/Progress.vue @@ -1,7 +1,7 @@ diff --git a/src/views/ebiz/preserve/pc/RenewalConfirmation.vue b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue index aed0f8dff..bceaf5743 100644 --- a/src/views/ebiz/preserve/pc/RenewalConfirmation.vue +++ b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue @@ -15,89 +15,61 @@

    保单信息

    - +
    - - + - - - + + + - - + +
    + -

    以上变更后续账号信息

    - - -
    {{ newBank }}
    -     - -
    {{ newBankNo }}
    -     +
    +
    +

    以上变更后续账号信息

    + + +
    {{ item.bankCode | idToText('edorBankType') }}
    +     + +
    {{ item.bankNo }}
    +     +
    +

    以下内容需要您阅读确认:

    -

    需阅读：

    -

    - 《自动转账授权书》 - -

    +
    +

    需阅读：

    +
    + 《{{ item.documentName }}》 + +
    +

    点击【开始】按钮，进行相关操作

     - - - -

    向此手机发送验证码确认用户身份

    -

    {{ customerMobile }}

    - - - {{ - codeDisabled ? `${countDown}s后重新获取` : '获取验证码' - }} - -     -
    - 提交申请 - - - 开始 + 开始
    diff --git a/src/views/ebiz/preserve/pc/RenewalInfo.vue b/src/views/ebiz/preserve/pc/RenewalInfo.vue index f9a4156c9..0e37aa99f 100644 --- a/src/views/ebiz/preserve/pc/RenewalInfo.vue +++ b/src/views/ebiz/preserve/pc/RenewalInfo.vue @@ -4,18 +4,18 @@

    保单信息

    - +
    - + - - + + - - - + + +
    @@ -68,8 +68,10 @@ diff --git a/src/views/ebiz/preserve/ct/SurrenderConfirmation.vue b/src/views/ebiz/preserve/ct/SurrenderConfirmation.vue index 65c647c46..66e2fbd7a 100644 --- a/src/views/ebiz/preserve/ct/SurrenderConfirmation.vue +++ b/src/views/ebiz/preserve/ct/SurrenderConfirmation.vue @@ -4,85 +4,71 @@

    尊敬的 - {{ orderInfo.accountName }}先生/女士, 您好! + {{ ebizSurrender.accountName }}先生/女士，您好！

    您的 - 退保已由代理人代办，请确认信息并进行提交: + 退保已由代理人代办，标红字体为修改/添加内容，请确认信息并进行提交:

    保单信息

    - - - - - - - + + + + + + +

    账号信息

    - - + + -
    {{ accountInfo.newBank }}
    +
    {{ ebizSurrender.bankName }}
     -
    {{ accountInfo.newBankNo }}
    +
    {{ ebizSurrender.bankNo }}
    +     + +
    {{ ebizSurrender.bankProvince }}
    +     + +
    {{ ebizSurrender.reason }}
    +     + +
    {{ ebizSurrender.remark }}
     - -

    以下内容需要您阅读确认:

    -

    需阅读：

    -

    - 《国富人寿人身保险退保协议》 - -

    +
    +

    需阅读：

    +
    + 《{{ item.documentName }}》 + +
    +

    点击【开始】按钮，进行相关操作

     - - +

    向此手机发送验证码确认用户身份

    -

    {{ customerMobile }}

    +

    {{ customerInfo.customerMobile | mask }}

    - {{ - codeDisabled ? `${countDown}s后重新获取` : '获取验证码' - }} + + {{ codeDisabled ? `${countDown}s后重新获取` : '获取验证码' }} +     -
    - 提交申请 - - + 提交申请 开始
    @@ -90,10 +76,12 @@ diff --git a/src/views/ebiz/preserve/filters/index.js b/src/views/ebiz/preserve/filters/index.js index 05ca9cd13..4309e2f90 100644 --- a/src/views/ebiz/preserve/filters/index.js +++ b/src/views/ebiz/preserve/filters/index.js @@ -1,4 +1,4 @@ -import Common from '@/assets/js/common' +import Common from '@/assets/js/common' import dataDic from '@/views/ebiz/preserve/js/data-dictionary' /* @@ -153,5 +153,13 @@ export default { let str = '' str = (moneyStr + '').replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,') return str + }, + //手机号加密显示 + mask(value) { + if (value) { + return value.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') + } else { + return '' + } } } diff --git a/src/views/ebiz/preserve/js/data-dictionary.js b/src/views/ebiz/preserve/js/data-dictionary.js index e743a7c5a..490d9dd2d 100644 --- a/src/views/ebiz/preserve/js/data-dictionary.js +++ b/src/views/ebiz/preserve/js/data-dictionary.js @@ -82,7 +82,7 @@ export default { } ], //退款账户列表 - accountList: [{ type: '1', title: '原银行账户' }, { type: '2', title: '新银行账户' }], + accountList: [{ id: '1', text: '原银行账户' }, { id: '2', text: '新银行账户' }], //退款原因列表 surrenderReasonList: [ { id: '1', text: '个人经济原因，无力负担保费' }, @@ -123,39 +123,39 @@ export default { edorBankType: [ { id: 'ABC', - label: '农业银行' + text: '农业银行' }, { id: 'BOC', - label: '中国银行' + text: '中国银行' }, { id: 'BOCOM', - label: '交通银行' + text: '交通银行' }, { id: 'CCB', - label: '建设银行' + text: '建设银行' }, { id: 'CEB', - label: '光大银行' + text: '光大银行' }, { id: 'CIB', - label: '兴业银行' + text: '兴业银行' }, { id: 'ICBC', - label: '工商银行' + text: '工商银行' }, { id: 'PSBC', - label: '邮储银行' + text: '邮储银行' }, { id: 'CMB', - label: '招商银行' + text: '招商银行' } ] /* diff --git a/src/views/ebiz/preserve/pc/RenewalConfirmation.vue b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue index bceaf5743..3cd05bd52 100644 --- a/src/views/ebiz/preserve/pc/RenewalConfirmation.vue +++ b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue @@ -54,7 +54,7 @@

    需阅读：

    《{{ item.documentName }}》 - +

点击【开始】按钮，进行相关操作

diff --git a/src/views/ebiz/preserve/pc/RenewalInfo.vue b/src/views/ebiz/preserve/pc/RenewalInfo.vue index 0e37aa99f..a08d94de8 100644 --- a/src/views/ebiz/preserve/pc/RenewalInfo.vue +++ b/src/views/ebiz/preserve/pc/RenewalInfo.vue @@ -68,12 +68,12 @@