冲突解决

src/views/Task/DaikeLetter.vue

@@ -719,6 +719,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"   @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()">
@@ -3642,6 +3643,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)
+        })
+      },
     //代客录单专用
     pickUser(val){
         this.userId = val;
@@ -4467,11 +4474,6 @@ export default {
     },
     //报价
     quote() {
-      if(!(this.userId&&this.userId!='')){
-        this.$message({ message: "先选择归属业务员后再报价", type: "error" });
-        return;
-      }
-
       let starttime = new Date(this.carInfo.registerDate)
       let endtime = new Date(this.carInfo.issueDate)
       if (endtime < starttime) {
@@ -4483,7 +4485,6 @@ export default {
           var _this = this;
           _this.$refs["ownerInfo"].validate(valid1 => {
             if (valid1) {
-
               if (_this.tbczcarShow == true) {
                 _this.policyHolderInfo = JSON.parse(
                   JSON.stringify(_this.ownerInfo)
@@ -4548,7 +4549,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" ||
@@ -4560,13 +4562,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" ||
@@ -4578,6 +4575,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;
                   });