Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/sys.js

@@ -501,6 +501,24 @@ export const taiShanCode = (data) => {
       data
   })
 }
+
+//泰山验证码
+export const taiShanCode1 = (data) => {
+  return axios({
+    url:`/insurance/crawler/sendTscode`,
+    method: 'post',
+    data
+  })
+}
+
+//登录
+export const crawlerlogin1 = (data) => {
+  return axios({
+    url:`/insurance/crawler/loginTs`,
+    method: 'post',
+    data
+  })
+}
 //登录
 export const crawlerlogin = (agreementId,smscode) => {
   return axios({

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -1511,6 +1511,17 @@
           style="background: #2D4D89;color: #fff;border-color: #2D4D89;">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog title="验证码登录" :visible.sync="codedialogVisible" width="15%" >
+      <div style="padding:20px;display: flex;justify-content: center;align-items: center">
+        <el-input v-model="smscode" placeholder="验证码" style="width: 70%;text-align: center;"></el-input>
+      </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="small" @click="codedialogVisible = false">取 消</el-button>
+          <el-button size="small" type="primary" @click="login">登录</el-button>
+        </span>
+
+    </el-dialog>
     <el-drawer :visible.sync="drawer" :direction="'rtl'" size="100%" :before-close="handleClose" :destroy-on-close="true">
 
       <div class="drawer-main">
@@ -1540,6 +1551,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";
 export default {
   components: {
     tree,
@@ -2201,6 +2213,7 @@ export default {
         serialNumber: 0, //序号
         auditType: "",
         productsCode: "",//险种匹配
+        smsCode:"",
       },
       //产品费用
       productCostForm: {
@@ -2557,6 +2570,9 @@ export default {
       selectedLengthList: [], // 保存每页已选择的的数据的条数，用与selectedLength计算
       hasSelectedList: [], // 保存每页已选择的数据，用与回显
       hadSelectedList: [], // 保存每页已选择的数据，用与回显（因切换分页时已选中的数据会清零，所以要单独再保存一次）
+      codedialogVisible: false,//验证码弹窗
+      codeLoginVisible: false,//验证码弹窗
+      smscode: "",//验证码
     };
   },
   computed: {
@@ -4235,8 +4251,40 @@ export default {
       this.agreement.custodianId = ''
       this.custodianIdData = ''
     },
+
+    login() {
+      this.agreement.smsCode = this.smscode
+      let params = {
+        agreement: this.agreement,
+        attribution: this.attributionform,
+        dept: this.dept,
+      };
+      this.$api.sys.crawlerlogin1(params).then((res) => {
+        if (res.code == '200') {
+          this.codedialogVisible=false;
+          this.codeLoginVisible = true;
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
     //提交
     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 agreementCheckFlag = true; //协议信息校验标志
       this.$refs["addAgreementRef"].validate((valid) => {
         if (!valid) {
@@ -4265,6 +4313,7 @@ export default {
           });
         }
       });
+
       //如果校验通过，则进行提交
       if (agreementCheckFlag && accountCheckFlag) {
         if (this.operType == "ADD") {

src/views/Task/daikeComponents/KtLetter1.vue

@@ -1414,6 +1414,13 @@ agreementitem, agreementindex
                         </div>
                       </div>
                     </div>
+                    <div class="card-table flex a-c j-s" v-show="reslistitem.cnName == 'renbao'">
+                        <div class="flex a-c mrgin-5">
+                            <span style="margin-right: 5px;">车险保额折扣:</span>
+                            <el-input v-model="reslistitem.result.priceCoefficient" size="mini" class="coefficient"
+                                      placeholder="请输入"></el-input>
+                        </div>
+                    </div>
                   </div>
                 </el-col>
                 <!-- 服务明细 -->
@@ -10853,6 +10860,9 @@ export default {
         params.discount = this.totalCompanyList[num].result.expectedDiscount;
         params.coefficient = this.totalCompanyList[num].result.pricingCoefficient;
       }
+      if (namesimple == '人保财险') {
+          params.priceCoefficient = this.totalCompanyList[num].result.priceCoefficient
+      }
       this.$api.letter[api](params).then(res => {
         this.totalCompanyList[num].msg = res.msg;
         switch (namesimple) {