Merge remote-tracking branch 'origin/dev' into dev

src/http/moudules/sys.js

@@ -510,14 +510,30 @@ export const taiShanCode1 = (data) => {
     data
   })
 }
+// 统一发送验证码
+export const sendLoginSmsCode = (data) => {
+    return axios({
+        url: '/insurance/crawler/sendLoginSmsCode',
+        method: 'post',
+        data
+    })
+}
 
 //登录
 export const crawlerlogin1 = (data) => {
-  return axios({
-    url:`/insurance/crawler/loginTs`,
-    method: 'post',
-    data
-  })
+    return axios({
+        url:`/insurance/crawler/loginTs`,
+        method: 'post',
+        data
+    })
+}
+//登录
+export const verifyLoginSmsCode = (data) => {
+    return axios({
+        url:`/insurance/crawler/verifyLoginSmsCode`,
+        method: 'post',
+        data
+    })
 }
 //登录
 export const crawlerlogin = (agreementId,smscode) => {

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -1554,7 +1554,7 @@ import agreementHistoryRecord from "./AgreementHistoryRecord.vue"
 import agreementUnderwritingRule from "./AgreementUnderwritingRule.vue"
 import agreementNonVehicleConfig from "./AgreementNonVehicleConfig.vue"
 import { updateFeeFile } from "../../../http/moudules/insCompany";
-import {crawlerlogin1} from "../../../http/moudules/sys";
+import {crawlerlogin1, sendLoginSmsCode} from "../../../http/moudules/sys";
 export default {
   components: {
     tree,
@@ -4262,7 +4262,7 @@ export default {
         attribution: this.attributionform,
         dept: this.dept,
       };
-      this.$api.sys.crawlerlogin1(params).then((res) => {
+      this.$api.sys.verifyLoginSmsCode(params).then((res) => {
         if (res.code == '200') {
           this.codedialogVisible=false;
           this.codeLoginVisible = true;
@@ -4276,17 +4276,17 @@ export default {
     },
     //提交
     submitForm() {
-      let code = this.agreement.partnerCompaniesId.substring(0,4);
-      let apiType = this.attributionform.apiType;
-      if(code == 'TSBX' && apiType == '2' && !this.codeLoginVisible){
-          this.$api.sys.taiShanCode1(this.attributionform).then((res) => {
-            if (res.code != '200') {
-              this.$message.error(res.msg);
-            }
-          })
-        this.codedialogVisible = true
-        return
-      }
+      // let code = this.agreement.partnerCompaniesId.substring(0,4);
+      // let apiType = this.attributionform.apiType;
+      // if(code == 'TSBX' && apiType == '2' && !this.codeLoginVisible){
+      //     this.$api.sys.taiShanCode1(this.attributionform).then((res) => {
+      //       if (res.code != '200') {
+      //         this.$message.error(res.msg);
+      //       }
+      //     })
+      //   this.codedialogVisible = true
+      //   return
+      // }
 
       let agreementCheckFlag = true; //协议信息校验标志
       this.$refs["addAgreementRef"].validate((valid) => {
@@ -4381,7 +4381,7 @@ export default {
           }
         }
       }
-      
+
     },
     //检测python登录
     checkLogin(){
@@ -4406,6 +4406,18 @@ export default {
           }
         });
       } else {
+        let list = ['TSBX', 'XDCX']
+        let code = this.agreement.partnerCompaniesId.substring(0,4);
+        let apiType = this.attributionform.apiType;
+        if(list.includes(code) && apiType == '2' && !this.codeLoginVisible){
+            this.$api.sys.sendLoginSmsCode(this.attributionform).then((res) => {
+                if (res.code != '200') {
+                    this.$message.error(res.msg);
+                }
+            })
+            this.codedialogVisible = true
+            return
+        }
         let upparams = {
           agreementId: this.agreementId,
           agreement: this.agreement,
@@ -4428,7 +4440,7 @@ export default {
             }
           });
       }
-    
+
     },
     //分页条数
     handleSizeChange(val) {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/AddOptionalsolutionConfig.vue

@@ -385,7 +385,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/Core/components/detailsDialog.vue

@@ -391,8 +391,12 @@
                   <el-col :span="6"><span>商业出险次数：</span>{{ orderInfo.extendInfo.syClaims }}</el-col>
                 </el-row>
                 <el-row class="premium-style " :gutter="20" >
-                  <el-col :span="6" v-if="orderInfo.ubiPredictedInfoScore"><span>紫金能源车（鼎然-车辆风险评分）：</span>{{ orderInfo.ubiPredictedInfoScore }}</el-col>
-                  <el-col :span="6" v-if="orderInfo.mergeCostRate"><span>交商合并经营成本率：</span>{{ orderInfo.mergeCostRate }}</el-col>
+                    <el-col :span="6" v-if="orderInfo.ubiPredictedInfoScore"><span>紫金能源车（鼎然-车辆风险评分）：</span>{{ orderInfo.ubiPredictedInfoScore }}</el-col>
+                    <el-col :span="6" v-if="orderInfo.mergeCostRate"><span>交商合并经营成本率：</span>{{ orderInfo.mergeCostRate }}</el-col>
+                </el-row>
+                <el-row class="premium-style " :gutter="20" >
+                    <el-col :span="6" v-if="orderInfo.seriesTypeActualName"><span>红黄蓝车系：</span>{{ orderInfo.seriesTypeActualName }}</el-col>
+                    <el-col :span="6" v-if="orderInfo.xyhGrade"><span>向阳花评分：</span>{{ orderInfo.xyhGrade }}</el-col>
                 </el-row>
               </div>
             </OpenCloseBox>
@@ -1482,6 +1486,7 @@ export default {
     }
   },
   created() {
+      console.log(123123123, this.orderInfo)
     //获取操作符
     this.$api.dict.findPage(this.operator).then(res => {
       this.operatorlist = res.data.content;
@@ -1906,7 +1911,7 @@ export default {
     },
     imageFun(param) {
       console.log(this.isAuditing)
-      console.log(param, '111111111111111111111111111111')
+      console.log(this.orderInfo, '111111111111111111111111111111')
       this.obj = param
     },
     warrantyFun(param) {

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -96,6 +96,7 @@ export default {
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
+        { prop: 'operatorName', label: '操作人', minWidth: 120 },
         { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -234,6 +234,7 @@ export default {
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
+        { prop: 'operatorName', label: '操作人', minWidth: 120 },
         { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },

src/views/Task/ElectricSales/AgentPoolChannel3.vue

@@ -96,6 +96,7 @@ export default {
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
+        { prop: 'operatorName', label: '操作人', minWidth: 120 },
         { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -94,6 +94,7 @@ export default {
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
+        { prop: 'operatorName', label: '操作人', minWidth: 120 },
         { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },

src/views/Task/daikeComponents/KtLetter1.vue

@@ -1743,6 +1743,16 @@ agreementitem, agreementindex
                             <div class="flex-1">{{ reslistitem.result.bifeeFloat ? reslistitem.result.bifeeFloat :
                                 "无" }}</div>
                         </div>
+                        <div class="table-list-content" v-if="reslistitem.namesimple == '阳光财险'">
+                            <div class="flex-1">向阳花评分：</div>
+                            <div class="flex-1">{{ reslistitem.result.xyhGrade == 0 || reslistitem.result.xyhGrade == 1 ? reslistitem.result.xyhGrade :
+                                "无" }}</div>
+                        </div>
+                        <div class="table-list-content" v-if="reslistitem.namesimple == '阳光财险'">
+                            <div class="flex-1">红黄蓝车系：</div>
+                            <div class="flex-1">{{ reslistitem.result.seriesTypeActualName ? reslistitem.result.seriesTypeActualName :
+                                "无" }}</div>
+                        </div>
                         <div class="table-list-content" v-if="reslistitem.namesimple == '永安财险'">
                             <div class="flex-1">评分：</div>
                             <div class="flex-1">{{ reslistitem.result.yaScore ? reslistitem.result.yaScore :
@@ -10456,7 +10466,7 @@ export default {
       let api = type == 2 ? "pythonquote" : "huataiquote";
       let isTaxSource = this.totalCompanyList[num].isTaxSource;
       let params = {
-        accidentalDrivingVo: {},
+        accidentalDrivingVo: this.totalCompanyList[num].programme.drivingList[0] || {},
         orderNo: this.orderno,
         companyId: id,
         agreementId: this.totalCompanyList[num].agreementId,
@@ -12152,16 +12162,17 @@ export default {
                   });
                 break;
               case "国任财险":
-                await this.$api.letter
-                  .insguorensubmitImage({
-                    companyId: this.companyId
-                  })
-                  .then(res => {
+                  let GRApiImage = "";
+                  GRApiImage =
+                      this.apiType == 2 ? "pythonsubmitImage" : "insguorensubmitImage";
+                  await this.$api.letter[GRApiImage]({
+                      [this.apiType == 2 ? "subOrderNo" : "companyId"]: this.companyId
+                  }).then(res => {
                     if (res.code == "200") {
                       var _this = this;
-                      _this.$api.letter
-                        .gunrenaudit({
-                          companyId: this.companyId
+                      let auditType = this.apiType == 2? 'pythonaudit': 'gunrenaudit'
+                      _this.$api.letter[auditType]({
+                          [this.apiType == 2 ? "subOrderNo" : "companyId"]: this.companyId
                         })
                         .then(res => {
                           if (res.code == "200") {

src/views/Task/daikeComponents/KtOrder.vue

@@ -197,6 +197,7 @@
                   '平安财险',
                   '太平洋财险',
                   '阳光财险',
+                  '永安财险',
                 ].includes(item.inscompany)
               " class="blue_color" @click="querystatus(item, index)">状态更新</el-button>
               <el-button v-if="item.orderstatus !== '2'" size="mini" type="text" class="blue_color"
@@ -526,6 +527,7 @@
                   '平安财险',
                   '太平洋财险',
                   '阳光财险',
+                  '永安财险',
                 ].includes(scope.row.inscompany)
               " @click="querystatus(scope.row, 'history')">状态更新</el-button>
             </template>
@@ -1888,7 +1890,8 @@ export default {
         item.inscompany == "泰康财险" ||
         item.inscompany == "华农财险" ||
         item.inscompany == "华安财险" ||
-        item.inscompany == "泰山财险"
+        item.inscompany == "泰山财险" ||
+        item.inscompany == "永安财险"
       ) {
         this.$api.letter
           .pychonverifyPayment({ subOrderNo: item.id })