From c7a8e1a04fb2f2fab308c0ccdb14997e02a5396d Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 23 Apr 2020 14:31:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6-=E6=8A=95?= =?UTF-8?q?=E4=BF=9D=E4=BA=BA=E9=A1=B5=E9=9D=A2=20-=E4=BB=8E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E9=80=89=E6=8B=A9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E4=BF=A1=E6=81=AF=E5=B8=A6=E5=85=A5=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=8B=A5=E5=AE=A2=E6=88=B7=E5=B9=B4=E9=BE=84=E4=B8=8D=E6=BB=A1?= =?UTF-8?q?=E4=B8=80=E5=B2=81=EF=BC=8C=E5=B9=B4=E9=BE=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/Appnt.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 8183008ba..acd4a71e0 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -43,7 +43,7 @@ placeholder="投保人职业" />
- +
下一步 @@ -87,7 +87,8 @@ export default { }, customerShowPicker: false, occupationShowPicker: false, - currentPopupIndex: '' + currentPopupIndex: '', + ageFlag: false //年龄输入框是否只读 false-可输入 true-只读 } }, components: { @@ -170,9 +171,10 @@ export default { this.appntDTO.name = data }, dateConfirm(data) { + console.log(11) let age = getAge.getAge(data, new Date()) - this.appntDTO.age = age + this.ageFlag = true }, //从客户列表选择客户 chooseCustomer(data) { @@ -191,7 +193,7 @@ export default { sex: String(customerSex), name: customerName, occupationName, - age: age ? age : '', + age: age == undefined || age == null ? '' : age, occupationCode, lifeGrade, healthGrade, @@ -215,7 +217,7 @@ export default { saveProposal(params).then(res => { if (res.result == '0') { localStorage.orderNo = res.content.orderNo - if(this.appntDTO.socialSecurity){ + if (this.appntDTO.socialSecurity) { localStorage.orderNoSocialSecurity = this.appntDTO.socialSecurity } this.$jump({ From 4192144b8156b5918a88ca35d907a130acd7e94d Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 24 Apr 2020 13:47:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[FIX]=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6?= =?UTF-8?q?=E3=80=91=E6=8A=95=E4=BF=9D=E4=BA=BA=E5=B9=B4=E9=BE=84=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=94=B9=E5=AE=8C18=E5=B2=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/validator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js index 35b060027..d89f8367a 100644 --- a/src/assets/js/utils/validator.js +++ b/src/assets/js/utils/validator.js @@ -67,7 +67,7 @@ Validator.extend('salename', { getMessage: () => '亲，请确认您录入的姓名是否正确哦~', validate: value => { // return /^[\u4e00-\u9fa5·]{1,15}$/.test(value) - return /^[\u4e00-\u9fa5·]{2,120}$|^[a-zA-Z\s]{4,120}$/.test(value) + return /^[\u4e00-\u9fa5·]{2,120}$|^[a-zA-Z\s]{4,120}$/.test(value) } }) // sale - 详细地址 - 详细地址须同时包含汉字和数字， @@ -101,9 +101,9 @@ Validator.extend('maxAge', { //被保险人年龄（不得小于18周岁） Validator.extend('appntAge', { - getMessage: () => '年龄不得小于18周岁', + getMessage: () => '年龄不得小于16周岁', validate: value => { - return value > 17 && /^\d{1,3}$/.test(value) + return value > 15 && /^\d{1,3}$/.test(value) } }) From b029897a7361018323dd2855e04617580cb0203a Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 24 Apr 2020 13:48:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[FIX]=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6?= =?UTF-8?q?=E3=80=91=E6=8A=95=E4=BF=9D=E4=BA=BA=E5=B9=B4=E9=BE=84=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86-=E5=B8=A6=E5=85=A5=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=8A=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=90=8E=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/Appnt.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index acd4a71e0..b84a3798c 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -44,6 +44,7 @@ />
+
下一步 @@ -193,12 +194,13 @@ export default { sex: String(customerSex), name: customerName, occupationName, - age: age == undefined || age == null ? '' : age, + age: age ? age : getAge.getAge(birthday, new Date()), occupationCode, lifeGrade, healthGrade, socialSecurity } + this.ageFlag = true }, nextStep() { From c61d0bdd1a9a09b9ce6ec58f6c563f5f7d5da87b Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 24 Apr 2020 13:49:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[FIX]=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6?= =?UTF-8?q?=E3=80=91=E8=AF=A6=E6=83=85=E9=A1=B5-=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=99=A8=E6=94=B9=E5=AE=8C5=E7=A7=92=EF=BC=8C=E5=88=86?= =?UTF-8?q?=E4=BA=ABpdf=E5=B9=B2=E6=8E=89=E5=BE=AE=E4=BF=A1=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/ProposalInfo.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index 3c763a7b3..6c87e6107 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -222,7 +222,7 @@
-
+
@@ -350,7 +350,7 @@ export default { }, agent: {}, mainRiskCodes: [], - time: 10 + time: 5 } }, filters: { @@ -1241,8 +1241,8 @@ export default { border: inherit; /* border-color: #000; */ border-radius: inherit; - -webkit-transform: translate(-50%,-50%); - transform: translate(-50%,-50%); + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); opacity: 0; content: ' '; }