冲突

src/views/Task/daikeComponents/KtLetter.vue

@@ -829,18 +829,6 @@
                 <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 ?
@@ -958,7 +946,6 @@
                       style="font-size:20px;transform: scale(0.8);vertical-align: middle;"
                       v-show="(reslistitem.quoteCode == '200' && reslistitem.predictInfo && reslistitem.predictInfo.length > 0 && reslistitem.namesimple == '中国人寿')"></i>
                   </el-tooltip>
-
                   <el-button :disabled="reslistitem.namesimple == '众安财险' && reslistitem.result.tips == '需要验车'"
                     v-show="reslistitem.quoteCode == '200' && !('editStatus' in reslistitem.result)" type="text"
                     size="small" style="color:#2D4D89;font-size:14px" @click="hbsubmitdialog(reslistitem)">下单</el-button>
@@ -5071,17 +5058,7 @@ export default {
         title: Name,
         dangerouslyUseHTMLString: true,
         type: "warning",
-        message:`<p>${Msg.replace(/\n/g, '<br>')}</p>`,
-        customClass: "customNotifyClass",
-        duration: 7000
-      });
-    },
-    open3(Name, Msg) {
-      this.$notify.info({
-        title: Name,
-        dangerouslyUseHTMLString: true,
-        type: "warning",
-        message:`<p>${Msg.replace(/\n/g, '<br>')}</p>`,
+        message: Msg,
         customClass: "customNotifyClass",
         duration: 7000
       });
@@ -7891,7 +7868,18 @@ export default {
               else {
                 this.codedialogVisible = true;
               }
-            }
+              this.$nextTick (function () {
+                if (item.inscompany == "太平财险") {
+                  let anresult = qrCodeUrl.replace(/[\r\n]/g, "");
+                  let animgBase64 = `data:image/png;base64,${anresult}`;
+                  base64ToPath(animgBase64).then(path => {
+                    this.paycodeimg = path;
+                  });
+                } else {
+                  this.creatQrCode(qrCodeUrl);
+                }
+              });
+                }
           })
         } else {
           this.$message({ message: res.msg, type: "warning" });