浏览代码

冲突解决

@dongkboy 2 年之前
父节点
当前提交
3bb7e56e36
共有 1 个文件被更改,包括 69 次插入 和 41 次删除
  1. 69 41
      src/views/Task/daikeComponents/KtLetter.vue

+ 69 - 41
src/views/Task/daikeComponents/KtLetter.vue

@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item label="工号类型">
-              <el-select v-model="userform.usertype" >
+              <el-select v-model="userform.usertype">
                 <el-option label="业务员" value="A"></el-option>
                 <el-option label="代理人" value="B"></el-option>
               </el-select>
@@ -793,42 +793,59 @@
                       reslistitem.result.sumPermium
                     }}
                   </span>
-                  <span style="font-size: 13px;color:#2D4D89" class="m-top-5" >优惠:{{reslistitem.result.sumExportFee}}</span>
+                  <span style="font-size: 13px;color:#2D4D89"
+                    class="m-top-5">优惠:{{ reslistitem.result.sumExportFee }}</span>
                 </div>
               </el-col>
               <el-col :span="3" v-show="reslistitem.quoteCode == '200'">
                 <div class="dis f-c">
-                  <span  style="color:#D42426;font-weight:bold;">
-                  ¥{{
-                    reslistitem.result.jqPremium }}
-                </span>
-                <span v-if="reslistitem.result.jqPremium" style="font-size: 13px;color:#2D4D89" class="m-top-5" >优惠:{{reslistitem.result.jqExportFee}}</span>
+                  <span style="color:#D42426;font-weight:bold;">
+                    ¥{{
+                      reslistitem.result.jqPremium }}
+                  </span>
+                  <span v-if="reslistitem.result.jqPremium" style="font-size: 13px;color:#2D4D89"
+                    class="m-top-5">优惠:{{ reslistitem.result.jqExportFee }}</span>
                 </div>
               </el-col>
               <el-col :span="3" v-show="reslistitem.quoteCode == '200'">
-                  <span  style="color:#D42426;font-weight:bold;">
+                <span style="color:#D42426;font-weight:bold;">
                   ¥{{
                     reslistitem.result.taxAmount }}
                 </span>
               </el-col>
               <el-col :span="3" v-show="reslistitem.quoteCode == '200'">
                 <div class="dis f-c">
-                  <span  style="color:#D42426;font-weight:bold;">
-                  ¥{{
-                    reslistitem.result.syPremium }}
-                </span>
-                <span v-if="reslistitem.result.syPremium" style="font-size: 13px;color:#2D4D89" class="m-top-5" >优惠:{{reslistitem.result.syExportFee}}</span>
+                  <span style="color:#D42426;font-weight:bold;">
+                    ¥{{
+                      reslistitem.result.syPremium }}
+                  </span>
+                  <span v-if="reslistitem.result.syPremium" style="font-size: 13px;color:#2D4D89"
+                    class="m-top-5">优惠:{{ reslistitem.result.syExportFee }}</span>
                 </div>
               </el-col>
               <el-col :span="2" v-if="reslistitem.quoteCode == '200'" style="">
                 <div class="dis f-c">
                   <span style="color:#D42426;font-weight:bold;">
-                  {{
-                  reslistitem.result.jyPremium ? '¥' + reslistitem.result.jyPremium : '无' }}
-                </span>
-                <span v-if="reslistitem.result.jyPremium" style="font-size: 13px;color:#2D4D89" class="m-top-5" >优惠:{{reslistitem.result.noExportFee}}</span>
+                    {{
+                      reslistitem.result.jyPremium ? '¥' + reslistitem.result.jyPremium : '无' }}
+                  </span>
+                  <span v-if="reslistitem.result.jyPremium" style="font-size: 13px;color:#2D4D89"
+                    class="m-top-5">优惠:{{ reslistitem.result.noExportFee }}</span>
                 </div>
               </el-col>
