Merge branch 'DK_dev'

src/utils/validate.js

@@ -157,5 +157,15 @@ export function searchkey(cityName){
       matchedKeys.push(key)
     }
   }
-  return matchedKeys
+  const cityValues = [];
+  if(matchedKeys.length<3){
+    let unknown=matchedKeys[1].length==6?'true' : "false";
+    if(unknown){
+      let city=matchedKeys[1].substring(0,4)
+      cityValues.push(city)
+    }
+  }
+  let data=matchedKeys.concat(cityValues);
+  data.sort((a,b)=>a-b)
+  return data
 }

src/views/Letter/Letter.vue

@@ -92,7 +92,7 @@
           <el-switch @change="transferFlagChange" v-model="carInfo.transferFlag" active-color="#ee7000"></el-switch>
         </div>
       </div>
-      <el-form class="demo-ruleForm" :model="carInfo" ref="carInfo" :rules="rules" label-width="130px" size="small ">
+      <el-form class="demo-ruleForm" :model="carInfo" ref="carInfo" :rules="rules" label-width="130px" size="small">
         <el-row style="flex-wrap: wrap; display: flex;">
           <el-col :xs="xscell" :sm="smcell" :md="mdcell" :lg="lgcell" :xl="xlcell">
             <el-form-item label="车牌：" :prop="licenseplate ? 'licenseNo' : ''">
@@ -121,7 +121,6 @@
                 placeholder="请输入发动机号"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :xs="xscell" :sm="smcell" :md="mdcell" :lg="lgcell" :xl="xlcell">
             <el-form-item label="年款：" prop="caryear">
               <el-input onkeyup="value=value.replace(/\D/g,'')" v-model="carInfo.caryear" placeholder="请输入年款">
@@ -634,7 +633,9 @@
                     {{ reslistitem.result.endDateJq }}</span></span>
                 <span v-show="reslistitem.result.startDateSy">商业险： <span>{{ reslistitem.result.startDateSy }} -
                     {{ reslistitem.result.endDateSy }}</span></span>
-                <span v-if="reslistitem.namesimple == '永诚财险'">光博分：<span>{{ reslistitem.result.ilogPreUdwMess ?
+                    <span v-if="reslistitem.namesimple == '永诚财险'">光博分：<span>{{ reslistitem.result.ilogPreUdwMess ?
+                  reslistitem.result.ilogPreUdwMess : '无' }}</span></span>
+                <span v-else >评分：<span>{{ reslistitem.result.ilogPreUdwMess ?
                   reslistitem.result.ilogPreUdwMess : '无' }}</span></span>
                 <span v-if="reslistitem.result.accidentInfoStr">出险信息：<span>{{
                   reslistitem.result.accidentInfoStr }}</span></span>
@@ -1668,7 +1669,7 @@ export default {
     };
     return {
       formInline:{},
-
+      regular:/.+?(省|市|自治区|自治州|县|区|城|旗|域|岛|院|划|街道)/g,
       xlcell: 6,
       lgcell: 12,
       mdcell: 12,
@@ -2741,8 +2742,6 @@ export default {
       import("element-ui/packages/image/src/image-viewer")
   },
   created() {
-
-    console.log(this.getAreaByCode('142427199206192411'))
     this.getDicType("vehicleType");//车辆种类
     this.getDicType("trafficManagementVehicleType");//车辆类型
     this.getDicType("energyType");//能源种类
@@ -2914,6 +2913,7 @@ export default {
     },
     //省市区
     areahandleChange(event, info) {
+      console.log(event)
       if (event[0] != null && event[1] != null && event[2] != null) {
         this[info].province = codeToText[event[0]]
         this[info].city = codeToText[event[1]]
@@ -5141,6 +5141,10 @@ export default {
               this.ownerInfoform.identifyValidEndDate = '9999-12-31';
             }
           }
+         let values=searchkey(this.ownerInfoform.addr.match(this.regular));
+          this.ownerInfoform.province=codeToText[values[0]]
+          this.ownerInfoform.city=codeToText[values[1]]
+          this.ownerInfoform.county=codeToText[values[2]]
         }
       });
     },
@@ -5148,16 +5152,18 @@ export default {
       //传参
       switch (this.userIndex) {
         case 2:
+          this.selectedOptions1=searchkey(this.ownerInfoform.addr.match(this.regular));
+          console.log(this.ownerInfoform)
           this.ownerInfo = JSON.parse(JSON.stringify(this.ownerInfoform));
-
           break;
         case 3:
+        this.selectedOptions2=searchkey(this.ownerInfoform.addr.match(this.regular));
           this.policyHolderInfo = JSON.parse(
             JSON.stringify(this.ownerInfoform)
           );
-
           break;
         case 4:
+        this.selectedOptions3=searchkey(this.ownerInfoform.addr.match(this.regular));
           this.insuredPersonInfo = JSON.parse(
             JSON.stringify(this.ownerInfoform)
           );