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

src/assets/js/business-common.js

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

src/views/ebiz/proposal/Appnt.vue

@@ -310,9 +310,9 @@ export default {
       if(this.appntDTO.name == 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)) {
-        return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字或者英文')
+        return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
       }
       this.appntDTO.age = String(this.appntDTO.age)
       this.$validator.validate().then(valid => {

src/views/ebiz/proposal/ChooseInsuredPerson.vue

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

src/views/ebiz/proposal/InsuredPerson.vue

@@ -339,9 +339,9 @@ export default {
       let localSex = this.insured.sex
       let relation = this.localInfo.relationToAppnt
       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)) {
-        return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字或者英文')
+        return Toast.fail('姓名长度为2-120个字符之内，只能输入汉字、数字或者英文')
       }
       if (!resultSex) {
         return Toast.fail('被保险人性别有误')