+              <el-col :span="24"                
+                v-show="reslistitem.quoteCode == '200' && reslistitem.result.feeNoDescription">
+                                <div class="flex  offer-time" style="color:#D42426">
+                                    <span>该车未匹配费用,不建议投保!</span>
+                                    <el-tooltip class="item" effect="dark" content="优惠匹配错误信息" placement="top">
+                                        <i class="el-icon-s-goods"
+                      @click="open3(reslistitem.namesimple + '优惠信息', reslistitem.result.feeNoDescription)"                  
+                          style="font-size:20px;transform: scale(0.8);vertical-align: middle;"                      
+                      :disabled="reslistitem.quoteCode == '200' && reslistitem.result.feeNoDescription"                  
+                         ></i>
+                                      </el-tooltip>
+                                  </div>
+                              </el-col>
               <el-col :span="24"
                 v-show="(reslistitem.quoteCode != '200') && (reslistitem.quoteCode != '0') && (reslistitem.quoteCode != '1')">
                 <div class="flex j-s offer-time" style="color:#D42426">{{ reslistitem.msg.length > 500 ?
@@ -972,14 +989,15 @@
               <div class="flex f-c Driving-risk">
                 <div class="dis a-c" style="margin:15px 0">
                   <span style="margin-right:15px;font-weight:bold">选择意外险</span>
-                  <el-select style="width: 250px;margin-right:60px" filterable size="small" clearable v-model="insuranceHB"
-                    placeholder="未选择" @clear="clearAccidentFormHB" @change="hengbangInsuranceChange">
+                  <el-select style="width: 250px;margin-right:60px" filterable size="small" clearable
+                    v-model="insuranceHB" placeholder="未选择" @clear="clearAccidentFormHB"
+                    @change="hengbangInsuranceChange">
                     <el-option v-for="(item, index) in hengbangInsuranceData" :key="index" :label="item.programname"
                       :value="item.programcode"></el-option>
                   </el-select>
-                   保费: <b>{{ hengbangaccidentalDrivingVo.sumgrosspremium || 0}}&ensp;元</b>
+                  保费: <b>{{ hengbangaccidentalDrivingVo.sumgrosspremium || 0 }}&ensp;元</b>
                 </div>
-                <el-table  size="small" :data="HBInsuranceData" border v-if="insuranceHB" @row-click="HBDrivingChange"
+                <el-table size="small" :data="HBInsuranceData" border v-if="insuranceHB" @row-click="HBDrivingChange"
                   ref="RsTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="kindname" label="险种名称" align="center"></el-table-column>
@@ -1030,18 +1048,18 @@
               <div class="flex f-c Driving-risk">
                 <div class="dis a-c" style="margin:15px 0">
                   <span style="margin-right:15px;font-weight:bold">选择意外险</span>
-                  <el-select style="width: 250px;margin-right:60px" filterable size="small" clearable v-model="insuranceTP"
-                    placeholder="未选择" @clear="clearAccidentFormTP" @change="taipingInsuranceChange">
+                  <el-select style="width: 250px;margin-right:60px" filterable size="small" clearable
+                    v-model="insuranceTP" placeholder="未选择" @clear="clearAccidentFormTP" @change="taipingInsuranceChange">
                     <el-option v-for="(item, index) in taipingInsuranceData" :key="index" :label="item.rationName"
                       :value="item.rationType"></el-option>
                   </el-select>
-                  每份价税合计: <b>{{ taipingaccidentalDrivingVo.price || 0}}&ensp;元</b>
+                  每份价税合计: <b>{{ taipingaccidentalDrivingVo.price || 0 }}&ensp;元</b>
                 </div>
                 <el-table size="small" :data="TPInsuranceData" border v-if="insuranceTP" ref="RsTable"
                   highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="kindName" label="险种名称" align="center"></el-table-column>
-                  <el-table-column prop="insured"  label="险种金额"  align="center"></el-table-column>
+                  <el-table-column prop="insured" label="险种金额" align="center"></el-table-column>
                   <!-- <el-table-column prop="rationName" label="投保产品" align="center"></el-table-column>
                   <el-table-column label="投保份数" align="center" prop="quantity">
                     <template>
@@ -1130,7 +1148,7 @@
                   ref="RsTable" highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }">
                   <el-table-column prop="liabilityName" label="险种名称" align="center"></el-table-column>
-                  <el-table-column prop="amountLabel"  label="险种金额"  align="center"></el-table-column>
+                  <el-table-column prop="amountLabel" label="险种金额" align="center"></el-table-column>
                 </el-table>
               </div>
             </template>
@@ -1369,7 +1387,8 @@
           <el-table-column prop="orderstatus" label="状态" align="center">
             <template slot-scope="scope">
               <el-tag style="color:#33A08D;border-color:#33A08D;background: rgba(51,160,141,0.1);"
-                v-if="scope.row.orderstatus == '0' || scope.row.orderstatus == '1'" size="small">{{ scope.row.orderstatus |
+                v-if="scope.row.orderstatus == '0' || scope.row.orderstatus == '1'" size="small">{{ scope.row.orderstatus
+                  |
                   cap }}</el-tag>
               <el-tag type="danger" style="border-color:#E75B5D ;" v-else-if="scope.row.orderstatus == '3'"
                 size="small">{{ scope.row.orderstatus | cap }}</el-tag>
@@ -1440,7 +1459,7 @@
     </el-dialog>
     <!--第一种 二维码 -->
     <el-dialog :visible.sync="codedialogVisible" width="430px" top="10vh" class="saomazhifucodeClass">
-      <div class="ORcodebody" v-watermark="userform.id || userId"  >
+      <div class="ORcodebody" v-watermark="userform.id || userId">
         <div slot="title" class="dialog-title">
           <span>扫码付款</span>
         </div>
@@ -2156,7 +2175,7 @@ export default {
       }
     };
     return {
-      watermarkedImage:'',
+      watermarkedImage: '',
       redictInfoMsg: [],
       redictInfodialogVisible: false,
       qrcodeWidth: "180",
@@ -4050,7 +4069,7 @@ export default {
       this.anshengInsuranceData1 = data.departmentProductList;
     },
     hengbangInsuranceChange(index) {
-      this.HBInsuranceData =  this.hengbangInsuranceData.find(val => val.programcode == index).ggriskprogramdetailslist
+      this.HBInsuranceData = this.hengbangInsuranceData.find(val => val.programcode == index).ggriskprogramdetailslist
 
       if (this.HBInsuranceData.length) {
         this.HBDrivingChange(this.hengbangInsuranceData.find(val => val.programcode == index));
@@ -5063,6 +5082,16 @@ export default {
         duration: 7000
       });
     },
+    open3(Name, Msg) {
+      this.$notify.info({
+        title: Name,
+        dangerouslyUseHTMLString: true,
+        type: "warning",
+        message: `<p>${Msg.replace(/\n/g, '<br>')}</p>`,
+        customClass: "customNotifyClass",
+        duration: 7000
+      });
+    },
     openPredictInfo(Name, Msg) {
       this.redictInfoMsg = Msg;
       this.redictInfodialogVisible = true;
@@ -5842,7 +5871,7 @@ export default {
         renewalCodeJq: this.renewalCodeJq,
         renewalCodeSy: this.renewalCodeSy,
         agreementId: this.totalCompanyList[num].agreementId,
-        userId:this.userId
+        userId: this.userId
       };
       this.$api.letter.bohaiquote(params).then(res => {
         this.totalCompanyList[num].msg = res.msg;
@@ -5928,7 +5957,7 @@ export default {
         accidentalDrivingVo: this[ccidenttype + "accidentalDrivingVo"],
         orderNo: this.orderno,
         companyId: id,
-        userId:this.userId,
+        userId: this.userId,
         agreementId: this.totalCompanyList[num].agreementId
       };
       if (namesimple == "中国人寿" && this.lastCompanyId) {
@@ -7821,8 +7850,8 @@ export default {
           this.queryOrders = data;
 
           this.$api.letter.getThemeByUserId().then(res => {
-            if (res.code==200) {
-              if(res.data.themeCode=='GD'){
+            if (res.code == 200) {
+              if (res.data.themeCode == 'GD') {
                 this.$refs.quotationDialogPro.setBackupVisible(true);
               }
               else {
@@ -7857,10 +7886,10 @@ export default {
           this.jqstartdate = res.data.jqStartDate; //交强起保日期
           this.systartdate = res.data.syStartDate; //商业起保日期
           // this.mobile = res.data.applyinfo.mobile;//投保人手机号
-          let qrCodeUrl=res.data.qrCodeUrl
+          let qrCodeUrl = res.data.qrCodeUrl
           this.$api.letter.getThemeByUserId().then(res => {
-            if (res.code==200) {
-              if(res.data.themeCode=='GD'){
+            if (res.code == 200) {
+              if (res.data.themeCode == 'GD') {
                 this.codedialogVisiblePro = true;
                 this.qrcodeWidth = "154";
                 this.qrcodeHeight = "154";
@@ -7868,7 +7897,7 @@ export default {
               else {
                 this.codedialogVisible = true;
               }
-              this.$nextTick (function () {
+              this.$nextTick(function () {
                 if (item.inscompany == "太平财险") {
                   let anresult = qrCodeUrl.replace(/[\r\n]/g, "");
                   let animgBase64 = `data:image/png;base64,${anresult}`;
@@ -7879,7 +7908,7 @@ export default {
                   this.creatQrCode(qrCodeUrl);
                 }
               });
-                }
+            }
           })
         } else {
           this.$message({ message: res.msg, type: "warning" });
@@ -8715,5 +8744,4 @@ export default {
   .el-input-group__append {
     vertical-align: baseline;
   }
-}
-</style>
+}</style>