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

src/config/global.js

@@ -26,8 +26,13 @@ export const h5BaseUrl = 'http://39.98.239.48/h5'  //h5正式
 
 //保险公司名称
 export const insCompanyList = [
-  { name: "华农财险", code: "huanong", icon: "../../static/image/company/huanong.png" },//华农
-  { name: "恒邦财险", code: "hengbang", icon: "../../static/image/company/hengbang.png" }//恒邦
+  { name: "中煤财险", icon: "../../static/insuranceicon/zhongmei.png" },//华农
+  { name: "恒邦财险", icon: "../../static/insuranceicon/hengbang.png" },
+  { name: "安盛天平", icon: "../../static/insuranceicon/ansheng.png" },
+  { name: "中国人寿", icon: "../../static/insuranceicon/renshou.png" },
+  { name: "众安财险", icon: "../../static/insuranceicon/zhongan.png" },
+  { name: "永诚财险", icon: "../../static/insuranceicon/yongcheng.png" },
+  { name: "永安财险", icon: "../../static/insuranceicon/yongan.png" },
 ]
 //订单状态
 export const orderStatus = [

src/http/moudules/letter.js

@@ -377,12 +377,42 @@ export const ycgainAccidentSchemeList = (data) => {
         data
     })
 }
-
+//紫金报价
+export const zijinquote = (data) => {
+  return axios({
+      url: "/order/zijin/quote",
+      method: "post",
+      data
+  })
+}
+//紫金核保
+export const zijinaudit = (data) => {
+  return axios({
+      url: "/order/zijin/audit",
+      method: "post",
+      data
+  })
+}
+//紫金提交影像
+export const zijinsubmitImage = (data) => {
+  return axios({
+      url: "/order/zijin/submitImage",
+      method: "post",
+      data
+  })
+}
+//紫金意外险
+export const zijinqueryVehicleProducts = (data) => {
+  return axios({
+      url: "/order/zijin/queryVehicleProducts",
+      method: "post",
+      data
+  })
+}
 /***
     爬虫统一调用模块
- * 
+ *
  */
