hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-11 15:36:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

建议书功能与生产代码冲突解决

Browse Source
This commit is contained in:
liu.xiaofeng@ebiz-digits.com
2023-06-26 11:29:31 +08:00
parent 5fe2e64afc
commit 2330fbd769
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/assets/js/business-common.js
View File

@@ -438,11 +438,11 @@ export default {
} }
}, },
/** /**
@desc：只能输入整数 @desc：只能输入整数
@param @param
value 操作数值 value 操作数值
max 最大值 max 最大值
**/ **/
intOnly(value, max = Infinity, min = 0) { intOnly(value, max = Infinity, min = 0) {
if (value) { if (value) {
let regular0 = /^0{1,}$/ let regular0 = /^0{1,}$/
@@ -480,8 +480,8 @@ export default {
var json = {} var json = {}
for (var i = 0, len = query.length; i < len; i++) { for (var i = 0, len = query.length; i < len; i++) {
var key = query[i].split('=')[0], var key = query[i].split('=')[0],
index = query[i].indexOf('='), index = query[i].indexOf('='),
value = query[i].substr(index + 1) value = query[i].substr(index + 1)
json[key] = value json[key] = value
} }
@@ -559,16 +559,14 @@ export default {
) )
if (insuredDTO) { if (insuredDTO) {
let insuredPersonAge1 = utilsAge.getAge(insuredDTO.birthday, new Date()) let insuredPersonAge = insuredDTO.birthday?utilsAge.getAge(insuredDTO.birthday, new Date()):insuredDTO.insuredAge
let insuredPersonAge2 = insuredDTO.birthday?utilsAge.getAge(insuredDTO.birthday, new Date()):insuredDTO.insuredAge
CacheUtils.setLocItem('saleInsuredPersonInfo', CacheUtils.setLocItem('saleInsuredPersonInfo',
JSON.stringify({ JSON.stringify({
birthday: insuredDTO.birthday, birthday: insuredDTO.birthday,
name: insuredDTO.name, name: insuredDTO.name,
sex: insuredDTO.sex, sex: insuredDTO.sex,
idType: insuredDTO.idType, idType: insuredDTO.idType,
age: insuredPersonAge1, insuredAge: insuredPersonAge,
insuredAge: insuredPersonAge2,
// marriage: insuredDTO.marriage, // marriage: insuredDTO.marriage,
relationToAppnt: insuredDTO.relationToAppnt, relationToAppnt: insuredDTO.relationToAppnt,
medical: insuredDTO.medical, medical: insuredDTO.medical,

4
src/views/ebiz/proposal/Appnt.vue
View File

@@ -310,9 +310,9 @@ export default {
if(this.appntDTO.name == name){ if(this.appntDTO.name == name){
this.appntDTO.name = '' this.appntDTO.name = ''
} }
let ageRule = /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/ let ageRule = /^[a-zA-Z0-9\.\s\u4e00-\u9fa5]{2,120}$/
if (this.appntDTO.name && !ageRule.test(this.appntDTO.name)) { if (this.appntDTO.name && !ageRule.test(this.appntDTO.name)) {
return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字或者英文') return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
} }
this.appntDTO.age = String(this.appntDTO.age) this.appntDTO.age = String(this.appntDTO.age)
this.$validator.validate().then(valid => { this.$validator.validate().then(valid => {

12
src/views/ebiz/proposal/ChooseInsuredPerson.vue
View File

@@ -177,15 +177,13 @@ export default {
s.addtion = [] s.addtion = []
} }
}) })
let thisTempData = []
v.riskDTOLst.forEach(s => { v.riskDTOLst.forEach(s => {
if(s.isMainRisk == '1'){ if(s.isMainRisk == '1'){
thisTempData.push(s) v.riskDTOLst.forEach(x => {
} if(x.riskCode == s.mainRiskCode){
}) x.addtion.push(s)
v.riskDTOLst.forEach(s => { }
if(s.isMainRisk == '0'){ })
s.addtion = JSON.parse(JSON.stringify(thisTempData))
} }
}) })
} }

4
src/views/ebiz/proposal/InsuredPerson.vue
View File

@@ -339,9 +339,9 @@ export default {
let localSex = this.insured.sex let localSex = this.insured.sex
let relation = this.localInfo.relationToAppnt let relation = this.localInfo.relationToAppnt
let resultSex = checkSex(cacheSex, localSex, relation) let resultSex = checkSex(cacheSex, localSex, relation)
let ageRule = /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/ let ageRule = /^[a-zA-Z0-9\.\s\u4e00-\u9fa5]{2,120}$/
if (this.insured.name && !ageRule.test(this.insured.name)) { if (this.insured.name && !ageRule.test(this.insured.name)) {
return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字或者英文') return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
} }
if (!resultSex) { if (!resultSex) {
return Toast.fail('被保险人性别有误') return Toast.fail('被保险人性别有误')