From 515657efa19ef9473fcb4b2694fc50f9ea460350 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Wed, 30 Sep 2020 17:45:25 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E5=85=A5=E5=8F=B8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/approve/ApproveList.vue | 17 +- .../ebiz/agentEenter/approve/RecordDetail.vue | 261 +++++++++++++----- .../ebiz/agentEenter/approve/RecordList.vue | 4 +- 3 files changed, 202 insertions(+), 80 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index 285689f13..1dbf46001 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -39,6 +39,7 @@ {{ item.createdDate }}
+ 撤销申请 审批
@@ -50,11 +51,15 @@
暂无审批信息！
+ +

代理人身份证号:

+ + diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index 1dbf46001..f3f64878c 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -39,7 +39,7 @@ {{ item.createdDate }}
- 撤销申请 + 撤销申请 审批
@@ -51,16 +51,16 @@
暂无审批信息！
- +

代理人身份证号:

- + - + diff --git a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue index be00abb24..2a036455c 100644 --- a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue +++ b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue @@ -3,6 +3,7 @@

提交成功!

+ 填写执业证信息 返回
@@ -20,6 +21,17 @@ export default { next() }, methods: { + fillInPractisingCertificate() { + this.$jump({ + flag: 'h5', + extra: { + url: `${location.origin}/#/agentEenter/practisingCertificateInfo` + }, + routerInfo: { + path: '/agentEenter/practisingCertificateInfo' + } + }) + }, goBack() { this.$jump({ flag: 'h5', From 01c9f7d4b4561b020aed870cc5480898df797aeb Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Fri, 9 Oct 2020 18:01:15 +0800 Subject: [PATCH 03/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E9=87=8D=E5=A4=8D=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/agentEenter/approve/ApproveList.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index f3f64878c..84af73c6c 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -175,9 +175,14 @@ export default { let resData = res.content.approveWaitPageInfo if (resData.list.length > 0) { this.isSuccess = true - resData.list.map(ele => { - this.approveList.push(ele) - }) + for (let data of resData.list) { + let exist = this.approveList.findIndex(item => { + return item.baseId === data.baseId + }) + if (exist === -1) { + this.approveList.push(data) + } + } if (resData.pageNum == resData.pages) { this.finished = true this.finishedText = '没有更多了' From 34a592a56908482ba0c7a0406e6828929fb71557 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Sat, 10 Oct 2020 11:06:16 +0800 Subject: [PATCH 04/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=92=A4=E9=94=80?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2,=20?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E7=89=87=E8=B5=84=E6=96=99=E5=92=8C=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/approve/ApproveList.vue | 9 ++ .../ebiz/agentEenter/approve/BasicInfo.vue | 135 +++++++++++++++++- .../ebiz/agentEenter/approve/RecordDetail.vue | 7 +- .../agentEenter/approve/SubmitSuccess.vue | 24 ++-- 4 files changed, 155 insertions(+), 20 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index 84af73c6c..1e351731e 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -127,6 +127,15 @@ export default { } this.idNo = '' done() + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + `/#/agentEenter/approve/SubmitSuccess?from=revoke` + }, + routerInfo: { + path: `/agentEenter/approve/SubmitSuccess?from=revoke` + } + }) } } else { done() diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue index 36ba88d7f..574f6ac18 100644 --- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue +++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue @@ -1,7 +1,12 @@ diff --git a/src/views/ebiz/agentEenter/PractisingCertificate.vue b/src/views/ebiz/agentEenter/PractisingCertificate.vue index 532348228..910a1aff8 100644 --- a/src/views/ebiz/agentEenter/PractisingCertificate.vue +++ b/src/views/ebiz/agentEenter/PractisingCertificate.vue @@ -1,78 +1,77 @@ diff --git a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue index 219cbfa89..b7f4bc43b 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue @@ -155,20 +155,18 @@ export default { result: this.approvalResult, //审批结果 0-拒绝审批 1-通过 msg: this.approvalMsg //审批原因 } - console.log('审批结果==', params) agentAddApproval(params).then(res => { - console.log('res ==', res) if (res.result == '0') { console.log('审批结果提交===') //跳转页面 this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/agentEenter/approve/SubmitSuccess`, + url: location.origin + `/#/agentEenter/approve/SubmitSuccess?baseId=${baseId}`, forbidSwipeBack: '1', //1:禁止右滑返回 backToFirst: '1' //1:点击左上角，返回到入口第一个webview }, - routerInfo: { path: `/agentEenter/approve/SubmitSuccess` } + routerInfo: { path: `/agentEenter/approve/SubmitSuccess?baseId=${baseId}` } }) } else { this.$toast(res.resultMessage) diff --git a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue index c9e504412..1e1a334a5 100644 --- a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue +++ b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue @@ -43,13 +43,14 @@ export default { } }, fillInPractisingCertificate() { + let baseId = this.$route.params.baseId this.$jump({ flag: 'h5', extra: { - url: `${location.origin}/#/agentEenter/practisingCertificateInfo` + url: `${location.origin}/#/agentEenter/practisingCertificateInfo?baseId=${baseId}` }, routerInfo: { - path: '/agentEenter/practisingCertificateInfo' + path: `/agentEenter/practisingCertificateInfo?baseId=${baseId}` } }) }, From 8478512bf546bc2aa9f2d62c5a61f2327ee15e73 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Tue, 27 Oct 2020 13:06:34 +0800 Subject: [PATCH 26/58] =?UTF-8?q?=E6=89=A7=E4=B8=9A=E8=AF=81list=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4,=20=E4=BA=BA=E7=AE=A1=E5=B2=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=89=A7=E4=B8=9A=E8=AF=81=E7=BB=B4=E6=8A=A4=E6=8C=89=E9=92=AE?= =?UTF-8?q?,=E6=98=AF=E5=90=A6=E4=BA=8C=E6=AC=A1=E5=85=A5=E5=8F=B8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ebiz/agentEenter/agentEenter.js | 9 +++++ .../agentEenter/AddPractisingCertificate.vue | 4 +-- .../agentEenter/AgentEenterBasicInfor.vue | 1 + .../agentEenter/PractisingCertificate.vue | 33 +++++++++++++++++-- .../ebiz/agentEenter/approve/ApproveInfo.vue | 4 +-- .../ebiz/agentEenter/approve/ApproveList.vue | 10 +++--- .../ebiz/agentEenter/approve/BasicInfo.vue | 5 ++- .../ebiz/agentEenter/approve/RecordDetail.vue | 5 ++- .../agentEenter/approve/SubmitSuccess.vue | 10 +++++- 9 files changed, 66 insertions(+), 15 deletions(-) diff --git a/src/api/ebiz/agentEenter/agentEenter.js b/src/api/ebiz/agentEenter/agentEenter.js index dab806a2c..8ab24ac70 100644 --- a/src/api/ebiz/agentEenter/agentEenter.js +++ b/src/api/ebiz/agentEenter/agentEenter.js @@ -94,3 +94,12 @@ export function revoke(data) { data }) } + +// 执业证信息保存 +export function saveCertificateInfo(data) { + return request({ + url: getUrl('/agent/enter/uploadZgz', 1), + method: 'post', + data + }) +} diff --git a/src/views/ebiz/agentEenter/AddPractisingCertificate.vue b/src/views/ebiz/agentEenter/AddPractisingCertificate.vue index f1601f8e4..f673a7f59 100644 --- a/src/views/ebiz/agentEenter/AddPractisingCertificate.vue +++ b/src/views/ebiz/agentEenter/AddPractisingCertificate.vue @@ -87,7 +87,7 @@ export default { isTimeSelectorShow: false, effectiveDate: '-', tempDate: new Date(), - columns: ['执业证', '资格证'], + columns: ['执业证', '其他'], typeColor: true, timeColor: true } @@ -141,7 +141,7 @@ export default { return this.$toast('不能重复添加同一类型执业证书') } const reg = /^\d{26}$/ - if (!reg.test(this.certificate.certificate_no)) { + if (this.certificate.certificate_type === '执业证' && !reg.test(this.certificate.certificate_no)) { return this.$toast('证书编号录入不正确') } if (!this.certificate.issuedate) { diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue index e28c4ae64..e1dd34e14 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue @@ -496,6 +496,7 @@ export default { if (res.result == '0') { that.$toast.clear() this.userInfo = res.content.ebizEnterCustomerDto + this.bankCode = this.userInfo.bankCode this.ebiz_referrer = res.content.ebizReferrerDto if (this.userInfo.idType == '1') { this.effectiveDateTypeAble = idToData(this.userInfo.idNo).age < 45 diff --git a/src/views/ebiz/agentEenter/PractisingCertificate.vue b/src/views/ebiz/agentEenter/PractisingCertificate.vue index 910a1aff8..e174b39d0 100644 --- a/src/views/ebiz/agentEenter/PractisingCertificate.vue +++ b/src/views/ebiz/agentEenter/PractisingCertificate.vue @@ -3,7 +3,7 @@
- 删除 + 删除
@@ -16,16 +16,19 @@ + 完成 From be049804da518071f2f8784fe92707b8a2611b7a Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Wed, 28 Oct 2020 18:31:24 +0800 Subject: [PATCH 33/58] =?UTF-8?q?=E8=BD=AC=E6=8D=A2appntNode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/approve/ApproveInfo.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue index abff666cb..9df26c32c 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue @@ -114,7 +114,21 @@ export default { this.$validator.validate().then(valid => { if (true === valid) { let baseId = this.$route.params.baseId // 代理人id - let appntNode = this.$route.params.appntNode + let appntNode + switch (this.$route.params.appntNode) { + case '1': + appntNode = '1' + break + case '3': + appntNode = '2' + break + case '5': + appntNode = '3' + break + default: + appntNode = null + break + } let params = { types: ['00'], ebizEnterCustomerDto: { From a060f3d6821ad979295ec8b8edab1df2e0f3e707 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Wed, 28 Oct 2020 18:40:59 +0800 Subject: [PATCH 34/58] =?UTF-8?q?=E6=89=A7=E4=B8=9A=E8=AF=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/PractisingCertificate.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/views/ebiz/agentEenter/PractisingCertificate.vue b/src/views/ebiz/agentEenter/PractisingCertificate.vue index 851651438..8ce424746 100644 --- a/src/views/ebiz/agentEenter/PractisingCertificate.vue +++ b/src/views/ebiz/agentEenter/PractisingCertificate.vue @@ -49,6 +49,7 @@ export default { list.push({ ...certificate }) } for (let item of list) { + item.certificate_type === '执业证' ? '1' : '2' item.flag = item.flag === '是' ? 'Y' : 'N' } console.dir(list) @@ -57,6 +58,20 @@ export default { certificate: list } const result = await saveCertificateInfo(params) + if (result.result === '0') { + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + '/#/agentEenter/approve/ApproveList', + needRefresh: '1' + }, + routerInfo: { + path: '/agentEenter/approve/ApproveList' + } + }) + } else { + this.$toast(result.resultMessage) + } console.dir(result) }, async deleteCertificate(index) { From 583cdd8bf9e7183062067f84a9794d11a3d11093 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Wed, 28 Oct 2020 18:50:24 +0800 Subject: [PATCH 35/58] =?UTF-8?q?=E8=B5=84=E6=A0=BC=E8=AF=81=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/approve/ApproveList.vue | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index 9b8a81de2..7e10f7481 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -33,7 +33,16 @@
撤销申请 - 审批 + 审批 + 资格证维护
@@ -82,7 +91,11 @@ export default { isSuccess: false, basicId: 0, idNo: '', - innerNodes: [{ type: 1, isFinished: false }, { type: 3, isFinished: false }, { type: 5, isFinished: false }], + innerNodes: [ + { type: 1, isFinished: false }, + { type: 3, isFinished: false }, + { type: 5, isFinished: false } + ], isLoadMore: false } }, @@ -106,6 +119,17 @@ export default { } }, methods: { + goCertificate(baseId) { + this.$jump({ + flag: 'h5', + extra: { + url: location.origin + `/#/agentEenter/practisingCertificateInfo?baseId=${baseId}` + }, + routerInfo: { + path: `/agentEenter/practisingCertificateInfo?baseId=${baseId}` + } + }) + }, // 外勤查询数据 async getOuterDataList() { this.isLoadMore = true From f72879644dc91acc2817c76bc748d2c6b6e4bf49 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Wed, 28 Oct 2020 18:55:29 +0800 Subject: [PATCH 36/58] =?UTF-8?q?=E6=89=A7=E4=B8=9A=E8=AF=81=E5=80=BC?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/agentEenter/PractisingCertificate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/agentEenter/PractisingCertificate.vue b/src/views/ebiz/agentEenter/PractisingCertificate.vue index 8ce424746..240bf2ee2 100644 --- a/src/views/ebiz/agentEenter/PractisingCertificate.vue +++ b/src/views/ebiz/agentEenter/PractisingCertificate.vue @@ -49,7 +49,7 @@ export default { list.push({ ...certificate }) } for (let item of list) { - item.certificate_type === '执业证' ? '1' : '2' + item.certificate_type = item.certificate_type === '执业证' ? '1' : '2' item.flag = item.flag === '是' ? 'Y' : 'N' } console.dir(list) From 054ce508e563f471cd45106a216dc81ae2f646e7 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Thu, 29 Oct 2020 10:47:06 +0800 Subject: [PATCH 37/58] =?UTF-8?q?=E5=85=A5=E5=8F=B8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agentEenter/AgentEenterBasicFamily.vue | 9 +-- .../agentEenter/AgentEenterBasicHealth.vue | 25 +----- .../agentEenter/AgentEenterBasicInfor.vue | 81 ++++--------------- .../ebiz/agentEenter/AgentEnterGuarantor.vue | 32 ++------ src/views/ebiz/agentEenter/Guarantee.vue | 28 +------ src/views/ebiz/agentEenter/HealthNotice.vue | 21 ----- .../agentEenter/IllegalLetterOfCommitment.vue | 32 +------- .../ebiz/agentEenter/LetterCommitment.vue | 41 ++-------- .../agentEenter/MessageLetterOfCommitment.vue | 33 +------- src/views/ebiz/agentEenter/Paction.vue | 21 +---- src/views/ebiz/agentEenter/SignContract.vue | 16 +--- .../ebiz/agentEenter/approve/ApproveInfo.vue | 2 - .../ebiz/agentEenter/approve/BasicInfo.vue | 6 +- 13 files changed, 43 insertions(+), 304 deletions(-) diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue index be6c39b41..44bf903af 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue @@ -175,11 +175,7 @@ export default { loadingType: 'spinner', message: '加载中……' }) - let data = { - // userModel: { //线上去掉 - // mobile: '13000000000' - // } - } + let data = {} agentAll(data).then(res => { if (res.result == '0') { if (res.content.ebizRelationDtoLst.length != 0) { @@ -332,9 +328,6 @@ export default { }) let params = { entryType: 'CUSTOMER_RELATION', - // userModel: { //线上去掉 - // mobile: '13000000000' - // }, ebizRelationDtoLst: {} } params.ebizRelationDtoLst = that.userInfo diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue index dbe47f7c3..4efe5e9ab 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue @@ -94,7 +94,6 @@ export default { }, mounted() { document.body.style.backgroundColor = '#fff' - // this.getImpart() this.agentAll() }, beforeRouteLeave(to, from, next) { @@ -136,12 +135,7 @@ export default { //获取健康告知列表 getImpart(dataItemLst) { let that = this - let data = { - // userModel: { - // //线上去掉 - // mobile: '18888888888' - // } - } + let data = {} that.$toast.loading({ duration: 0, // 持续展示 toast forbidClick: true, // 禁用背景点击 @@ -150,7 +144,6 @@ export default { }) getImpart(data).then(res => { that.$toast.clear() - console.log(res) res.map((item, index) => { if (dataItemLst && dataItemLst.length > 0) { let showLst = dataItemLst.filter(itemC => { @@ -162,17 +155,7 @@ export default { item.bigCode = 'A' + index + 1 if (item.itemDtoLst) { item.itemDtoLst.map((it, index) => { - // let showSubLst = showLst.filter(itemB => { let showSubLst = showLst[0].itemDtoLst.filter(itemB => { - console.log( - '!!!!!!!!!!', - item.itemDtoLst, - showLst, - showLst[0].itemDtoLst, - it, - itemB, - itemB.impartNo == it.impartNo && itemB.impartType == it.impartType - ) return itemB.impartNo == it.impartNo && itemB.impartType == it.impartType }) if (showSubLst && showSubLst.length > 0) { @@ -312,10 +295,6 @@ export default { let params = { entryType: 'CUSTOMER_ITEM', ebizItemDtoLst: {} - // userModel: { - // //线上去掉 - // mobile: '13000000000' - // } } params.ebizItemDtoLst = that.impartDTOS saveOrUpdateInfo(params).then(res => { @@ -326,8 +305,6 @@ export default { extra: { url: location.origin + '/#/agentEenter/signContract', pullRefresh: '1' - // forbidSwipeBack: '1', - // backToFirst: '1' }, routerInfo: { path: '/agentEenter/signContract' diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue index e1dd34e14..416651c0d 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue @@ -40,8 +40,6 @@ @click="toSelect('1')" required /> - - - - - - - - - + - - - - - - - { if (res.result == '0') { - that.$toast.clear() + this.$toast.clear() this.userInfo = res.content.ebizEnterCustomerDto this.bankCode = this.userInfo.bankCode this.ebiz_referrer = res.content.ebizReferrerDto @@ -512,7 +473,6 @@ export default { } }) }, - //监听名字变化 nameChange(name) { this.userInfo.name = name @@ -520,13 +480,11 @@ export default { selectClick(index) { selectComp(this, index, '1') }, - chooseOccupation() { chooseOccupation(this, '1') }, //弹框选择 toSelect(pickerType, valueKey) { - console.log(pickerType) toSelect(this, pickerType, valueKey, '1') }, //确认选择字段 @@ -574,17 +532,10 @@ export default { if (this.userInfo.name != this.userInfo.accountName) { return this.$toast('姓名与开户名要一致') } - // if (this.userInfo.bankName == '工商银行') { - // this.userInfo.bankName = '102' - // } this.userInfo.bankName = getBankCode(this.bankList, this.bankName) - if ( - //学历为初中、小学、其他、文盲阻断入司 - Number(this.userInfo.degree) == 13 || - Number(this.userInfo.degree) == 12 || - Number(this.userInfo.degree) == 8 || - Number(this.userInfo.degree) == 6 - ) { + const degree = Number(this.userInfo.degree) + // 学历为初中、小学、其他、文盲阻断入司 + if (degree == 13 || degree == 12 || degree == 8 || degree == 6) { return this.$toast('您的学历不符合入司要求，不允许入司。') } this.bankCodeConfirm() @@ -634,10 +585,6 @@ export default { getCode() { getCode(this, '1') }, - //证件扫描 - // goScan() { - // this.isScan = true - // }, //长期状态改变时 effectiveDataTypeChange(val) { if (val) { diff --git a/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue b/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue index a5da4427f..20d4889ed 100644 --- a/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue +++ b/src/views/ebiz/agentEenter/AgentEnterGuarantor.vue @@ -16,17 +16,6 @@ @click="toSelect('1')" required /> - @@ -43,8 +32,6 @@ /> - - { - that.$toast.clear() + this.$toast.clear() if (res.content.ebizGuarantorDto.length != 0) { - that.userInfo = res.content.ebizGuarantorDto + this.userInfo = res.content.ebizGuarantorDto //性别返显 if (res.content.ebizGuarantorDto.sex == null) { this.userInfo.sex = '0' @@ -191,11 +175,9 @@ export default { this.popupShow = false if (this.pickerType == '1') { this.userInfo.relation = value.id - // this.$forceUpdate() } if (this.pickerType == '2') { this.userInfo.type = value.id - // this.$forceUpdate() } }, // 下一步 @@ -221,8 +203,7 @@ export default { }) }, save() { - let that = this - that.$toast.loading({ + this.$toast.loading({ duration: 0, // 持续展示 toast forbidClick: true, // 禁用背景点击 loadingType: 'spinner', @@ -230,12 +211,11 @@ export default { }) let params = { entryType: 'CUSTOMER_GUARANTOR', - // userModel: { mobile: '13000000000' }, //线上去掉 ebizGuarantorDto: {} } - params.ebizGuarantorDto = that.userInfo + params.ebizGuarantorDto = this.userInfo saveOrUpdateInfo(params).then(res => { - that.$toast.clear() + this.$toast.clear() if (res.result == '0') { this.$jump({ flag: 'h5', diff --git a/src/views/ebiz/agentEenter/Guarantee.vue b/src/views/ebiz/agentEenter/Guarantee.vue index d24a3b9e6..682e8a207 100644 --- a/src/views/ebiz/agentEenter/Guarantee.vue +++ b/src/views/ebiz/agentEenter/Guarantee.vue @@ -224,13 +224,13 @@ export default { } }, sign() { - // let that = this this.$toast.loading({ duration: 0, // 持续展示 toast forbidClick: true, // 禁用背景点击 loadingType: 'spinner', message: '加载中……' }) + // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 number: localStorage.idNo, @@ -273,6 +273,7 @@ export default { if (this.isWeixin) { this.toAirSign('0', '担保人签名', '5', '1') } else { + // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 number: localStorage.idNoD, @@ -327,12 +328,7 @@ export default { this.goBack() } else { let data = { - // userModel: { - // mobile: '13000000000' - // }, baseEncryp: this.code == '0' ? this.base64 : this.base64D, - // otherBaseEncryp: this.base64D, - // baseEncryp: '123456', ebizAgreementDto: this.appntSign } console.log('baseEncryp', data.baseEncryp) @@ -367,24 +363,6 @@ export default { } }) } - - // } - // else { - // if (this.isReSign == '1') { - // // 您已签名 - // this.$toast('您已签名') - // } - // } - - // this.$jump({ - // flag: 'h5', - // extra: { - // url: location.origin + `/#/agentEenter/confirmation` - // }, - // routerInfo: { - // path: `/agentEenter/confirmation` - // } - // }) }, goBack() { this.$jump({ @@ -411,14 +389,12 @@ export default { watch: { listenChange(val) { let that = this - // if (val.isOver == true && val.radio != '' && val.appntSign.signState !== '1') { if (val.isOver == true && val.radio != '') { that.isDisable = false } else { that.isDisable = true } - // if (val.isOver == true && val.radio != '' && val.appntSign.signStateD !== '1') { if (val.isOver == true && val.radio != '') { that.isDisableD = false } else { diff --git a/src/views/ebiz/agentEenter/HealthNotice.vue b/src/views/ebiz/agentEenter/HealthNotice.vue index 4641a2e97..54b6ad3bf 100644 --- a/src/views/ebiz/agentEenter/HealthNotice.vue +++ b/src/views/ebiz/agentEenter/HealthNotice.vue @@ -3,7 +3,6 @@ {{ `提示：阅读时长需在${time}秒以上` }}
- 本人确认已阅读 @@ -67,7 +66,6 @@ export default { [Button.name]: Button, [Radio.name]: Radio, [RadioGroup.name]: RadioGroup, - // [CheckboxGroup.name]: CheckboxGroup, [NoticeBar.name]: NoticeBar, [Dialog.name]: Dialog }, @@ -132,7 +130,6 @@ export default { } }, sign() { - // let that = this this.$toast.loading({ duration: 0, // 持续展示 toast forbidClick: true, // 禁用背景点击 @@ -170,9 +167,6 @@ export default { } else { let that = this let data = { - // userModel: { - // mobile: '13000000000' - // }, baseEncryp: that.base64, ebizAgreementDto: that.appntSign } @@ -205,16 +199,6 @@ export default { } }) } - - // this.$jump({ - // flag: 'h5', - // extra: { - // url: location.origin + `/#/agentEenter/confirmation` - // }, - // routerInfo: { - // path: `/agentEenter/confirmation` - // } - // }) }, goBack() { this.$jump({ @@ -242,7 +226,6 @@ export default { listenChange(val) { let that = this if (val.isOver == true && val.radio != '') { - // if (val.isOver == true && val.radio != '' && val.appntSign.signState !== '1') { that.isDisable = false } else { that.isDisable = true @@ -253,10 +236,6 @@ export default { } else { that.isDisabledComplite = true } - /* - if (val.appntSign.signState == '1') { - that.isDisable = true - }*/ } }, beforeRouteLeave(to, from, next) { diff --git a/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue b/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue index eaf37c04f..5f4f98695 100644 --- a/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue +++ b/src/views/ebiz/agentEenter/IllegalLetterOfCommitment.vue @@ -3,7 +3,6 @@ {{ `提示：阅读时长需在${time}秒以上` }}
- 本人确认已阅读 @@ -22,7 +21,7 @@ diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue index 046165bac..2b2224ad8 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue @@ -260,12 +260,9 @@ - - - - +
@@ -282,7 +279,7 @@ import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan' import beforeDate from '@/assets/js/utils/getBeforeDate.js' import RsTop from '@/components/ebiz/agentEenter/RsTop' -import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter.js' +import { saveOrUpdateInfo, agentAll, getBankJoints } from '@/api/ebiz/agentEenter/agentEenter.js' import { idToData } from '@/views/ebiz/customer/js/verification' import SelectBankName from '@/components/ebiz/account/SelectBankName' import { getChildBank, getBankName } from '@/components/ebiz/account/getBankName' @@ -300,7 +297,6 @@ import { getCode, effectiveDataTypeChange } from './js/methods' -import bankListJson from './js/bankList.js' export default { name: 'insuredInfo', @@ -329,9 +325,8 @@ export default { return { bankJoint: '', bankChild: [], - computedBankList: [], + bankJointsList: [], isBankListShow: false, - bankListJson, inputShow: false, //模糊查询功能 islistShow: false, //选择银行弹窗 bankList: [], //银行名称列表 @@ -436,6 +431,15 @@ export default { } } }, + computed: { + bankJointNames() { + const names = [] + this.bankJointsList.forEach(item => { + names.push(item.banknames) + }) + return names + } + }, created() { this.getBankList() }, @@ -444,26 +448,6 @@ export default { window.appCallBack = this.appCallBack this.agentAll() }, - watch: { - code: { - handler: function() { - this.bankJoint = '' - let bank = this.bankListJson.find(item => { - return item.code === this.code.trim() - }) - if (bank) { - this.bankChild = bank.child - const bankNames = [] - for (let bank of bank.child) { - bankNames.push(bank.name) - } - this.computedBankList = bankNames - } else { - this.computedBankList = ['暂无数据'] - } - } - } - }, methods: { isDegreeRequired(degree) { degree = Number(degree) @@ -471,22 +455,44 @@ export default { return '' }, setBankNum(bankJoint) { + this.isBankListShow = false this.bankJoint = bankJoint - for (let name of this.bankChild) { - if (name.name === bankJoint) { - this.userInfo.bankJoint = name.code - this.isBankListShow = false + for (let name of this.bankJointsList) { + if (name.banknames === bankJoint) { + this.userInfo.bankJoint = name.bankjoint return } } }, - setBankArea(area) { + async setBankArea(area) { + console.log(area) const [province, city] = [...area] this.userInfo.bankAddress = `${province.name}-${city.name}` this.userInfo.bankProvince = province.code this.userInfo.bankCity = city.code this.areaName = this.userInfo.bankAddress this.areaShow = false + let param = { + bankcode: this.code, + citycode: city.code.slice(0, 4) + } + this.bankJointsList.splice(0) + let res = await getBankJoints(param) + if (res.result === '0') { + if (!res.content.length) { + param.citycode = this.userInfo.bankProvince.slice(0, 4) + let res = await getBankJoints(param) + if (res.result === '0') { + this.bankJointsList.push(...res.content) + } else { + this.$toast(res.resultMessage) + } + } else { + this.bankJointsList.push(...res.content) + } + } else { + this.$toast(res.resultMessage) + } }, // 获取银行卡列表 getBankList() { From f826cfe4965c096d33c38ebc7068e9e614889a0a Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Fri, 13 Nov 2020 10:57:43 +0800 Subject: [PATCH 51/58] =?UTF-8?q?=E8=81=94=E8=A1=8C=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E6=9C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/AgentEenterBasicInfor.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue index 2b2224ad8..4929c365e 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue @@ -464,7 +464,7 @@ export default { } } }, - async setBankArea(area) { + setBankArea(area) { console.log(area) const [province, city] = [...area] this.userInfo.bankAddress = `${province.name}-${city.name}` @@ -472,9 +472,12 @@ export default { this.userInfo.bankCity = city.code this.areaName = this.userInfo.bankAddress this.areaShow = false + this.queryBankJoints() + }, + async queryBankJoints() { let param = { bankcode: this.code, - citycode: city.code.slice(0, 4) + citycode: this.userInfo.bankCity.slice(0, 4) } this.bankJointsList.splice(0) let res = await getBankJoints(param) @@ -733,6 +736,13 @@ export default { this.save() } }, + watch: { + code() { + if (this.userInfo.bankCity) { + this.queryBankJoints() + } + } + }, beforeDestroy() { //清理计时器 window.clearInterval(this.timeId) From f91f26dfffa193364ce93d4ad7276254ee76eee3 Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Fri, 13 Nov 2020 13:28:04 +0800 Subject: [PATCH 52/58] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/agentEenter/approve/ApproveInfo.vue | 35 +++++++++++++------ .../ebiz/agentEenter/approve/RecordDetail.vue | 8 ++--- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue index cbc4bbc97..5b6ccf49a 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue @@ -3,10 +3,10 @@

审批信息

- + - - + + @@ -167,15 +167,28 @@ export default { }, filters: { agentGradeFilter(grage) { - switch (grage) { - case 'QJL': - return '区经理' - case 'SJ': - return '三级机构' - case 'RY': - return '人员管理岗' - default: + if (grage && grage.length === 1) { + switch (grage) { + case '1': + return '营业区经理' + case '2': + return '三级机构负责人' + case '3': + return '人员管理岗' + default: + return '-' + } + } else { + if (grage) { + let level = Number(grage.charAt(1)) + if (level < 3) { + return '推荐人' + } else { + return '主管' + } + } else { return '-' + } } } } diff --git a/src/views/ebiz/agentEenter/approve/RecordDetail.vue b/src/views/ebiz/agentEenter/approve/RecordDetail.vue index 0fff705ac..03258e3d3 100644 --- a/src/views/ebiz/agentEenter/approve/RecordDetail.vue +++ b/src/views/ebiz/agentEenter/approve/RecordDetail.vue @@ -76,9 +76,9 @@

审批信息

- - - + + +
@@ -240,7 +240,7 @@ export default { } // 需要新的接口文档 if (code == '2') { - this.approvalInfo = res.content.ebizHisExamineApproveDtoList + this.approvalInfo = res.content.ebizApproveHistoryDTOS } } } else { From a8c5b1c516618955b7546c632afc2fddf372eb9e Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Tue, 17 Nov 2020 10:44:08 +0800 Subject: [PATCH 53/58] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=8E=9F=E7=94=9F?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/manpower/Training.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/manpower/Training.vue b/src/views/ebiz/manpower/Training.vue index 256427696..cb695eae8 100644 --- a/src/views/ebiz/manpower/Training.vue +++ b/src/views/ebiz/manpower/Training.vue @@ -48,12 +48,15 @@ export default { }, created() { this.getInfo() + + // 拦截原生按钮 setTimeout(() => { // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('webview_left_button', { - intercept: '1' //是否拦截原生返回事件 1是 其他否 + intercept: '1' }) }, 100) + window.appCallBack = this.appCallBack }, methods: { From 6cb1ff7c0f5683babdc3ff08b0365e062dd6ff7f Mon Sep 17 00:00:00 2001 From: mengxiaolong Date: Tue, 17 Nov 2020 14:30:43 +0800 Subject: [PATCH 54/58] =?UTF-8?q?fix:=20=E5=85=A5=E5=8F=B8=E4=BC=98?= =?UTF-8?q?=E5=8C=96bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 审批不显示总行信息以及联行号问题修改 2. 界面反复跳转问题修改 3. 担保人类别去除"无"选项 --- src/assets/js/utils/data-dictionary.js | 3 +- .../ebiz/agentEenter/approve/BasicInfo.vue | 82 +++++++++++------ .../ebiz/agentEenter/approve/RecordDetail.vue | 87 +++++++++++++------ 3 files changed, 116 insertions(+), 56 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index aa340ded1..cdce95ee7 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -2295,8 +2295,7 @@ export default { relationType: [ { id: '0', text: '配偶' }, { id: '1', text: '子女' }, - { id: '2', text: '父母' }, - { id: '3', text: '无' } + { id: '2', text: '父母' } ], guarantRelationType: [ { id: '0', text: '亲属' }, diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue index 063b69040..ad7768c2d 100644 --- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue +++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue @@ -26,11 +26,11 @@ - + - + @@ -103,10 +103,10 @@