Procházet zdrojové kódy

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

baijunde před 2 roky
rodič
revize
f117fedd4b

+ 18 - 0
src/http/moudules/dept.js

@@ -376,4 +376,22 @@ export const queryTreeList = (data) => {
         method: 'post',
         data
     })
+}
+
+
+//查询机构下的后线人员
+export const getLeadListDeptId = (deptId) => {
+    return axios({
+        url: '/dept/getLeadListDeptId?deptId='+deptId,
+        method: 'get'
+    })
+}
+
+//设置负责人id
+export const saveLeadId = (data) => {
+    return axios({
+        url: '/dept/saveLeadId',
+        method: 'post',
+        data
+    })
 }

+ 1 - 1
src/views/PeopleManage/Agent/AgentManage.vue

@@ -625,7 +625,7 @@ export default {
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 8 - 9
src/views/PeopleManage/Agent/SetupManager.vue

@@ -27,17 +27,17 @@
                     <div class="container_right">
                         <el-row >
                             <el-form ref="queryFormRef" :inline="false" :model="queryFrom" label-position="left" label-width="60px">                      
-                                <el-col :span="6">
+                                <el-col :lg="6"  :md="8">
                                     <el-form-item label="工号">
                                         <el-input size="small" clearable placeholder="请输入工号" v-model="queryFrom.userId"></el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :lg="6" :md="8">
                                     <el-form-item label="姓名">
                                         <el-input size="small" clearable placeholder="请输入姓名" v-model="queryFrom.name"></el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="6">
+                                <el-col :lg="6" :md="8">
                                     <el-form-item label="手机号">
                                         <el-input size="small" clearable placeholder="请输入手机号" v-model="queryFrom.mobile"></el-input>
                                     </el-form-item>
@@ -53,7 +53,7 @@
                                         </el-select>
                                     </el-form-item>
                                 </el-col> -->
-                                <el-col :span="6">
+                                <el-col :lg="6" :md="8">
                                     <el-form-item label>
                                         <el-button  size="small"
                                                     type="primary"
@@ -79,7 +79,6 @@
                             </el-button>
                         </el-row>
                         <kt-common-table    ref="ktcommontable"
-                                            :tableHeights="650"
                                             :data="pageResult"
                                             :columns="columns"
                                             :showBatchDelete="false"
@@ -102,22 +101,22 @@
                     top="1vh">
             <el-row >
                 <el-form ref="queryFormRef" :inline="false" :model="settingDialog.queryFrom" label-position="left" label-width="60px">                      
-                    <el-col :span="6">
+                    <el-col :lg="6" :md="8">
                         <el-form-item label="工号">
                             <el-input size="small" clearable placeholder="请输入工号" v-model="settingDialog.queryFrom.userId"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :lg="6" :md="8">
                         <el-form-item label="姓名">
                             <el-input size="small" clearable placeholder="请输入姓名" v-model="settingDialog.queryFrom.name"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :lg="6" :md="8">
                         <el-form-item label="手机号">
                             <el-input size="small" clearable placeholder="请输入手机号" v-model="settingDialog.queryFrom.mobile"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :lg="6" :md="8">
                         <el-form-item label>
                             <el-button  size="small"
                                         type="primary"

+ 1 - 1
src/views/PeopleManage/Player/PlayerManage.vue

@@ -625,7 +625,7 @@ export default {
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 1 - 1
src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -586,7 +586,7 @@ export default {
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 1 - 1
src/views/PeopleManage/Sales/SalesManage.vue

@@ -579,7 +579,7 @@ export default {
           {min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur"},
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 1 - 1
src/views/PeopleManage/Sales/SalesManageGroup.vue

@@ -579,7 +579,7 @@ export default {
           {min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur"},
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 1 - 1
src/views/PeopleManage/Staff/StaffManage.vue

@@ -540,7 +540,7 @@ export default {
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 1 - 1
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -542,7 +542,7 @@ export default {
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
           {
             pattern:
-              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              /^1(3[0-9]|4[0-9]|5[0-9]|6[2-9]|7[0-9]|8[0-9]|9[0-9])\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur",
           },

+ 103 - 0
src/views/Sys/Deptall.vue

@@ -135,6 +135,8 @@
           </el-table-column>
           <el-table-column prop="address" label="机构地址" align="center">
           </el-table-column>
+          <el-table-column prop="leadername" label="负责人" align="center">
+          </el-table-column>
           <el-table-column
             label="操作"
             fixed="right"
@@ -158,6 +160,12 @@
                 :label="'删除'"
                 @click.native.stop="deleteMechanism(scope.row)"
               ></KtButton>
+              <KtButton
+                :size="'medium'"
+                :type="'text'"
+                :label="'设置机构负责人'"
+                @click.native.stop="setLeadUserId(scope.row)"
+              ></KtButton>
             </template>
           </el-table-column>
         </el-table>
@@ -570,6 +578,50 @@
         }}</el-button>
       </span>
     </el-dialog>
+     <!-- 设置部门负责人 -->
+    <el-dialog
+      title="设置部门负责人"
+      width="500px"
+      :visible.sync="deptDialogLeadVisible"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      @close="closeLeadDialog"
+    >
+    <el-form
+        :model="leadDataForm"
+        :rules="leadDataRule"
+        ref="leadDataForm"
+        label-width="100px"
+        size="small"
+        style="text-align: left"
+      >
+      <el-row>
+        <el-col :span="8">
+        <el-form-item label="机构负责人" prop="address">
+          <el-select
+            style="width: 200px;"
+            filterable
+            v-model="leadDataForm.leadId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+       </el-col>
+      </el-row>
+    </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="closeLeadDialog">取消
+        </el-button>
+        <el-button size="small" type="primary" @click="leadSubmitForm()">确定
+        </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -609,6 +661,12 @@ export default {
   },
   data() {
     return {
+      deptDialogLeadVisible:false,
+      leadDataForm:{
+        leadId:"",
+        deptId:""
+      },
+      userList: [],
       loading: false,
       searchForm: {
         classname: "",
@@ -683,6 +741,15 @@ export default {
         managementSource: 1, //来源
         orderNum: 0,
       },
+      leadDataRule:{
+        leadId: [
+          {
+            required: true,
+            message: "请选择机构负责人",
+            trigger: "blur",
+          },
+        ],
+      },
       //表单验证
       dataRule: {
         name: [
@@ -814,6 +881,42 @@ export default {
     };
   },
   methods: {
+    //关闭部门弹框
+    closeLeadDialog() {
+      this.leadDataForm={
+        leadId:"",
+        deptId:""
+      },
+      this.deptDialogLeadVisible = false;
+    },
+    //提交
+    leadSubmitForm(){
+      this.$api.dept.saveLeadId(this.leadDataForm).then((res) => {
+        if (res.code == 200) {
+              this.findTreeData();
+              this.closeLeadDialog();
+              this.$message({
+                type: "success",
+                message: "设置成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: "设置失败!",
+              });
+            }
+      });
+    },
+    // 设置机构负责人
+    setLeadUserId(data) {
+      console.log(data.id)
+      this.leadDataForm.deptId =data.id;
+      //查询该机构下的后线人员
+      this.$api.dept.getLeadListDeptId(data.id).then((res) => {
+        this.userList = res.data;
+        this.deptDialogLeadVisible = true;
+      });
+    },
     //点击每一行的事件
     rowClick(row, treeNode) {
       //点每行展开折叠

+ 174 - 193
src/views/Task/daikeComponents/KtLetter1.vue

@@ -411,11 +411,14 @@
     <!-- 被保人信息 -->
     <div class="Enclosure flex f-c back">
       <div class="home flex j-s a-c">
-        <div class="flex j-s a-c">
+        <div class="flex j-s a-c" id="beitoubaoren">
           <img src="../../../../src/icon/被投保人信息.png" alt class="icon-img" />
           <span style="margin-left: 10px">被保人信息</span>
         </div>
         <div class="flex j-s a-c">
+          <div style="font-size: 12px; margin: 0 10px" v-show="!bbtbcarShow && !bbczcarShow">
+            <el-button size="small" type="primary" @click="clearBbxx">清空被保人信息</el-button>
+          </div>
           <div style="font-size: 12px; margin: 0 10px">
             同投保人
             <el-switch v-model="bbtbcarShow" active-color="#D42426" @change="bbtbcarShowChange()"></el-switch>
@@ -1375,7 +1378,6 @@
                       <el-button :disabled="reslistitem.namesimple == '众安财险' &&
                         reslistitem.result.tips == '需要验车'
                         " v-show="reslistitem.quoteCode == '200' &&
-                          !hbcg &&
                         !('editStatus' in reslistitem.result)
                         " type="text" size="small" style="color: #2d4d89; font-size: 14px"
                         @click="hbsubmitdialog(reslistitem, reslistindex)">下单</el-button>
@@ -2506,7 +2508,7 @@
               <img v-else :src="paycodeimg" alt style="width: 100%" />
             </div>
             <div v-else>
-              <img v-if="['太平财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 100%" />
+              <img v-if="['太平财险', '诚泰财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 100%" />
               <div v-else id="qrcode" ref="qrcode"></div>
             </div>
           </div>
@@ -2596,7 +2598,7 @@
           <img v-else :src="paycodeimg" alt style="width: 100%" />
         </div>
         <div v-else>
-          <img v-if="['太平财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 200px; height: 200px" />
+          <img v-if="['太平财险', '诚泰财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 200px; height: 200px" />
           <div v-else id="qrcode" ref="qrcode"></div>
         </div>
         <div class="scan-code">
@@ -5558,7 +5560,6 @@ export default {
       showLoading: false,
       detailJiaYiTitle: '查看详情',
       oldData: {},    // 旧获取公司参数
-      hbcg: false,
     };
   },
   watch: {
@@ -5791,162 +5792,136 @@ export default {
       }
       let starttime = new Date(this.carInfo.registerDate);
       let endtime = new Date(this.carInfo.issueDate);
+      // this.policyHolderInfovalidate();
       if (endtime < starttime) {
         this.$message({ message: "发证日期早于初登日期", type: "error" });
         return;
       }
+      this.policyHolderInfovalidate()
       console.log(this.policyHolderInfo, 'policyHolderInfo')
-      // this.policyHolderInfovalidate();
-
-      this.$refs["insuredPersonInfo"].validate((valid11) => {
-          if (valid11) {
-            this.$refs["carInfo"].validate((valid) => {
-              if (valid) {
-                // this.policyHolderInfovalidate()
-                _this.$refs["ownerInfo"].validate(async (valid1) => {
-                  if (valid1) {
-                    if (!_this.productId) {
-                      _this.$message.warning('请选择险别')
-                      return
-                    }
-                    // tbczcarShow: true, //投保人同车主
-                    // bbczcarShow: false, //被保人同车主
-                    // bbtbcarShow: true, //被保人同投保人
-                    // ownerInfo    车主
-                    // policyHolderInfo   投保人
-                    // insuredPersonInfo  被保人
-
-                    if (_this.bbtbcarShow == true) {
-                      _this.insuredPersonInfo = JSON.parse(
-                        JSON.stringify(_this.policyHolderInfo)
-                      );
-                    } else if (_this.bbczcarShow == true) {
-                      _this.insuredPersonInfo = JSON.parse(
-                        JSON.stringify(_this.ownerInfo)
-                      );
-                    } else {
-                      // _this.insuredPersonInfo = {}
-                    }
-
-                    if (this.tbczcarShow == true) {
-                      this.policyHolderInfo = JSON.parse(
-                        JSON.stringify(_this.ownerInfo)
-                      );
-                    } else {
-                      // this.policyHolderInfo = {}
-                    }
-
-                    let res = {};
-                    // res = await this.$api.letter.getAllAgreement();
-                    // this.$api.letter.getAllAgreement().then((res) => {
-                    // oldData
-                    let param = {
-                      productId: this.productId,
-                      carInfo: this.carInfo,
-                      ownerInfo: this.ownerInfo,
-                      applyInfo: this.policyHolderInfo,
-                      insureInfo: this.insuredPersonInfo,
-                      userId:this.isLetter==2? this.userId:""
-                    }
-                    if (JSON.stringify(param) === this.oldData) {
-                      return
-                    } else {
-                      this.oldData = JSON.stringify(param) 
-                    }
-                    console.log('校验成功,获取列表')
-                    this.showLoading = true
-                    this.$api.letter.ruleFilterCompany(param).then((res) => {
-                      if (res.code == 200) {
-                        res.data.map((ele) => {
-                          ele["result"] = {};
-                          ele["quoteCode"] = 0;
-                          ele["checked"] = false;
-                          ele["msg"] = "";
-                          ele["lastYearMsg"] = "";
-                          ele["agreementId"] = "";
-                          ele["apiType"] = "";
-                          ele["orderstatus"] = 0;
-                          ele.coefficient = "";
-                          ele.underwritingDescription =
-                            ele.agreement[0].underwritingDescription;
-                          if (ele.isTaxSource && ele.isTaxSource == "1" && ele.agreement) {
-                            ele.agreement.forEach((val) => {
-                              if (val.isTaxSource && val.isTaxSource == "1") {
-                                ele.agreementId = val.id;
-                                ele.apiType = val.apiType;
-                              }
-                            });
-                          }
-                        });
-                        if (this.$route.query.data) {
-                          data = data || this.$route.query.data
-                        }
-                        if (data) {
-                          this.productId = this.productId || data.productid
-                          res.data.forEach((val, index) => {
-                            if(!data.insAreaCompanyEditingDtos) {
-                              return
-                            }
-                            data.insAreaCompanyEditingDtos.forEach((ele) => {
-                              if (val.namesimple == ele.inscompany) {
-                                if (ele.inscompany == "中国人寿" && ele.companyId) {
-                                  this.lastCompanyId = ele.companyId;
-                                }
-                                res.data[index].quoteCode = 200;
-                                res.data[index].result = ele;
-                              }
-                            });
-                          });
+      this.$refs["carInfo"].validate((valid) => {
+        if (valid) {
+          _this.$refs["ownerInfo"].validate(async (valid1) => {
+            if (valid1) {
+              if (!this.bbczcarShow && !this.bbtbcarShow) {
+                this.$refs["insuredPersonInfo"].validate((valid2) => {
+                  if (!valid2) {
+                    document.getElementById("toubaor").scrollIntoView();
+                    this.$message({ message: "请检查被投保人信息", type: "warning" });
+                    return
+                  }
+                });
+              }
+              if (!_this.productId) {
+                _this.$message.warning('请选择险别')
+                return
+              }
+              let res = {};
+              // res = await this.$api.letter.getAllAgreement();
+              // this.$api.letter.getAllAgreement().then((res) => {
+              let param = {
+                productId: this.productId,
+                carInfo: this.carInfo,
+                ownerInfo: this.ownerInfo,
+                applyInfo: this.policyHolderInfo,
+                insureInfo: this.insuredPersonInfo,
+                userId:this.isLetter==2? this.userId:""
+              }
+              if (JSON.stringify(param) === this.oldData) {
+                return
+              } else {
+                this.oldData = JSON.stringify(param) 
+              }
+              console.log('校验成功,获取列表')
+              this.showLoading = true
+              this.$api.letter.ruleFilterCompany(param).then((res) => {
+                if (res.code == 200) {
+                  res.data.map((ele) => {
+                    ele["result"] = {};
+                    ele["quoteCode"] = 0;
+                    ele["checked"] = false;
+                    ele["msg"] = "";
+                    ele["lastYearMsg"] = "";
+                    ele["agreementId"] = "";
+                    ele["apiType"] = "";
+                    ele["orderstatus"] = 0;
+                    ele.coefficient = "";
+                    ele.underwritingDescription =
+                      ele.agreement[0].underwritingDescription;
+                    if (ele.isTaxSource && ele.isTaxSource == "1" && ele.agreement) {
+                      ele.agreement.forEach((val) => {
+                        if (val.isTaxSource && val.isTaxSource == "1") {
+                          ele.agreementId = val.id;
+                          ele.apiType = val.apiType;
                         }
-                        // //险种合并集合
-                      } else {
-                        this.$message.error(res.msg)
+                      });
+                    }
+                  });
+                  if (this.$route.query.data) {
+                    data = data || this.$route.query.data
+                  }
+                  if (data) {
+                    this.productId = this.productId || data.productid
+                    res.data.forEach((val, index) => {
+                      if(!data.insAreaCompanyEditingDtos) {
+                        return
                       }
-                      const combinedArray = [
-                        ...this.riskList.map(item => item.riskCode),
-                        ...this.kindList.map(item => item.kindCode),
-                      ];
-                      if (res.data) {
-                        res.data = res.data.filter(obj => {
-                        obj.agreement = obj.agreement.filter(agreementObj => {
-                          // 险种配置为空,则过滤掉该协议
-                          if (agreementObj.productsCodes == null) {
-                            return true;
-                          } else {
-                            // 检查是否包含 A 的特殊处理
-                            if (combinedArray.includes('A') && !agreementObj.productsCodes.includes(
-                                'A')) {
-                              return false;
-                            }
-                            return agreementObj.productsCodes.some(item => combinedArray.includes(
-                              item));
+                      data.insAreaCompanyEditingDtos.forEach((ele) => {
+                        if (val.namesimple == ele.inscompany) {
+                          if (ele.inscompany == "中国人寿" && ele.companyId) {
+                            this.lastCompanyId = ele.companyId;
                           }
-                        });
-                        return obj.agreement.length > 0; // 返回true保留,返回false移除该保险公司
-                      });
-                        res.data.forEach((e) => {
-                        e.agreement.forEach((el) => (el.disabled = false));
+                          res.data[index].quoteCode = 200;
+                          res.data[index].result = ele;
+                        }
                       });
-                      }
-                      this.totalCompanyList = res.data;
-                      this.showLoading = false
-                    })
-                  } else {
-                    document.getElementById("CheZhu").scrollIntoView();
-                    _this.$message({ message: "请检查人员信息", type: "warning" });
+                    });
                   }
+                  // //险种合并集合
+                } else {
+                  this.$message.error(res.msg)
+                }
+                const combinedArray = [
+                  ...this.riskList.map(item => item.riskCode),
+                  ...this.kindList.map(item => item.kindCode),
+                ];
+                if (res.data) {
+                  res.data = res.data.filter(obj => {
+                  obj.agreement = obj.agreement.filter(agreementObj => {
+                    // 险种配置为空,则过滤掉该协议
+                    if (agreementObj.productsCodes == null) {
+                      return true;
+                    } else {
+                      // 检查是否包含 A 的特殊处理
+                      if (combinedArray.includes('A') && !agreementObj.productsCodes.includes(
+                          'A')) {
+                        return false;
+                      }
+                      return agreementObj.productsCodes.some(item => combinedArray.includes(
+                        item));
+                    }
+                  });
+                  return obj.agreement.length > 0; // 返回true保留,返回false移除该保险公司
                 });
-              } else {
-                document.getElementById("Car").scrollIntoView();
-                this.$message({ message: "请检查车辆信息", type: "warning" });
-                return false;
-              }
-            });
-          } else {
-            document.getElementById("toubaor").scrollIntoView();
-            _this.$message({ message: "请检查投保人信息", type: "warning" });
-          }
-        });
+                  res.data.forEach((e) => {
+                  e.agreement.forEach((el) => (el.disabled = false));
+                });
+                }
+                this.totalCompanyList = res.data;
+                this.showLoading = false
+              })
+
+            } else {
+              document.getElementById("CheZhu").scrollIntoView();
+              _this.$message({ message: "请检查人员信息", type: "warning" });
+            }
+          });
+        } else {
+          document.getElementById("Car").scrollIntoView();
+          this.$message({ message: "请检查车辆信息", type: "warning" });
+          return false;
+        }
+      });
 
       },
     // 保费计算(报价)按钮
@@ -8406,26 +8381,22 @@ export default {
       this.imageUploadShow = true;
     },
     policyHolderInfovalidate() {
-      let isvalidat = false;
       let _this = this;
-      this.bbtbcarShowChange()
-      this.bbczcarShowChange()
+      // tbczcarShow 同车主
       if (_this.tbczcarShow == true) {
+        // 投保人信息 policyHolderInfo
         _this.policyHolderInfo = JSON.parse(JSON.stringify(_this.ownerInfo));
       } else {
         _this.$refs["policyHolderInfo"].validate((valid2) => {
           if (valid2) {
-            isvalidat = false;
           } else {
             document.getElementById("toubaor").scrollIntoView();
             _this.$message({ message: "请检查投保人信息", type: "warning" });
-            isvalidat = true;
           }
         });
       }
-      if (isvalidat) {
-        return;
-      }
+      this.bbtbcarShowChange()
+      this.bbczcarShowChange()
     },
     //报价
     quote(index) {
@@ -10571,7 +10542,6 @@ export default {
                           message: "核保成功",
                           type: "success",
                         });
-                        this.hbcg = true
                         this.QuotationHistory();
                         _this.$api.letter
                           .getByCompanyId({ companyId: this.companyId })
@@ -10628,7 +10598,6 @@ export default {
                               message: "核保成功",
                               type: "success",
                             });
-                        this.hbcg = true
                         this.QuotationHistory();
                             _this.$api.letter
                               .getByCompanyId({ companyId: this.companyId })
@@ -10707,7 +10676,6 @@ export default {
                           message: "核保成功",
                           type: "success",
                         });
-                        this.hbcg = true
                         this.QuotationHistory();
                         _this.$api.letter
                           .getByCompanyId({ companyId: this.companyId })
@@ -10769,7 +10737,6 @@ export default {
                               message: "核保成功",
                               type: "success",
                             });
-                        this.hbcg = true
                         this.QuotationHistory();
                             _this.$api.letter
                               .getByCompanyId({ companyId: this.companyId })
@@ -10837,7 +10804,6 @@ export default {
                               message: "核保成功",
                               type: "success",
                             });
-                        this.hbcg = true
                         this.QuotationHistory();
                             _this.$api.letter
                               .getByCompanyId({ companyId: this.companyId })
@@ -10895,7 +10861,6 @@ export default {
                               message: "核保成功",
                               type: "success",
                             });
-                        this.hbcg = true
                         this.QuotationHistory();
                             _this.$api.letter
                               .getByCompanyId({ companyId: this.companyId })
@@ -10962,7 +10927,6 @@ export default {
                           message: "核保成功",
                           type: "success",
                         });
-                        this.hbcg = true
                         this.QuotationHistory();
                         _this.$api.letter
                           .getByCompanyId({ companyId: this.companyId })
@@ -11024,7 +10988,6 @@ export default {
                               message: "核保成功",
                               type: "success",
                             });
-                        this.hbcg = true
                         this.QuotationHistory();
                             _this.$api.letter
                               .getByCompanyId({ companyId: this.companyId })
@@ -11092,7 +11055,6 @@ export default {
                           message: "核保成功",
                           type: "success",
                         });
-                        this.hbcg = true
                         this.QuotationHistory();
                         _this.$api.letter
                           .getByCompanyId({ companyId: this.companyId })
@@ -11150,7 +11112,6 @@ export default {
                               message: "核保成功",
                               type: "success",
                             });
-                        this.hbcg = true
                         this.QuotationHistory();
                             _this.$api.letter
                               .getByCompanyId({ companyId: this.companyId })
@@ -11364,38 +11325,57 @@ export default {
       this.$forceUpdate()
     },
     bbczcarShowChange() {
-      //被保人同车主
-      switch (this.bbczcarShow) {
-        case true:
-          this.bbtbcarShow = false;
-          this.insuredPersonInfo = JSON.parse(JSON.stringify(this.ownerInfo));
-          break;
-        default:
-          for (let key in this.insuredPersonInfo) {
-            this.insuredPersonInfo[key] = "";
-            this.insuredPersonInfo.provinceData = [];
-            // this.selectedOptions3 = [];
-          }
+      if (this.bbczcarShow) {
+        this.bbtbcarShow = false
       }
+      //被保人同车主
+      if (this.bbczcarShow && !this.bbtbcarShow) {
+        this.insuredPersonInfo = JSON.parse(JSON.stringify(this.ownerInfo));
+        this.bbtbcarShow = false
+      }
+      // if (!this.bbczcarShow && !this.bbtbcarShow) {
+      //   for (let key in this.insuredPersonInfo) {
+      //     this.insuredPersonInfo[key] = "";
+      //     this.insuredPersonInfo.provinceData = [];
+      //     // this.selectedOptions3 = [];
+      //   }
+      //   this.insuredPersonInfo = {}
+      // }
+      // if (this.bbtbcarShow) {
+      //   return
+      // }
+      // switch (this.bbczcarShow) {
+      //   case true:
+      //     this.insuredPersonInfo = JSON.parse(JSON.stringify(this.ownerInfo));
+      //     this.bbtbcarShow = false;
+      //     console.log( '车主信息111111', this.ownerInfo, '投保人信息', this.policyHolderInfo, '被保人信息', this.insuredPersonInfo, '被保人同车主', this.bbczcarShow)
+      //     break;
+      //   default:
+      //     for (let key in this.insuredPersonInfo) {
+      //       this.insuredPersonInfo[key] = "";
+      //       this.insuredPersonInfo.provinceData = [];
+      //       // this.selectedOptions3 = [];
+      //     }
+      // }
       this.$forceUpdate()
     },
     bbtbcarShowChange() {
-      //被保人同投保人
-      switch (this.bbtbcarShow) {
-        case true:
-          this.bbczcarShow = false;
-          this.insuredPersonInfo = JSON.parse(
-            JSON.stringify(this.policyHolderInfo)
-          );
-          break;
-        default:
-          for (let key in this.insuredPersonInfo) {
-            this.insuredPersonInfo[key] = "";
-            this.insuredPersonInfo.provinceData = [];
-          }
+      if (this.bbtbcarShow) {
+        this.bbczcarShow = false 
+      }
+      if (this.bbtbcarShow && !this.bbczcarShow) {
+          this.insuredPersonInfo = JSON.parse(JSON.stringify(this.policyHolderInfo));
+          this.bbczcarShow = false
       }
       this.$forceUpdate()
     },
+    // 清空被保人信息
+    clearBbxx() {
+      for (let key in this.insuredPersonInfo) {
+        this.insuredPersonInfo[key] = "";
+        this.insuredPersonInfo.provinceData = [];
+      }
+    },
     // 查询车牌信息
     toCheckLicenseNo(licenseNo) {
       if (licenseNo) {
@@ -12291,6 +12271,7 @@ export default {
                 var _that = this;
                 switch (_that.inscompany) {
                   case "太平财险":
+                  case "诚泰财险":
                     let anresult = qrCodeUrl.replace(/[\r\n]/g, "");
                     let animgBase64 = `data:image/png;base64,${anresult}`;
                     base64ToPath(animgBase64).then((path) => {

+ 3 - 3
src/views/Task/daikeComponents/KtOrder.vue

@@ -295,7 +295,7 @@
               <img v-else :src="paycodeimg" alt style="width: 100%" />
             </div>
             <div v-else>
-              <img v-if="['太平财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 100%" />
+              <img v-if="['太平财险', '诚泰财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 100%" />
               <div v-else id="qrcode" ref="qrcode"></div>
             </div>
           </div>
@@ -378,7 +378,7 @@
           <img v-else :src="paycodeimg" alt style="width: 100%" />
         </div>
         <div v-else>
-          <img v-if="['太平财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 200px; height: 200px" />
+          <img v-if="['太平财险', '诚泰财险'].includes(inscompany)" :src="paycodeimg" alt style="width: 200px; height: 200px" />
           <div v-else id="qrcode" ref="qrcode"></div>
         </div>
         <div class="scan-code">
@@ -1728,7 +1728,7 @@ export default {
                 this.codedialogVisible = true;
               }
               this.$nextTick(function () {
-                if (item.inscompany == "太平财险") {
+                if (item.inscompany == "太平财险" || item.inscompany == "诚泰财险") {
                   let anresult = qrCodeUrl.replace(/[\r\n]/g, "");
                   let animgBase64 = `data:image/png;base64,${anresult}`;
                   base64ToPath(animgBase64).then((path) => {