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

src/components/Form/ProductCostForm.vue

@@ -500,7 +500,6 @@ export default {
     };
   },
   created() {
-    console.log(this.underwritingRulesForm)
   },
   computed: {
     CarAttr() {

src/http/moudules/user.js

@@ -348,6 +348,15 @@ export const findBackUserList = (data) => {
     data
   })
 }
+
+// 后弦人员管理列表1
+export const findBackUserList1 = (data) => {
+  return axios({
+    url: '/user/findBackUserList1',
+    method: 'post',
+    data
+  })
+}
 // 渠道数据统计
 export const quTeamNum = (data) => {
   return axios({

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -36,6 +36,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否外部订单">
+              <el-select :size="overSize" v-model="queryForm.isExternal" placeholder="请选择" clearable style="width: 100%">
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="是否启用">
               <el-select :size="overSize" v-model="queryForm.validStatus" placeholder="请选择" clearable
@@ -78,7 +86,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="6" :offset="6" class="flex a-end j-c">
+          <el-col :span="6"  class="flex a-end j-c">
             <el-form-item>
               <kt-button label="查询" :size="overSize" type="primary" perms="agreement:input:query" @click="queryEsmInfo" />
               <el-button :disabled="agreementSelectionList.length == 0" label="批量修改" :size="overSize" type="primary"
@@ -380,14 +388,19 @@
             <el-form class="demo-ruleForm wrap-scrollbar scroll-style" :model="attributionform" ref="attributionform"
               :label-width="labelWidth" size="small">
               <el-row>
-                <el-col :span="12">
-                  <el-form-item class="apistyle" label="api类型：">
+                <div class="flex a-c">
+                  <span style="font-weight: bold;">api类型</span>
+                    <div class="apiTypestyle flex j-start a-c " :class="{'apiactive':attributionform.apiType==item.id}"  v-for="(item,index) in apiTypelist" :key="index" @click="apiChange(item.id)">
+                      <img :src="attributionform.apiType==item.id?item.activeImg:item.img" alt="">
+                      <span  style="margin:auto">{{ item.label }}</span>
+                    </div>
+                </div>
+                <!-- <el-form-item class="apistyle" label="api类型：">
                     <el-select class="widths1" v-model="attributionform.apiType" @change="apiChange">
                       <el-option label="API" :value="1"></el-option>
                       <el-option label="python" :value="2"></el-option>
                     </el-select>
-                  </el-form-item>
-                </el-col>
+                  </el-form-item> -->
                 <div v-if="attributionform.apiType == 2">
                   <el-col :span="24">
                     <div>
@@ -1284,7 +1297,8 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="agreementSelectionVisible = false">取 消</el-button>
-        <el-button  style="background: #2D4D89;color: #fff;border-color: #2D4D89;" size="small" type="primary" @click="agreementSelectionSubmit">确 定</el-button>
+        <el-button style="background: #2D4D89;color: #fff;border-color: #2D4D89;" size="small" type="primary"
+          @click="agreementSelectionSubmit">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -1307,6 +1321,22 @@ export default {
   },
   data() {
     return {
+      apiTypelist:[
+        {
+          id:1,
+          label:"API",
+          img:require('@/assets/api.png'),
+          activeImg:require('@/assets/api1.png')
+        },
+        {
+          id:2,
+          label:"python",
+          img:require('@/assets/python.png'),
+          activeImg:require('@/assets/python1.png')
+
+        }
+      ],
+
       agreementActiveInfo: null,
       labelData: '',
       selectTree: [],
@@ -3212,10 +3242,11 @@ export default {
     },
 
     //请求类型change
-    apiChange(e) {
+    apiChange(id) {
+      this.attributionform.apiType=id;
       let params = {
         insCompanyId: this.agreement.partnerCompaniesId,
-        apiType: e,
+        apiType: id,
       };
       this.$api.insCompany.getPtlInsAttributionTemplate(params).then((res) => {
         if (res.code == "200") {
@@ -3923,6 +3954,32 @@ export default {
   overflow-y: auto;
 }
 
+.apiTypestyle {
+  padding: 4px;
+  box-sizing: border-box;
+  margin-left:50px;
+  width: 124px;
+  height: auto;
+  background: #F1F2F6;
+  border-radius: 4px 4px 4px 4px;
+  cursor: pointer;
+  img{
+    width: 28px;
+    height:28px;
+  }
+  >span{
+    // color: rgba(38,38,38,0.8);
+    font-size: 14px;
+  }
+}
+
+.apiactive {
+  background: #fff;
+  border: 1px solid #2D4D89;
+  color:#2D4D89;
+  font-weight: bold;
+}
+
 /deep/ {
 
   .el-dialog__header {

src/views/AgreementManage/CarInsurance/AgreementHistoryRecord.vue

@@ -207,14 +207,21 @@
             <el-form class="demo-ruleForm wrap-scrollbar scroll-style" :model="agreementsHistoryInfo.attributionform"
               ref="attributionform" label-width="160px" size="small">
               <el-row>
-                <el-col :span="12">
+                <div class="flex a-c">
+                  <span style="font-weight: bold;">api类型</span>
+                    <div class="apiTypestyle flex j-start a-c " style="pointer-events: none;" :class="{'apiactive':agreementsHistoryInfo.attributionform.apiType==item.id}"  v-for="(item,index) in apiTypelist" :key="index" >
+                      <img :src="agreementsHistoryInfo.attributionform.apiType==item.id?item.activeImg:item.img" alt="">
+                      <span  style="margin:auto">{{ item.label }}</span>
+                    </div>
+                </div>
+                <!-- <el-col :span="12">
                   <el-form-item class="apistyle" label="api类型：">
                     <el-select disabled class="widths1" v-model="agreementsHistoryInfo.attributionform.apiType">
                       <el-option label="API" :value="1"></el-option>
                       <el-option label="python" :value="2"></el-option>
                     </el-select>
                   </el-form-item>
-                </el-col>
+                </el-col> -->
                 <div v-if="agreementsHistoryInfo.attributionform.apiType == 2">
                   <el-col :span="24">
                     <div>
@@ -279,6 +286,21 @@ export default {
   },
   data() {
     return {
+      apiTypelist:[
+        {
+          id:1,
+          label:"API",
+          img:require('@/assets/api.png'),
+          activeImg:require('@/assets/api1.png')
+        },
+        {
+          id:2,
+          label:"python",
+          img:require('@/assets/python.png'),
+          activeImg:require('@/assets/python1.png')
+
+        }
+      ],
       expandshow: false,
       InsInsuranceKindoptions: [],//险种配置
       supplierType: "1", //协议类型
@@ -636,9 +658,6 @@ export default {
     border-color: #2D4D89 !important;
   }
 
-  .el-button:hover {
-    color: #fff;
-  }
 
   .el-checkbox__input.is-checked+.el-checkbox__label {
     color: #2D4D89 !important;
@@ -686,4 +705,29 @@ export default {
     padding: 10px 20px 10px 10px;
   }
 }
+.apiTypestyle {
+  padding: 4px;
+  box-sizing: border-box;
+  margin-left:50px;
+  width: 124px;
+  height: auto;
+  background: #F1F2F6;
+  border-radius: 4px 4px 4px 4px;
+  cursor: pointer;
+  img{
+    width: 28px;
+    height:28px;
+  }
+  >span{
+    // color: rgba(38,38,38,0.8);
+    font-size: 14px;
+  }
+}
+
+.apiactive {
+  background: #fff;
+  border: 1px solid #2D4D89;
+  color:#2D4D89;
+  font-weight: bold;
+}
 </style>

src/views/AgreementManage/CarInsurance/AgreementNonVehicleConfig.vue

@@ -367,9 +367,6 @@ export default {
     border-color: #2D4D89 !important;
   }
 
-  .el-button:hover {
-    color: #fff;
-  }
 
   .el-checkbox__input.is-checked+.el-checkbox__label {
     color: #2D4D89 !important;

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -369,8 +369,6 @@
     </el-dialog>
     <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="30%">
       <div class="tab-panestyle">
-
-
         <el-form :inline="true" :model="batchUpdateForm" class="demo-form-inline  tab-panecent" style="padding: 20px;">
           <el-form-item label="费用起期：">
             <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsStartDate" type="datetime"
@@ -1411,19 +1409,14 @@ export default {
     checkStartDate1() {
       let tempStartDate = this.batchUpdateForm.costsStartDate;
       let tempEndDate = this.batchUpdateForm.costsEndDate;
-      if (!tempStartDate) {
-        this.batchUpdateForm.costsEndDate = null;
-        this.$message({
-          message: "请先选择费用起期！",
-          type: "error",
-        });
-      }
-      if (!this.validateEndDate(tempStartDate, tempEndDate)) {
-        this.batchUpdateForm.costsEndDate = null;
-        this.$message({
-          message: "费用止期不能小于/等于费用起期！",
-          type: "error",
-        });
+      if (tempStartDate && tempEndDate) {
+        if (!this.validateEndDate(tempStartDate, tempEndDate)) {
+          this.batchUpdateForm.costsEndDate = null;
+          this.$message({
+            message: "费用止期不能小于/等于费用起期！",
+            type: "error",
+          });
+        }
       }
     },
     //产品批量编辑
@@ -1496,8 +1489,8 @@ export default {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
       } else {
-        this.productpageRequest.pageNum = 1;
-        this.productpageRequest.pageSize = 20;
+        // this.productpageRequest.pageNum = 1;
+        // this.productpageRequest.pageSize = 20;
       }
       this.$api.insCompany
         .productCostQuery(this.productpageRequest)
@@ -1619,9 +1612,7 @@ export default {
     border-color: #2D4D89 !important;
   }
 
-  .el-button:hover {
-    color: #fff;
-  }
+
 
   .el-checkbox__input.is-checked+.el-checkbox__label {
     color: #2D4D89 !important;

src/views/AgreementManage/CarInsurance/AgreementUnderwritingRule.vue

@@ -475,9 +475,6 @@ export default {
     border-color: #2D4D89 !important;
   }
 
-  .el-button:hover {
-    color: #fff;
-  }
 
   .el-checkbox__input.is-checked+.el-checkbox__label {
     color: #2D4D89 !important;

src/views/Core/KtCommonTable.vue

@@ -291,6 +291,7 @@
         v-if="showBatchPrint"
       />
       <el-pagination
+        background
         @size-change="handleSizeChange"
         layout="total, sizes, prev, pager, next, jumper"
         @current-change="refreshPageRequest"
@@ -379,7 +380,7 @@ export default {
     },
     buttonDropdown:{
       type: Array,
-      default: [],
+      default: () => [],
     },
     permsButton1: {
       type: String,

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -165,7 +165,7 @@
         <el-button size="small" type="primary" @click="onSubmitAdd('formDataAdd')">保存</el-button>
       </span>
     </el-dialog>
-  <el-dialog  :visible.sync="dialogVisibleradio" width="40%" >
+  <el-dialog  :visible.sync="dialogVisibleradio" width="60%" >
       <el-upload style="margin-bottom:10px" action="#" class="upload-demo" :limit="1" :auto-upload="false"
             :on-change="drivinguploadRadio"  ref="upload3" :file-list="fileListRadio">
             <el-button size="small" type="primary">点击上传</el-button>
@@ -186,6 +186,14 @@
           <el-table-column
             prop="syPolicyno"
             label="商业保单号">
+          </el-table-column>
+            <el-table-column
+            prop="jqOtherCostsProportion"
+            label="交强跟单比例">
+          </el-table-column>
+            <el-table-column
+            prop="syOtherCostsProportion"
+            label="商业跟单比例">
           </el-table-column>
             <el-table-column
             prop="jqOtherCostsPremium"

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -79,7 +79,7 @@ export default {
                         type: "text"
                     },
                     {
-                        prop: "jqPolicyno",
+                        prop: "policyno",
                         label: "交强保单号",
                         type: "text"
                     },

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -125,7 +125,7 @@
         <el-button size="small" type="primary" @click="onSubmitAdd('formDataAdd')">保存</el-button>
       </span>
     </el-dialog>
-  <el-dialog  :visible.sync="dialogVisibleradio" width="40%" >
+  <el-dialog  :visible.sync="dialogVisibleradio" width="50%" >
       <el-upload style="margin-bottom:10px" action="#" class="upload-demo" :limit="1" :auto-upload="false"
             :on-change="drivinguploadRadio"  ref="upload3" :file-list="fileListRadio">
             <el-button size="small" type="primary">点击上传</el-button>
@@ -142,19 +142,15 @@
           <el-table-column
             prop="noPolicyno"
             label="非车保单号">
+          </el-table-column>
+            <el-table-column
+            prop="noOtherCostsProportion"
+            label="非车跟单比例">
           </el-table-column>
           <el-table-column
             prop="noOtherCostsPremium"
             label="非车跟单金额">
           </el-table-column>
-            <el-table-column
-            prop="otherFeevalue"
-            label="跟单金额">
-          </el-table-column>
-            <el-table-column
-            prop="otherFeerate"
-            label="跟单比例">
-          </el-table-column>
         </el-table>
     </el-dialog>
     <el-dialog  :visible.sync="dialogVisibleprogress" width="25%" >

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -309,20 +309,37 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="交强应收比例">
-            <el-input v-model="formDataListAdd.jqReceivableProportion" class="inputType" size="small"></el-input>
+          <el-form-item label="交强手续费比例">
+            <el-input v-model="formDataListAdd.jqSuperviseCostsProportion" class="inputType" size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="商业应收比例">
-            <el-input v-model="formDataListAdd.syReceivableProportion" class="inputType" size="small"></el-input>
+          <el-form-item label="商业手续费比例">
+            <el-input v-model="formDataListAdd.sySuperviseCostsProportion" class="inputType" size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="非车应收比例">
-            <el-input v-model="formDataListAdd.noReceivableProportion" class="inputType" size="small"></el-input>
+          <el-form-item label="非车手续费比例">
+            <el-input v-model="formDataListAdd.noSuperviseCostsProportion" class="inputType" size="small"></el-input>
           </el-form-item>
         </el-col>
+        
+        <el-col :span="8">
+          <el-form-item label="交强跟单比例">
+            <el-input v-model="formDataListAdd.jqOtherCostsProportion" class="inputType" size="small"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="商业跟单比例">
+            <el-input v-model="formDataListAdd.syOtherCostsProportion" class="inputType" size="small"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="非车跟单比例">
+            <el-input v-model="formDataListAdd.noOtherCostsProportion" class="inputType" size="small"></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="8">
           <el-form-item label="应收金额" prop="receivableAmount">
             <el-input v-model="formDataListAdd.receivableAmount" class="inputType" size="small"></el-input>

src/views/PeopleManage/Agent/AgentManage.vue

@@ -199,7 +199,7 @@
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -797,7 +797,7 @@ export default {
       let res = await this.$api.user.getUserDatail(params.userId);
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.userId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/Player/PlayerManage.vue

@@ -176,8 +176,8 @@
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
-                      :value="val.id"
-                      :key="val.id"
+                      :value="val.userId"
+                      :key="val.userId"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -479,7 +479,7 @@ export default {
             this.recommenderOptions = res.data;
           });
           this.$api.user
-          .findBackListByDeptId({ deptId: res.data.sysUser.deptId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -190,8 +190,8 @@
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
-                      :value="val.id"
-                      :key="val.id"
+                      :value="val.userId"
+                      :key="val.userId"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -727,7 +727,7 @@ export default {
       let res = await this.$api.user.getUserDatail(params.userId);
       if (res.code == 200) {
         this.$api.user
-          .findBackListByDeptId({ deptId: res.data.sysUser.deptId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/Staff/StaffManage.vue

@@ -156,7 +156,7 @@
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -628,13 +628,15 @@ export default {
         agentFlag: 0,
         leaderName: this.pageData.leaderId,
         roleId: '22',
+        pageNum: this.pageData.pageNum,
+        pageSize: this.pageData.pageSize
       }
       // .findUserList({
       //     ...this.pageData,
       //     dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
       //   })
       this.$api.user
-        .findBackUserList({ dto, pageNum: this.pageData.pageNum, pageSize: this.pageData.pageSize })
+        .findBackUserList(dto)
         .then((res) => {
           res.data.records.forEach(val => {
             if (val.sex && val.sex !== '' && val.sex !== null) {
@@ -682,7 +684,7 @@ export default {
       let res = await this.$api.user.getUserDatail(params.row.userId)
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -247,7 +247,7 @@
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -776,7 +776,8 @@ export default {
       let res = await this.$api.user.getUserDatail(params.row.userId);
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+          // .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });