Merge branch 'DK_dev'

src/assets/css/common.css

@@ -35,6 +35,9 @@
 .j-start{
 	justify-content: flex-start;
 }
+.j-end{
+	justify-content: flex-end;
+}
 
 .a-c{
 	align-items: center;
@@ -44,4 +47,4 @@
 }
 .f-c{
 	flex-direction: column;
-}
+}

src/views/Letter/Letter.vue

@@ -1266,12 +1266,12 @@
               <el-form-item label="核定载客数">
                 <el-input v-model="carform.approvedPassengersCapacity" autocomplete="off"></el-input>
               </el-form-item>
-              <el-form-item label="发证日期">
-                <el-input v-model="carform.issueDate" autocomplete="off"></el-input>
-              </el-form-item>
               <el-form-item label="注册日期">
                 <el-input v-model="carform.registerDate" autocomplete="off"></el-input>
               </el-form-item>
+              <el-form-item label="发证日期">
+                <el-input v-model="carform.issueDate" autocomplete="off"></el-input>
+              </el-form-item>
             </el-form>
           </div>
         </div>
@@ -2965,6 +2965,7 @@ export default {
           ele["agreementId"] = "";
           ele["apiType"] = "";
           ele["orderstatus"] = 0;
+          ele.agreementId = ele.agreement[0].id;
         });
         this.totalCompanyList = res.data;
       });
@@ -3003,6 +3004,7 @@ export default {
         default:
           break;
       }
