Merge branch 'DK_dev'

src/config/global.js

@@ -33,6 +33,7 @@ export const insCompanyList = [
   { name: "众安财险", icon: "../../static/insuranceicon/zhongan.png" },
   { name: "永诚财险", icon: "../../static/insuranceicon/yongcheng.png" },
   { name: "永安财险", icon: "../../static/insuranceicon/yongan.png" },
+  { name: "紫金财险", icon: "../../static/insuranceicon/zijin.png" },
 ]
 //订单状态
 export const orderStatus = [

src/views/Letter/Letter.vue

@@ -84,12 +84,23 @@
           证件识别
         </el-button>
       </div>
+      <div class="flex j-c a-c" style="margin-bottom: 20px;">
+        <div class="csstool">
+          <span>是否已上牌照</span>
+          <el-switch  v-model="licenseplate" active-color="#ee7000"></el-switch>
+        </div>
+        <div class="csstool">
+          <span>是否过户车</span>
+          <el-switch @change="transferFlagChange" v-model="carInfo.transferFlag" active-color="#ee7000"></el-switch>
+        </div>
+      </div>
       <el-form class="demo-ruleForm" :inline="true" :model="carInfo" ref="carInfo" :rules="rules" label-width="130px"
-        size="small " style="margin:30px 0 0 30px;">
+        size="small " style="margin:15px 30px;">
         <el-row>
-          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :span="8">
-            <el-form-item label="车牌：" prop="licenseNo">
-              <el-input v-model="carInfo.licenseNo" placeholder="请输入车牌号" class="widths"></el-input>
+
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :span="8" >
+            <el-form-item label="车牌：" :prop="licenseplate?'licenseNo':''">
+              <el-input v-model="carInfo.licenseNo" placeholder="请输入车牌号" class="widths" :disabled="!licenseplate" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
@@ -178,11 +189,7 @@
                 style="width: 230px;"></el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
-            <el-form-item label="是否过户：">
-              <el-switch @change="transferFlagChange" v-model="carInfo.transferFlag" active-color="#ee7000"></el-switch>
-            </el-form-item>
-          </el-col>
+
         </el-row>
       </el-form>
     </div>
@@ -470,7 +477,8 @@
             <div style="width:200px;">
               <span style="text-align:center;">{{ insureitem.kindName }}</span>
             </div>
-            <el-select filterable v-model="insureitem.amount" placeholder="请选择" @change="insureitemChange" class="widths1" size="small">
+            <el-select filterable v-model="insureitem.amount" placeholder="请选择" @change="insureitemChange" class="widths1"
+              size="small">
               <el-option :label="item.label" :value="item.value" v-for="(item, index) in insureitem.amtList"
                 :key="index"></el-option>
             </el-select>
@@ -870,7 +878,7 @@
             v-for="(kindinfoitem, kindinfoindex) in queryOrders.kindinfo" :key="kindinfoindex">
             <template v-if="kindinfoitem.coveragePremium">
               <span>{{ kindinfoitem.kindName }}</span>
-              <span v-if="['D4','SY_FJ_YBW2'].includes(kindinfoitem.kindCode)">{{ kindinfoitem.unitAmount }}</span>
+              <span v-if="['D4', 'SY_FJ_YBW2'].includes(kindinfoitem.kindCode)">{{ kindinfoitem.unitAmount }}</span>
               <span v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(kindinfoitem.kindCode)">
                 {{
                   kindinfoitem.deductibleRate
@@ -1035,7 +1043,7 @@
                   <div>
                     <span>{{ kindinfoitem.kindName }}</span>
                   </div>
-                  <div v-if="['D4','SY_FJ_YBW2'].includes(kindinfoitem.kindCode)">
+                  <div v-if="['D4', 'SY_FJ_YBW2'].includes(kindinfoitem.kindCode)">
                     <span>{{ kindinfoitem.unitAmount }}</span>
                   </div>
                   <div v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(kindinfoitem.kindCode)">
@@ -1057,9 +1065,7 @@
           <span>注：本报价单仅供参考，最终以出单价格为准。</span>
         </div>
         <div class="bjdfooter dis align">
-          <img
-            :src="logoImg"
-            class="align" alt style="width:60px;height:60px;" />
+          <img :src="logoImg" class="align" alt style="width:60px;height:60px;" />
           <div class="dis f-c jus" style="height:100%">
             <span>{{ queryOrders.inscompany }}</span>
           </div>
@@ -1077,7 +1083,7 @@
         <div style="padding:0 20px">
           <div class="ORcode">
             <div style="padding:5px;position: relative;">
-              <div v-show="['永安财险', '人保财险', '永诚财险', '中煤财险', '众安财险'].includes(inscompany)" id="qrcode" ref="qrcode"></div>
+              <div v-show="['永安财险', '人保财险', '永诚财险', '中煤财险', '众安财险','紫金财险'].includes(inscompany)" id="qrcode" ref="qrcode"></div>
               <img v-show="['恒邦财险'].includes(inscompany)" :src="paycodeimg" alt style="width:100%" />
             </div>
           </div>
@@ -1481,6 +1487,7 @@ export default {
       }
     };
     return {
+      licenseplate:true,
       accidentForm: {
         fen: "1"
       }, //意外险内容
@@ -1511,6 +1518,7 @@ export default {
       renewalCodeJqImg: "", //交强图片
       renewalCodeSyImg: "", //商业图片
       //-----------------
+
       showViewer: false,
       transferDateShow: false, //转移登记日期
       yonganchecked: false, //永安驾意险
@@ -1693,7 +1701,8 @@ export default {
         brandName: [
           { required: true, message: "请填写品牌型号", trigger: "blur" }
         ],
-        licenseNo: [{ max: 8, message: "最多八个字符", trigger: "blur" }],
+        licenseNo: [{ max: 8, message: "最多八个字符", trigger: "blur" },
+        { required: true, message: "请输入车牌号", trigger: "blur" }],
         frameNo: [{ validator: checkframeNo, trigger: "blur" }],
         engineNo: [
           { required: true, message: "请填写发动机号", trigger: "blur" }
@@ -2479,7 +2488,7 @@ export default {
       sumseatCount: "", // 投保险种座位数
       deptName: "",
       isBottom: true,
-      logoImg:"",//保险公司logo图
+      logoImg: "",//保险公司logo图
 
     };
   },
@@ -2626,14 +2635,14 @@ export default {
   },
   methods: {
     open2() {
-        this.$notify({
-          title: '警告',
-          message: '这是一条警告的提示消息',
-          type: 'warning',
-          duration: 0
-        });
-      },
-    iconfftter(icon){
+      this.$notify({
+        title: '警告',
+        message: '这是一条警告的提示消息',
+        type: 'warning',
+        duration: 0
+      });
+    },
+    iconfftter(icon) {
       return CommonUtil.getDataName({
         dataList: this.global.insCompanyList,
         value: "name",
@@ -2818,9 +2827,9 @@ export default {
       this.insureLength = 5;
     },
     //险别选择框事件
-    insureitemChange(e){
-      if(e!=0){
-        this.sychecked=true;
+    insureitemChange(e) {
+      if (e != 0) {
+        this.sychecked = true;
       }
     },
     //获取产品id
@@ -2922,9 +2931,9 @@ export default {
     },
     //报价
     quote() {
-      let starttime=new Date(this.carInfo.registerDate)
-      let endtime=new Date(this.carInfo.issueDate)
-      if(endtime<starttime){
+      let starttime = new Date(this.carInfo.registerDate)
+      let endtime = new Date(this.carInfo.issueDate)
+      if (endtime < starttime) {
         this.$message({ message: "发证日期早于初登日期", type: "error" });
         return;
       }
@@ -3286,8 +3295,8 @@ export default {
         }
       });
     },
-     //紫金报价
-     zijin(num, id) {
+    //紫金报价
+    zijin(num, id) {
       let params = {
         accidentalDrivingVo: [],
         orderNo: this.orderno,
@@ -3709,7 +3718,7 @@ export default {
                   }
                 });
               break;
-              case "紫金财险":
+            case "紫金财险":
               await this.$api.letter
                 .zijinsubmitImage({
                   companyId: companyId
@@ -4094,6 +4103,7 @@ export default {
         this.transferDateShow = false;
       }
     },
+
     //影像上传
     drivingupload(file, imageIdList) {
       var file = file.raw;
@@ -4434,31 +4444,31 @@ export default {
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
-          if(data.kindinfo!=null){
+          if (data.kindinfo != null) {
             data.kindinfo.map((ele, index) => {
-            switch (ele.kindCode) {
-              case "A":
-                ele.amount = "投保";
-                break;
-              case "D4":
-              case "SY_FJ_YBW2":
-                ele.unitAmount = this.toChinesNum(ele.unitAmount);
-                break;
-              case "MJ1":
-              case "MJ2":
-              case "MJ3":
-              case "MJ4":
-                ele.deductibleRate = ele.deductibleRate + "%";
-                break;
-              default:
-                ele.amount = this.toChinesNum(ele.amount);
-            }
-            return ele;
-          });
+              switch (ele.kindCode) {
+                case "A":
+                  ele.amount = "投保";
+                  break;
+                case "D4":
+                case "SY_FJ_YBW2":
+                  ele.unitAmount = this.toChinesNum(ele.unitAmount);
+                  break;
+                case "MJ1":
+                case "MJ2":
+                case "MJ3":
+                case "MJ4":
+                  ele.deductibleRate = ele.deductibleRate + "%";
+                  break;
+                default:
+                  ele.amount = this.toChinesNum(ele.amount);
+              }
+              return ele;
+            });
           }
 
           this.queryOrders = data;
-          this.logoImg=this.iconfftter(res.data.inscompany)
+          this.logoImg = this.iconfftter(res.data.inscompany)
           this.bjddialogVisible = true;
         }
       });
@@ -4498,6 +4508,7 @@ export default {
             case "中煤财险":
             case "永诚财险":
             case "众安财险":
+            case "紫金财险":
               this.$nextTick(() => {
                 this.creatQrCode(res.data.paymentLink);
               });
@@ -4631,6 +4642,16 @@ export default {
   }
 }
 
+.csstool {
+  font-weight: 600;
+  color: #606266;
+  font-size: 14px;
+  margin: 0 20px;
+  span{
+    margin-right: 5px;
+  }
+}
+
 .ORcode {
   width: 100%;
   background: #fff;

src/views/Letter/Orderlist.vue

@@ -116,7 +116,7 @@
                 <div style="padding:0 20px">
                     <div class="ORcode ">
                         <div style="padding:5px;position: relative;">
-                            <div v-if="['永安财险', '人保财险', '永诚财险', '中煤财险','众安财险'].includes(inscompany)" id="qrcode" ref="qrcode">
+                            <div v-if="['永安财险', '人保财险', '永诚财险', '中煤财险','众安财险','紫金财险'].includes(inscompany)" id="qrcode" ref="qrcode">
                             </div>
                             <img v-if="['恒邦财险', '安盛财险'].includes(inscompany)" :src="paycodeimg" alt="" style="width:100%">
                         </div>
@@ -1178,6 +1178,7 @@ export default {
                         case "永诚财险":
                         case "中国人寿":
                         case "众安财险":
+                        case "紫金财险":
                             this.$nextTick(() => {
                                 this.creatQrCode(res.data.paymentLink);
                             });