-
 // 报价
 export const pythonquote = (data) => {
     return axios({
@@ -399,7 +429,6 @@ export const pythonaudit=(data)=>{
         data
     })
 }
-
 //提交影像
 export const pythonsubmitImage=(data)=>{
     return axios({
@@ -416,7 +445,6 @@ export const pychonverifyPayment=(data)=>{
         data
     })
 }
-
 //电子保单
 export const pythongetPolicyPrint=(data)=>{
     return axios({

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -2215,7 +2215,7 @@ export default {
           this.costform.scheme = scheme;
           this.nonCarProductCosts = res.data.nonCarProductCosts;
           this.UnderwritingRules = res.data.underwritingRules;
-          // this.attributionform = res.data.ptlAgreementAttribution;
+          this.attributionform = res.data.ptlAgreementAttribution;
           if (res.data.dept.length > 0) {
             res.data.dept.map(ele => {
               this.treekeys.push(ele.deptId);
@@ -2385,7 +2385,6 @@ export default {
         return
       })
       this.CostfactorForm.licenseNumber = linumber.slice(0, -1)
-
     },
     vehicleCategoryChange(e) {
       let data = "";

src/views/Esm/Esmcompany.vue

@@ -6,25 +6,22 @@
           <el-form label-position="left" ref="searchForm" size="small" :model="searchForm" label-width="100px">
             <el-row>
               <el-col :span="6">
-                <el-form-item label="供应商名称：" prop="classname">
-                  <el-input clearable v-model="searchForm.classname" placeholder="请输入供应商名称"
+                <el-form-item label="供应商名称：" >
+                  <el-input clearable v-model="searchForm.name" placeholder="请输入供应商名称"
                     style="width: 250px;"></el-input>
                 </el-form-item>
-
               </el-col>
               <el-col :span="6">
-                <el-form-item label="供应商类型：" prop="classname">
+                <el-form-item label="供应商类型：" >
                   <el-select v-model="searchForm.type" placeholder="请选择供应商" style="width: 250px;">
                     <el-option label="保司" value="1"></el-option>
                     <el-option label="渠道" value="2"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" style="margin-top: 2px">
+              <el-col :span="4" >
                 <el-button size="small" type="primary" style="background-color: #00bc70; border: 1px solid #00bc70"
                   @click="searchInfor()">搜索</el-button>
-                <el-button size="small" style="background-color: #ffffff; border: 1px solid c6e2ff"
-                  @click="resetfrom()">重置</el-button>
               </el-col>
             </el-row>
           </el-form>
@@ -160,14 +157,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :span="24">
-            <el-form-item label="报价开关">
-              <el-switch v-model="value" @change="companyChange" active-color="#13ce66">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" style="width: 100%">
@@ -319,7 +308,7 @@ export default {
         expandTrigger: "hover",
       },
       searchForm: {
-        classname: "",
+        name: "",
         type: "",
       },
       isshow: false,

src/views/Letter/Orderlist.vue

@@ -116,7 +116,7 @@
                 <div style="padding:0 20px">
                     <div class="ORcode ">
                         <div style="padding:5px;position: relative;">
-                            <div v-if="['永安财险', '人保财险', '永诚财险', '中煤财险'].includes(inscompany)" id="qrcode" ref="qrcode">
+                            <div v-if="['永安财险', '人保财险', '永诚财险', '中煤财险','众安财险'].includes(inscompany)" id="qrcode" ref="qrcode">
                             </div>
                             <img v-if="['恒邦财险', '安盛财险'].includes(inscompany)" :src="paycodeimg" alt="" style="width:100%">
                         </div>
@@ -1174,11 +1174,10 @@ export default {
                             });
                             break;
                         case "人保财险":
-                            this.$nextTick(() => {
-                                this.creatQrCode(res.data.paymentLink);
-                            });
-                            break;
                         case "中煤财险":
+                        case "永诚财险":
+                        case "中国人寿":
+                        case "众安财险":
                             this.$nextTick(() => {
                                 this.creatQrCode(res.data.paymentLink);
                             });
@@ -1186,12 +1185,7 @@ export default {
                         case "恒邦财险":
                             this.paycodeimg = res.data.paymentLink;
                             break;
-                        case "永诚财险":
-                            this.$nextTick(() => {
-                                this.creatQrCode(res.data.paymentLink);
-                            });
-                            break;
-                        case "安盛财险":
+                        case "安盛天平":
                             let anresult = res.data.paymentLink.replace(/[\r\n]/g, "");
                             let animgBase64 = `data:image/png;base64,${anresult}`;
                             base64ToPath(animgBase64)
@@ -1431,27 +1425,42 @@ export default {
                             }
                             break;
                         case "恒邦财险":
+                        case "安盛天平":
+                        case "中国人寿":
+                        case "众安财险":
+                          this.$api.letter.pychonverifyPayment({
+                            subOrderNo: item.id,
+                          }).then(res=>{
+                            console.log(res)
+                          })
                             if (this.orderInfo.jqpolicyno) {
-                                this.$api.letter.hengbanggetPolicyPrint({
-                                    orderno: this.orderInfo.orderno,
+                                this.$api.letter.pythongetPolicyPrint({
+                                  subOrderNo: item.id,
                                 }).then(res => {
                                     if (res.data) {
                                         this.oldfileList.push({
                                             fileTitle: "交强电子保单",
                                             filename: this.orderInfo.jqpolicyno,
-                                            fileurl: res.data.jqx_policy_url,
+                                            fileurl: res.data.jqxPolicyUrl,
                                         });
                                         this.oldfileList.push({
                                             fileTitle: "交强电子标志",
                                             filename: this.orderInfo.jqpolicyno,
-                                            fileurl: res.data.jqx_flag_url,
+                                            fileurl: res.data.jqxFlagUrl,
                                         });
                                     }
-                                    if (res.data.syx_policy_url) {
+                                    if (res.data.syxPolicyUrl) {
                                         this.oldfileList.push({
                                             fileTitle: "商业电子保单",
                                             filename: this.orderInfo.sypolicyno,
-                                            fileurl: res.data.syx_policy_url,
+                                            fileurl: res.data.syxPolicyUrl,
+                                        });
+                                    }
+                                    if(res.data.jyxPolicyUrl){
+                                      this.oldfileList.push({
+                                            fileTitle: "驾意险保单",
+                                            filename: 'xxxxxxxxxxxxxxxxxxxxxx',
+                                            fileurl: res.data.jyxPolicyUrl,
                                         });
                                     }
                                 })
@@ -1910,4 +1919,4 @@ export default {
     padding: 10px 50px;
     font-size: 14px;
 }
-</style>
+</style>

src/views/ProductManage/CarInsurance/ProductEntry.vue

@@ -164,6 +164,7 @@ export default {
             message: '删除成功',
             type: 'success'
           })
+          this.findPage();
         } else {
           this.$message({
             message: '操作失败',
@@ -172,27 +173,7 @@ export default {
         }
       })
     },
-    handleTableBatchDelete(data) {
-      let params = [];
-      let isFalg = true;
-      for (let i = 0; i < data.params.length; i++) {
-        this.$api.product.productTree(data.params[i].id).then(res => {
-          if (res.data.length > 1) {
-            isFalg = false;
-            this.$message({
-              message: '产品类型(' + res.data[0].id + '-' + res.data[0].name + ')下存在产品，请先清空产品',
-              type: 'info'
-            })
-          }
-          params.push(res.data[0].id);
-          if ((i == (data.params.length - 1)) && isFalg) {
-            this.$api.product.deleteProduct(params).then(data != null ? data.callback : '')
-          }
-        });
-      }
-    },
     //-- tree end-------
-
     // 右侧按钮方法Start
     handleAddProduct() {
       this.operType = "ADD";//'ADD','EDIT'
@@ -200,7 +181,6 @@ export default {
       this.productDialogVisible = true;
     },
     // 右侧按钮方法End
-
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据