+
     },
     CheckboxChange(select, row) {
       this.accidentalDrivingVo = [];
@@ -3027,6 +3029,10 @@ export default {
     initchange(e, code, name, index) {
       this.totalCompanyList[index].agreementId = "";
       this.totalCompanyList[index].checked = e;
+      this.totalCompanyList[index].agreementId = this.totalCompanyList[index].agreement[0].id;
+      if (this.carInfo.licenseNo.slice(0, 2) != '晋A') {
+        this.totalCompanyList[0].agreementId = this.totalCompanyList[0].agreement[1].id;
+      }
     },
     clearAccidentForm() {
       this.accidentForm = {
@@ -4041,6 +4047,14 @@ export default {
             this.imageList2 = [];
             this.imageList3 = [];
             this.imageList4 = [];
+            this.imgList1 = [];
+            this.imgList2 = [];
+            this.imgList3 = [];
+            this.imgList4 = [];
+            this.imgList5 = [];
+            this.imgList6 = [];
+            this.imgList7 = [];
+            this.imgList8 = [];
             Object.keys(res.data).forEach((keys) => {
               if (res.data[keys].url) {
                 res.data[keys].url = process.env.BASE_URL + res.data[keys].url;
@@ -4963,19 +4977,23 @@ export default {
 
           this.ownerInfoform.identifyNumber = customerInfo.identifyNumber;
           this.ownerInfoform.addr = customerInfo.addr;
-          this.ownerInfoform.age = getAgeByIdCard(customerInfo.identifyNumber)
-          this.ownerInfoform.identifyValidDate =
-            customerInfo.identifyValidDate.substring(0, 4) +
-            "-" +
-            customerInfo.identifyValidDate.substring(4, 6) +
-            "-" +
-            customerInfo.identifyValidDate.substring(6, 8);
-          this.ownerInfoform.identifyValidEndDate =
-            customerInfo.identifyValidEndDate.substring(0, 4) +
-            "-" +
-            customerInfo.identifyValidEndDate.substring(4, 6) +
-            "-" +
-            customerInfo.identifyValidEndDate.substring(6, 8);
+          if (customerInfo.identifyNumber) {
+            this.ownerInfoform.age = getAgeByIdCard(customerInfo.identifyNumber)
+          }
+          if (customerInfo.identifyValidDate || customerInfo.identifyValidEndDate) {
+            this.ownerInfoform.identifyValidDate =
+              customerInfo.identifyValidDate.substring(0, 4) +
+              "-" +
+              customerInfo.identifyValidDate.substring(4, 6) +
+              "-" +
+              customerInfo.identifyValidDate.substring(6, 8);
+            this.ownerInfoform.identifyValidEndDate =
+              customerInfo.identifyValidEndDate.substring(0, 4) +
+              "-" +
+              customerInfo.identifyValidEndDate.substring(4, 6) +
+              "-" +
+              customerInfo.identifyValidEndDate.substring(6, 8);
+          }
         }
       });
     },
@@ -5176,10 +5194,10 @@ export default {
       this.yonganchecked = false;
       this.zhongmeichecked = false;
       this.transferDateShow = false;
-      this.tbczcarShow=true, //投保人同车主
-      this.bbczcarShow= false, //被保人同车主
-      this.bbtbcarShow= true, //被保人同投保人
-      this.imgList1 = [];
+      this.tbczcarShow = true, //投保人同车主
+        this.bbczcarShow = false, //被保人同车主
+        this.bbtbcarShow = true, //被保人同投保人
+        this.imgList1 = [];
       this.imgList2 = [];
       this.imgList3 = [];
       this.imgList4 = [];
@@ -5192,7 +5210,7 @@ export default {
       this.selectedOptions3 = [];
       this.orderno = "";
       this.quoteno = "";
-      this.HistoryList=[];
+      this.HistoryList = [];
       this.jqstartDate = this.transformTime1();
       this.jqendDate = this.oneYearPast1(this.jqstartDate);
       this.systartDate = this.transformTime1();

src/views/Letter/Orderlist.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true" :model="pageRequest" class="demo-form-inline" size="small" label-width="130px"
       style="text-align:center;">
       <el-row>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="订单号">
             <el-input v-model="pageRequest.orderNo" placeholder="请输入车牌号" class="widths"></el-input>
           </el-form-item>
@@ -13,28 +13,25 @@
             <el-input v-model="pageRequest.licenseNo" placeholder="请输入车牌号" class="widths"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="车架号">
             <el-input v-model="pageRequest.frameNo" placeholder="请输入车架号" class="widths"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="投保人姓名">
             <el-input v-model="pageRequest.insuredName" placeholder="请输入投保人姓名" class="widths"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="机构名称">
-            <el-cascader
-              :options="institutionOptions"
-              v-model="pageRequest.deptId"
-              :props="{ checkStrictly: true,  value: 'id',
-                      label: 'name', }"
-              @change="handleChange"
-              clearable></el-cascader>
+            <el-cascader class="widths" :options="institutionOptions" v-model="pageRequest.deptId" :props="{
+              checkStrictly: true, value: 'id',
+              label: 'name',
+            }" @change="handleChange" clearable></el-cascader>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="订单状态">
             <el-select v-model="pageRequest.orderStatus" class="widths">
               <el-option label="报价中" value="0"></el-option>
@@ -45,7 +42,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="日期">
             <el-date-picker v-model="value2" type="daterange" @change="monthChange" start-placeholder="开始日期"
               end-placeholder="结束日期" class="widths" value-format="yyyy-MM-dd" style="width: 220px;">
@@ -53,37 +50,38 @@
 
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="3" >
+        <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="3">
           <el-button type="primary" size="small" @click="onSubmit">查询</el-button>
         </el-col>
       </el-row>
     </el-form>
     <el-table size="small" :data="pageResult" height="590" border v-loading="loading" highlight-current-row stripe
-      @row-click="handleRowClick" ref="expandTable"  :row-class-name="getRowClass"
+      @row-click="handleRowClick" ref="expandTable" :row-class-name="getRowClass"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
       <el-table-column type="expand">
         <template slot-scope="scope">
-          <div class="demo-table-expand dis align j-s" :style="{ width: width, flexWrap: 'wrap' }"
+          <div class="demo-table-expand flex a-c  j-s" :style="{ width:width,  flexWrap: 'wrap' }"
             v-for="(item, index) in scope.row.insAreaCompanyList" :key="index">
-            <div>{{ item.inscompany }}</div>
-            <div>总价： <span style="color:#ee7000;">{{ item.sumpremium }}</span></div>
+            <div style="width: 70px;">{{ item.inscompany }}</div>
+            <div class="flex a-c j-s demo-table-expand-time" >
+              <div>总价： <span style="color:#ee7000;">{{ item.sumpremium }}</span></div>
             <div>交强险：<span style="color:#ee7000;">{{ item.jqpremium }}</span> </div>
             <div>商业险：<span style="color:#ee7000;">{{ item.sypremium }}</span></div>
             <div>{{ item.createtime }}</div>
-            <div slot="reference" class="name-wrapper">
+            </div>
+            <div slot="reference" class="name-wrapper flex a-c j-c" style="margin:0 20px; width: 100px;">
               <el-tag v-if="item.orderstatus == '0'" type="success" size="medium">报价中</el-tag>
               <el-tag v-if="item.orderstatus == '1'" type="warning" size="medium">待核保</el-tag>
               <el-tag v-if="item.orderstatus == '2'" type="danger" size="medium">已核保待缴费</el-tag>
               <el-tag v-if="item.orderstatus == '3'" type="danger" size="medium">已承保</el-tag>
               <el-tag v-if="item.orderstatus == '4'" type="danger" size="medium">核保退回</el-tag>
             </div>
-            <div>
+            <div style="width: 220px;" class="flex a-c j-end">·
               <el-button size="mini" type="text"
                 v-if="item.orderstatus == '2' && ['恒邦财险', '众安财险', '中国人寿', '安盛天平', '紫金财险'].includes(item.inscompany)"
                 @click="querystatus(item)" style="color:#f56c6c">缴费状态查询</el-button>
 
-                   <el-button size="mini" type="text"
-                v-if="item.orderstatus == '2' && ['紫金财险'].includes(item.inscompany)"
+              <el-button size="mini" type="text"
                 @click="cancelorder(item)" style="color:#f56c6c">撤单</el-button>
 
               <el-button size="mini" type="text" v-if="item.orderstatus == '2'" @click="carcode(scope.row, item)"
@@ -135,13 +133,14 @@
         <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%">
+              <img v-if="['恒邦财险', '安盛天平'].includes(inscompany)" :src="paycodeimg" alt="" style="width:100%">
             </div>
           </div>
         </div>
-        <div class="ORtitle dis flex align">
+        <div class="ORtitle dis f-c align">
           <div>
             <span>保险公司：</span>
             <span>{{ inscompany }}</span>
@@ -1025,7 +1024,7 @@ export default {
         startDate: "",
         pageNum: 1,
         pageSize: 20,
-        deptId:"",
+        deptId: "",
       },
       orderInfo: {
         //选中的订单
@@ -1066,16 +1065,16 @@ export default {
       userid: "",
       downloadstatus: 0,
       expands: [],
-      institutionOptions:[],
+      institutionOptions: [],
       width: document.documentElement.clientWidth,
     }
   },
   created() {
     this.peopleid = Cookies.get('user');
-    this.pageRequest.deptId=JSON.parse(localStorage.getItem('user_data') ).deptId;
+    this.pageRequest.deptId = JSON.parse(localStorage.getItem('user_data')).deptId;
     this.$api.dept.findDeptTree().then((res) => {
-        this.institutionOptions = res.data;
-      });
+      this.institutionOptions = res.data;
+    });
     if (this.peopleid != 'admin') {
       this.pageRequest.userId = this.peopleid;
       this.findPage();
@@ -1117,17 +1116,17 @@ export default {
     },
   },
   methods: {
-    getRowClass(scope,rowIndex){
-        if(scope.row.insAreaCompanyList.length==0){  //判断当前行是否有子数据或者根据实际情况设置
-              return 'row-expand-cover'
+    getRowClass(scope, rowIndex) {
+      if (scope.row.insAreaCompanyList.length == 0) {  //判断当前行是否有子数据或者根据实际情况设置
+        return 'row-expand-cover'
       }
     },
-     //联级选择器触发事件
-     handleChange(val) {
+    //联级选择器触发事件
+    handleChange(val) {
       if (val.length !== 0) {
         this.pageRequest.deptId = val.at(-1);
       }
-      else{
+      else {
         this.pageRequest.deptId = ''
       }
     },
@@ -1136,7 +1135,7 @@ export default {
     },
     //表格行点击下拉事件
     handleRowClick(row) {
-      if(row.insAreaCompanyList.length>0){ 
+      if (row.insAreaCompanyList.length > 0) {
         row.expanded = !row.expanded;
         this.$refs.expandTable.toggleRowExpansion(row, row.expanded);
       }
@@ -1229,14 +1228,13 @@ export default {
       }
 
     },
-    cancelorder(item){
+    cancelorder(item) {
       this.$api.letter.zijincancelorder({ companyId: item.id }).then(res => {
 
       })
     },
     //二维码
     carcode(row, item) {
-      console.log(item)
       let params = {
         companyId: item.id,
       }
@@ -1555,23 +1553,23 @@ export default {
                   }
                 })
               }
-              if(this.orderInfo.crossInsurance.length>0){
+              if (this.orderInfo.crossInsurance.length > 0) {
                 console.log(1)
-                this.orderInfo.crossInsurance.map(ele=>{
+                this.orderInfo.crossInsurance.map(ele => {
                   this.$api.letter.zijingetPolicyPrint({
-                  companyId: item.id,
-                  policyNumber:ele.policyNumber,
-                  riskCode: "0513",
-                  type: '2',//2:保单
-                }).then(res => {
-                  if (res.data) {
-                    this.oldfileList.push({
-                      fileTitle: "驾意险保单",
-                      filename: ele.policyNumber,
-                      fileurl: res.data,
-                    });
-                  }
-                })
+                    companyId: item.id,
+                    policyNumber: ele.policyNumber,
+                    riskCode: "0513",
+                    type: '2',//2:保单
+                  }).then(res => {
+                    if (res.data) {
+                      this.oldfileList.push({
+                        fileTitle: "驾意险保单",
+                        filename: ele.policyNumber,
+                        fileurl: res.data,
+                      });
+                    }
+                  })
                 })
               }
               break;
@@ -1686,7 +1684,7 @@ export default {
       link.download = filename
       link.click()
     },
-   
+
     //预览文件
     viewfile(index) {
       console.log(index,11111111)
@@ -1785,14 +1783,22 @@ export default {
   }
 }
 </script>
-<style scoped>
-.saomazhifucodeClass .el-dialog__body,
-.saomazhifucodeClass .el-dialog__header {
-  padding: 0;
-}
-/deep/ .el-table .row-expand-cover .cell .el-table__expand-icon {
-  display: none;
+<style scoped lang="scss">
+/deep/ {
+  .el-table .row-expand-cover .cell .el-table__expand-icon {
+    display: none;
+  }
+
+  .saomazhifucodeClass .el-dialog__body,
+  .saomazhifucodeClass .el-dialog__header {
+    padding: 0;
+  }
+
+  .el-input.is-disabled .el-input__inner {
+    color: #333;
+  }
 }
+
 .ORcodebody {
   width: 100%;
   height: auto;
@@ -2020,9 +2026,6 @@ export default {
 }
 
 /* 上传图片样式End */
-/deep/ .el-input.is-disabled .el-input__inner {
-  color: #333;
-}
 
 .dis {
   display: flex;
@@ -2044,12 +2047,6 @@ export default {
   box-sizing: border-box;
 }
 
-.flex {
-  flex-direction: column;
-}
-
-
-
 .block {
   margin-top: 10px;
 }
@@ -2073,4 +2070,10 @@ export default {
   padding: 10px 50px;
   font-size: 14px;
 }
+.demo-table-expand-time{
+  width: 600px;
+}
+.demo-table-expand-time>div{
+  margin: 0 10px;
+}
 </style>