Merge branch 'master' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc

src/views/Letter/Letter.vue

@@ -712,6 +712,7 @@
         <div class="flex j-s a-c color" id="company">
           <img src="../../../src/icon/company.png" alt class="icon-img" />
           <span style="margin-left:10px;">保险公司</span>
+          <el-checkbox  style="margin:0 10px 0 30px"  v-model="checkAll" @change="handleCheckAllChange"></el-checkbox><span style="font-size:14px">全选</span>
         </div>
         <div class="flex j-s a-c color">
           <el-button v-show="imageUploadShow" size="small" type="warning" @click="imageUpload()">
@@ -2124,7 +2125,8 @@
         ref="expandTable" highlight-current-row @cell-dblclick="zijincellDblclick"  :cell-class-name="tableCellClassName"
         :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#ee7000' }">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="clauseCode" label="特约代码" align="center"></el-table-column>
+        <el-table-column prop="clauseCode" :width="80" label="特约代码" align="center"></el-table-column>
+        <el-table-column v-if='contributingState' :width="100" prop="riskName" label="特约险种" align="center"></el-table-column>
         <el-table-column prop="clauseName" label="特约名称" align="center"></el-table-column>
         <el-table-column prop="clauseContent" label="特约内容">
           <template slot-scope="scope">
@@ -2183,6 +2185,7 @@ export default {
       }
     };
     return {
+      checkAll:false,
       zhongmeiInsurancetype:"",//中煤驾意险产品选中值
       zhongmeiInsuranceData:[],//中煤驾意险产品列表数据
       zhongmeiInsuranceDataDetail:[],//中煤驾意险产品明细方案数据
@@ -3645,6 +3648,12 @@ export default {
     },
   },
   methods: {
+     handleCheckAllChange(ele) {
+        this.totalCompanyList.forEach((val,index)=>{
+          ele?val.checked=true:val.checked=false
+          this.initchange(ele,val.id, val.cnName, index)
+        })
+      },
     retractFun(){
       this.isRetract=this.isRetract==false?true:false
     },
@@ -3887,6 +3896,7 @@ export default {
       this.anshengInsuranceData1=data.departmentProductList;
     },
     hengbangInsuranceChange(index){
+      console.log(index,11111111)
       this.HBInsuranceData=[(this.hengbangInsuranceData).find(val=>val.programcode==index)]
       if(this.HBInsuranceData.length){
         this.HBDrivingChange(this.HBInsuranceData[0])
@@ -4527,7 +4537,8 @@ export default {
                         kindCode: _this.insureList[index].kindCode,
                         kindName: _this.insureList[index].kindName
                       });
-                    } else if (
+                    } 
+                    else if (
                       ele.amount != "0" &&
                       (ele.kindCode == "MJ1" ||
                         ele.kindCode == "MJ2" ||
@@ -4539,13 +4550,8 @@ export default {
                         kindCode: _this.insureList[index].kindCode,
                         kindName: _this.insureList[index].kindName
                       });
-                    } else if (ele.amount != "0") {
-                      _this.kindList.push({
-                        amount: _this.insureList[index].amount,
-                        kindCode: _this.insureList[index].kindCode,
-                        kindName: _this.insureList[index].kindName
-                      });
-                    } else if (
+                    } 
+                    else if (
                       ele.amount != "0" &&
                       (ele.kindCode == "TY1" ||
                         ele.kindCode == "TY2" ||
@@ -4557,6 +4563,13 @@ export default {
                         kindCode: _this.insureList[index].kindCode,
                         kindName: _this.insureList[index].kindName
                       });
+                    }  
+                    else if(ele.amount != "0") {
+                      _this.kindList.push({
+                        amount: _this.insureList[index].amount,
+                        kindCode: _this.insureList[index].kindCode,
+                        kindName: _this.insureList[index].kindName
+                      });
                     } 
                     return ele;
                   });

src/views/Letter/Orderlist.vue

@@ -748,7 +748,6 @@ import html2Canvas from 'html2canvas'
 import CommonUtil from "@/utils/comutil.js";
 import Cookies from "js-cookie";
 import QRCode from "qrcodejs2";
-
 export default {
   data() {
     return {
@@ -881,12 +880,13 @@ export default {
      // 截图粘贴
      copybjd(){
       let that=this
-      html2Canvas(document.getElementById('pdfContentsDiv') , {
+      html2Canvas(document.getElementById('pdfContentsDiv') , 
+      {
               allowTaint: true,
               taintTest: false,
+              // useCORS: true
           }).then(function (canvas) {
         let base64Data = ''
-        // let blob = null
         base64Data = canvas.toDataURL('image/png', 1)
         const date = new Date()
         const saveInfo = {