diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js index 55f91dc04..e4751e852 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 - 详细地址 - 详细地址须同时包含汉字和数字, @@ -99,9 +99,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) } }) diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 8183008ba..b84a3798c 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -43,7 +43,8 @@ placeholder="投保人职业" />
- + +
下一步 @@ -87,7 +88,8 @@ export default { }, customerShowPicker: false, occupationShowPicker: false, - currentPopupIndex: '' + currentPopupIndex: '', + ageFlag: false //年龄输入框是否只读 false-可输入 true-只读 } }, components: { @@ -170,9 +172,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,12 +194,13 @@ export default { sex: String(customerSex), name: customerName, occupationName, - age: age ? age : '', + age: age ? age : getAge.getAge(birthday, new Date()), occupationCode, lifeGrade, healthGrade, socialSecurity } + this.ageFlag = true }, nextStep() { @@ -215,7 +219,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({ 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: ' '; } diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 3fbab900a..aebe97162 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -933,7 +933,6 @@ export default { ) { // const message = res.orderDTO.productDTO.special.content // Dialog({ message }) - let content = res.orderDTO.productDTO.special.content // { // title: '标题', @@ -945,7 +944,6 @@ export default { // message 内容,\n换行 // confirmButtonText:确认按钮的文字 // messageAlign: 对齐方式,固定左对齐,为'left' - try { const config = JSON.parse(content); config.message = '  ' + config.message @@ -965,7 +963,6 @@ export default { messageAlign: 'left' }) } - // const message = '  ' + res.orderDTO.productDTO.special.content // Dialog({ // message: message.split('\\n').join('\n  '),