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

src/views/Core/components/detailsDialog.vue

@@ -107,8 +107,6 @@
               <el-col :span="6"><span>评分：</span>{{ orderInfo.extendInfo.score ?orderInfo.extendInfo.score :'' }}</el-col>
               <el-col :span="6"><span>总赔付率：</span>{{ orderInfo.extendInfo.lossRation }}</el-col>
               <el-col :span="6"><span>总折扣率：</span>{{ orderInfo.extendInfo.totalAdjustRate }}</el-col>
-              <el-col :span="6"><span>出险信息：</span>{{ orderInfo.extendInfo.accidentInfoStr }}</el-col>
-
             </el-row>
             <el-row class="premium-style " :gutter="20">
               <el-col :span="6"><span>交强类型评分：</span>{{ orderInfo.extendInfo.jqScore }}</el-col>
@@ -120,6 +118,12 @@
               <el-col :span="6"><span>商业赔付率：</span>{{ orderInfo.extendInfo.syLossRation }}</el-col>
               <el-col :span="6"><span>商业险折扣：</span>{{ orderInfo.extendInfo.syAdjustRate }}</el-col>
             </el-row>
+            <el-row class="premium-style " :gutter="20">
+              <el-col :span="6"><span>交强续保：</span>{{ orderInfo.extendInfo.jqRenewal }}</el-col>
+              <el-col :span="6"><span>商业续保：</span>{{ orderInfo.extendInfo.syRenewal }}</el-col>
+              <el-col :span="6"><span>交强出险次数：</span>{{ orderInfo.extendInfo.jqClaims }}</el-col>
+              <el-col :span="6"><span>商业出险次数：</span>{{ orderInfo.extendInfo.syClaims }}</el-col>
+            </el-row>
             <el-row class="premium-style " :gutter="20" v-if="orderInfo.ubiPredictedInfoScore">
               <el-col :span="6"><span>紫金能源车（鼎然-车辆风险评分）：</span>{{ orderInfo.ubiPredictedInfoScore }}</el-col>
             </el-row>

src/views/Sys/Deptall.vue

@@ -364,7 +364,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="dataForm.comlevel == '5'">
+        <!-- <el-row v-if="dataForm.comlevel == '5'">
           <el-col :span="8">
             <el-form-item
               label="一级管理费比例%"
@@ -410,8 +410,8 @@
               ></el-input-number>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="dataForm.comlevel == '5'">
+        </el-row> -->
+        <!-- <el-row v-if="dataForm.comlevel == '5'">
           <el-col :span="8">
             <el-form-item
               label="四级管理费比例%"
@@ -442,7 +442,7 @@
               ></el-input-number>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row> </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -637,11 +637,11 @@ export default {
         area: "", //区县
         house: "", //门店
         deptType: "", //机构类型：用来区分是子公司还是部门啥的，现有：子公司C,门店M,部门D
-        managementFee: 0, //一级管理费比例
-        managementFeeSecond: 0, //二级管理费比例
-        managementFeeThird: 0, //三级管理费比例
-        managementFeeForth: 0, //四级管理费比例
-        managementFeeFifth: 0, //五级管理费比例
+        // managementFee: 0, //一级管理费比例
+        // managementFeeSecond: 0, //二级管理费比例
+        // managementFeeThird: 0, //三级管理费比例
+        // managementFeeForth: 0, //四级管理费比例
+        // managementFeeFifth: 0, //五级管理费比例
         managementSource: 0, //来源
         orderNum: 0,
       },
@@ -694,41 +694,41 @@ export default {
             trigger: "blur",
           },
         ],
-        managementFee: [
-          {
-            required: true,
-            message: "一级管理费比例不能为空",
-            trigger: "blur",
-          },
-        ],
-        managementFeeSecond: [
-          {
-            required: true,
-            message: "二级管理费比例不能为空",
-            trigger: "blur",
-          },
-        ],
-        managementFeeThird: [
-          {
-            required: true,
-            message: "三级管理费比例不能为空",
-            trigger: "blur",
-          },
-        ],
-        managementFeeForth: [
-          {
-            required: true,
-            message: "四级管理费比例不能为空",
-            trigger: "blur",
-          },
-        ],
-        managementFeeFifth: [
-          {
-            required: true,
-            message: "五级管理费比例不能为空",
-            trigger: "blur",
-          },
-        ],
+        // managementFee: [
+        //   {
+        //     required: true,
+        //     message: "一级管理费比例不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // managementFeeSecond: [
+        //   {
+        //     required: true,
+        //     message: "二级管理费比例不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // managementFeeThird: [
+        //   {
+        //     required: true,
+        //     message: "三级管理费比例不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // managementFeeForth: [
+        //   {
+        //     required: true,
+        //     message: "四级管理费比例不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // managementFeeFifth: [
+        //   {
+        //     required: true,
+        //     message: "五级管理费比例不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       ///省市区表单校验规则
       roleProCity: {
@@ -1092,7 +1092,7 @@ export default {
                 type: "success",
                 message: "删除成功!",
               });
-            } 
+            }
             else {
               this.$message({
                 type: "error",

src/views/Task/daikeComponents/KtLetter.vue

@@ -835,7 +835,7 @@
               </el-col>
               <el-col :span="24" v-show="reslistitem.quoteCode == '200' && reslistitem.result.feeNoDescription">
                 <div class="flex offer-time" style="color:#D42426">
-                  <span>该车未匹配费用，不建议投保！</span>
+                  <span>该车未匹配销管费用，不建议投保！</span>
                   <el-tooltip class="item" effect="dark" content="优惠匹配错误信息" placement="top">
                     <i class="el-icon-s-goods"
                       @click="open3(reslistitem.namesimple + '优惠信息', reslistitem.result.feeNoDescription)"
@@ -930,11 +930,32 @@
                     商业折扣系数：
                     <span>{{ reslistitem.result.syAdjustRate }}</span>
                   </span>
-                  <span v-if="reslistitem.result.accidentInfoStr" class="marginL">
-                    出险信息：
+                  <span v-if="reslistitem.result.jqRenewal" class="marginL">
+                    交强续保：
                     <span>
                       {{
-                        reslistitem.result.accidentInfoStr }}
+                        reslistitem.result.jqRenewal? reslistitem.result.jqRenewal:"无" }}
+                    </span>
+                  </span>
+                  <span v-if="reslistitem.result.syRenewal" class="marginL">
+                    商业续保：
+                    <span>
+                      {{
+                        reslistitem.result.syRenewal? reslistitem.result.syRenewal:"无" }}
+                    </span>
+                  </span>
+                  <span v-if="reslistitem.result.jqClaims" class="marginL">
+                    交强出险次数：
+                    <span>
+                      {{
+                        reslistitem.result.jqClaims? reslistitem.result.jqClaims:'无' }}
+                    </span>
+                  </span>
+                  <span v-if="reslistitem.result.syClaims" class="marginL">
+                    商业出险次数：
+                    <span>
+                      {{
+                        reslistitem.result.syClaims? reslistitem.result.syClaims:'无' }}
                     </span>
                   </span>
                   <span v-if="reslistitem.namesimple == '紫金财险' && reslistitem.result.ubiPredictedInfoScore"
@@ -6097,7 +6118,7 @@ export default {
       else{
         return '-'
       }
-    
+
     },
     // 爬虫对接
     qoutedetail(companyId) {