From 9c16be277f911204d669a29067a57f07eb1611a4 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Thu, 26 Mar 2020 10:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9C=A8=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D=20=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E6=97=A0=E2=80=98=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=90=91=E4=B8=8B=E8=BF=9B=E8=A1=8C=E3=80=82?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=9D=9E=E9=98=BB=E6=96=AD?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=20=E6=B7=BB=E5=8A=A0=20=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E9=83=BD=E5=AE=8C=E6=88=90=E4=B8=8A=E4=BC=A0=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E5=8B=BE=E9=80=89=E2=80=9D=E9=94=80=E5=94=AE=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=B7=B2=E8=A7=81=E8=AF=81=E5=90=84=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8E=9F=E4=BB=B6=E5=B9=B6=E6=8B=8D=E7=85=A7=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E2=80=9C=EF=BC=8C=E8=80=8C=E7=9B=B4=E6=8E=A5=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AD=A5=EF=BC=8C=E5=BC=B9=E5=87=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E8=AF=B7=E5=8B=BE=E9=80=89=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98=E5=B7=B2=E8=A7=81=E8=AF=81?= =?UTF-8?q?=E5=90=84=E8=AF=81=E4=BB=B6=E5=8E=9F=E4=BB=B6=E5=B9=B6=E6=8B=8D?= =?UTF-8?q?=E7=85=A7=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 2 -- src/views/ebiz/sale/AddBeneficiaryInfo.vue | 4 ++-- src/views/ebiz/sale/AttachmentManagement.vue | 7 ++++++- src/views/ebiz/sale/InsuredInfo.vue | 4 ++-- src/views/ebiz/sale/InsuredPerson.vue | 10 +++++----- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.eslintignore b/.eslintignore index 0d00134a8..fc0ba2c30 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,3 @@ public dist node_modules -/node_modules -./node_modules diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue index 0d91ab8d3..7881789af 100644 --- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue +++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue @@ -693,13 +693,13 @@ export default { // 受益人与被保险人关系为父母时，受益人年龄必须大于被保险人年龄 if (this.userInfo.relationToInsured == '3') { if (age < insuredInfo.age) { - return this.$toast('亲，请确认受益人与被保险人关系哦') + this.$toast('亲，请确认受益人与被保险人关系哦') } } // 受益人与被保险人关系为子女时，受益人年龄必须小于被保险人年龄 if (this.userInfo.relationToInsured == '4') { if (age > insuredInfo.age) { - return this.$toast('亲，请确认受益人与被保险人关系哦') + this.$toast('亲，请确认受益人与被保险人关系哦') } } //如果证件类型是身份证 diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue index 1776bc11d..7cc79fdec 100644 --- a/src/views/ebiz/sale/AttachmentManagement.vue +++ b/src/views/ebiz/sale/AttachmentManagement.vue @@ -284,7 +284,7 @@
- 下一步 + 下一步
@@ -889,6 +889,11 @@ export default { } }) }, + beforeNext(isDis){ + if(isDis && this.fileListBank.length > 0 && this.fileListIdBack.length > 0 && this.fileListIdFront.length > 0){ + this.$toast('请勾选确认销售人员已见证各证件原件并拍照上传') + } + }, // 点击下一步 next() { console.log(888) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index 6f731f706..be4391405 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -899,8 +899,8 @@ export default { this.userInfo.occupationCode == '8000001' ) { ; - } else if (this.userInfo.workcompany.length < 6) { - return this.$toast('亲，您填写的工作单位过于简短哦~') + } else if (this.userInfo.workcompany.length < 6 && this.userInfo.workcompany.trim() != '无') { + this.$toast('亲，您填写的工作单位过于简短哦~') } if (this.userInfo.salarySource == '4') { diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue index 658214179..7d44b9a01 100644 --- a/src/views/ebiz/sale/InsuredPerson.vue +++ b/src/views/ebiz/sale/InsuredPerson.vue @@ -1108,9 +1108,9 @@ export default { this.userInfo.occupationCode == '4071203' || this.userInfo.occupationCode == '8000001' ) { - console.log(1) - } else if (this.userInfo.workcompany.length < 6) { - return this.$toast('亲，您填写的工作单位过于简短哦~') + ; + } else if (this.userInfo.workcompany.length < 6 && this.userInfo.workcompany.trim() != '无') { + this.$toast('亲，您填写的工作单位过于简短哦~') } // 计算年龄 let age = utilsAge.getAge(this.userInfo.birthday, new Date()) @@ -1135,12 +1135,12 @@ export default { } else if (this.userInfo.relationToAppnt == '4') { //投被保人关系是子女 if (age > JSON.parse(localStorage.saleInsuredInfo).age) { - return this.$toast('亲，请确认被保险人与投保人关系哦~') + this.$toast('亲，请确认被保险人与投保人关系哦~') } } else if (this.userInfo.relationToAppnt == '3') { //投被保人关系是父母 if (age < JSON.parse(localStorage.saleInsuredInfo).age) { - return this.$toast('亲，请确认被保险人与投保人关系哦~') + this.$toast('亲，请确认被保险人与投保人关系哦~') } }