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

src/http/moudules/insCompany.js

@@ -374,9 +374,9 @@ export const productCostHistoryDetails = (ruleId) => {
   })
 }
 //获取因子表单项
-export const productConfigItem = () => {
+export const productConfigItem = (data) => {
   return axios({
-    url: '/plt/new/agreement/attr/list',
+    url: '/plt/new/agreement/attr/listByCompanyId?companyId='+data,
     method: "get",
   })
 }

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -471,10 +471,11 @@
         <el-form ref="productCostForm" :model="productCostForm" label-width="130px" :size="overSize"
           :rules="costformRules">
           <el-row>
-            <el-col :span="20" :offset="2" v-if="productCostAddDialogType=='edit'">
+            <el-col :span="20" :offset="2" v-if="productCostAddDialogType == 'edit'">
               <el-form-item label="产品">
                 <el-select v-model="productUpdateObj.productId" placeholder="请选择" @change="productUpdateChange">
-                  <el-option v-for="(item,index) in productsTypeoptions" :label="item.dictTag" :value="item.dictValue" :key="index" >
+                  <el-option v-for="(item, index) in productsTypeoptions" :label="item.dictTag" :value="item.dictValue"
+                    :key="index">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -1251,9 +1252,10 @@ export default {
   },
   data() {
     return {
-      productUpdateObj:{
-        productId:"",
-        productName:"",
+      insuranceCompanyId: "",
+      productUpdateObj: {
+        productId: "",
+        productName: "",
       },
       batchCostEndDate: '',
       batchCostIds: [],
@@ -1906,7 +1908,7 @@ export default {
         costStartDate: "",
         costsEndDate: "",
         costsDescription: "",
-        isEffective:"",
+        isEffective: "",
         pageNum: 1,
         pageSize: 20,
       },
@@ -1915,7 +1917,7 @@ export default {
         agreementId: "",
         costStartDate: "",
         costsEndDate: "",
-        isEffective:"",
+        isEffective: "",
         costsDescription: "",
         pageNum: 1,
         pageSize: 20,
@@ -2270,7 +2272,6 @@ export default {
       })
       this.areanumberplateList = data;
     });
-    this.getFactorTemplate();
     this.defaultattributionform = JSON.parse(
       JSON.stringify(this.attributionform)
     );
@@ -2283,8 +2284,8 @@ export default {
   methods: {
     productUpdateChange(e) {
       let name = this.productsTypeoptions.find(item => item.dictValue == e).dictTag;
-      this.productUpdateObj.productName=name;
-      this.productCostForm.productName=[name];
+      this.productUpdateObj.productName = name;
+      this.productCostForm.productName = [name];
     },
     accidentAddRule() {
       this.nonVehicleRuledialogVisible = true;
@@ -2545,9 +2546,9 @@ export default {
             }
             return val;
           })
-            this.dynamicFormArray = obj.costsAttrLinkList;
-            this.productCostForm = obj;
-            // this.productUpdateObj.productId= this.productCostForm.productId;
+          this.dynamicFormArray = obj.costsAttrLinkList;
+          this.productCostForm = obj;
+          // this.productUpdateObj.productId= this.productCostForm.productId;
           // this.productUpdateObj.productName= this.productCostForm.productName;
           this.productCostForm.productId = [this.productCostForm.productId]
           this.productCostForm.productName = [this.productCostForm.productName]
@@ -2601,7 +2602,7 @@ export default {
 
     },
     getFactorTemplate() {
-      this.$api.insCompany.productConfigItem().then(res => {
+      this.$api.insCompany.productConfigItem(this.insuranceCompanyId).then(res => {
         if (res.code == '200') {
           let data = res.data;
           data.map(ele => {
@@ -2697,7 +2698,7 @@ export default {
       if (data && data.pageRequest) {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productpageRequest.pageNum = 1;
         this.productpageRequest.pageSize = 20;
       }
@@ -2713,7 +2714,7 @@ export default {
       if (data && data.pageRequest) {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productpageRequest.pageNum = 1;
         this.productpageRequest.pageSize = 20;
       }
@@ -2728,7 +2729,7 @@ export default {
       if (data && data.pageRequest) {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productpageRequest.pageNum = 1;
         this.productpageRequest.pageSize = 20;
       }
@@ -2743,7 +2744,7 @@ export default {
       if (data && data.pageRequest) {
         this.productcopyItemPageRequest.pageNum = data.pageRequest.pageNum;
         this.productcopyItemPageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productcopyItemPageRequest.pageNum = 1;
         this.productcopyItemPageRequest.pageSize = 20;
       }
@@ -2757,7 +2758,7 @@ export default {
       if (data && data.pageRequest) {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productpageRequest.pageNum = 1;
         this.productpageRequest.pageSize = 20;
       }
@@ -2772,7 +2773,7 @@ export default {
       if (data && data.pageRequest) {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productpageRequest.pageNum = 1;
         this.productpageRequest.pageSize = 20;
       }
@@ -2785,9 +2786,11 @@ export default {
     },
     //产品费用
     productCost(index, row) {
+      this.insuranceCompanyId = row.insuranceCompanyId;
       this.agreementId = row.id;
       this.productCostForm.agreementId = row.id;
       this.productCostVehicleFactorVisible = true;
+      this.getFactorTemplate();
       this.productCostFindPage();
     },
     //产品历史记录
@@ -2801,9 +2804,11 @@ export default {
     },
     //承保规则
     underwritingRulesButton(index, row) {
+      this.insuranceCompanyId = row.insuranceCompanyId;
       this.agreementId = row.id;
       this.underwritingRulesForm.agreementId = row.id;
       this.underwritingRulesVehicleFactorVisible = true;
+      this.getFactorTemplate();
       this.underwritingRulesFindPage();
     },
     //添加承保规则
@@ -2911,8 +2916,8 @@ export default {
           this.dynamicFormArray = obj.costsAttrLinks;
 
           this.productCostForm = obj;
-          this.productUpdateObj.productId= this.productCostForm.productId;
-          this.productUpdateObj.productName= this.productCostForm.productName;
+          this.productUpdateObj.productId = this.productCostForm.productId;
+          this.productUpdateObj.productName = this.productCostForm.productName;
           this.productCostForm.productId = [this.productCostForm.productId]
           this.productCostForm.productName = [this.productCostForm.productName]
           console.log(this.productCostForm)
@@ -3215,9 +3220,9 @@ export default {
                 }
               });
           } else {
-            if(this.productUpdateObj.productId){
-              this.productCostForm.productId=[this.productUpdateObj.productId];
-              this.productCostForm.productName=[this.productUpdateObj.productName];
+            if (this.productUpdateObj.productId) {
+              this.productCostForm.productId = [this.productUpdateObj.productId];
+              this.productCostForm.productName = [this.productUpdateObj.productName];
             }
             this.$api.insCompany
               .productCostUpdate(this.productCostForm)

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -4,7 +4,8 @@
     <!-- 模板内容 -->
     <el-form :inline="true" size="small" :model="productpageRequest" class="demo-form-inline" label-width="100px">
       <el-form-item label="保险公司">
-        <el-select size="small" clearable filterable v-model="productpageRequest.companyId" :placeholder="'请输入'" @change="refreshAgreement">
+        <el-select size="small" clearable filterable v-model="productpageRequest.companyId" :placeholder="'请输入'"
+          @change="refreshAgreement">
           <el-option v-for="(s, i) in InsCompanyList" :key="i" :label="s.name" :value="s.id"></el-option>
         </el-select>
       </el-form-item>
@@ -16,7 +17,7 @@
       </el-form-item>
 
       <el-form-item label="产品名称">
-        <el-select size="small" clearable v-model="productpageRequest.productCode" multiple  :placeholder="'请输入'">
+        <el-select size="small" clearable v-model="productpageRequest.productCode" multiple :placeholder="'请输入'">
           <el-option v-for="(s, i) in insuranceRepertoire" :key="i" :label="s.dictTag" :value="s.dictValue"></el-option>
         </el-select>
       </el-form-item>
@@ -34,16 +35,15 @@
         </el-select>
       </el-form-item>
       <el-form-item label="费用描述">
-          <el-input v-model="productpageRequest.costsDescription" clearable placeholder="费用描述"></el-input>
-        </el-form-item>
+        <el-input v-model="productpageRequest.costsDescription" clearable placeholder="费用描述"></el-input>
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="costPage">查询</el-button>
+        <el-button type="primary" @click="costQuery">查询</el-button>
       </el-form-item>
     </el-form>
-    <kt-common-table  :SerialShow="false" :operationWidth="150" :showOperation="true" button2Name="查看"
-       permsButton2="agreement:input:productCost" @handleButton2="viewDetails"
-       :showBatchDelete="true"   deleteName="批量审核" @handleDelete="handleDelete"  :data="costAudit" :columns="costColumns"
-      @findPage="costPage">
+    <kt-common-table :SerialShow="false" :operationWidth="150" :showOperation="true" button2Name="查看"
+      permsButton2="agreement:input:productCost" @handleButton2="viewDetails" :showBatchDelete="true" deleteName="批量审核"
+      @handleDelete="handleDelete" :data="costAudit" :columns="costColumns" @findPage="costPage">
     </kt-common-table>
     <el-dialog title="详情" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh">
       <div class="productstitle flex j-s" style="margin-top: 10px">
@@ -277,15 +277,15 @@ export default {
         pageSize: 20,
         companyId: "",
         agreementId: "",
-        costsDescription:'',
+        costsDescription: '',
         productCode: [],
       },
       //保险公司列表
-      InsCompanyList:[],
+      InsCompanyList: [],
       //协议列表
-      agreementList:[],
+      agreementList: [],
       //产品代码列表
-      insuranceRepertoire:[],
+      insuranceRepertoire: [],
       productCostAddVehicleFactorVisible: false, //产品费用录入    显示/隐藏
       productCostFactorDialogVisible: false,
       //操作符字典
@@ -337,7 +337,7 @@ export default {
 
       costColumns: [
         { prop: "productName", label: " 产品名称", minWidth: 120 },
-        { prop: "agreementId", label: " 协议名称", minWidth: 160,  formatter: this.agreementIdFormatter},
+        { prop: "agreementId", label: " 协议名称", minWidth: 160, formatter: this.agreementIdFormatter },
         { prop: "costsStartDate", label: "费用起期", minWidth: 160 },
         { prop: "costsEndDate", label: "费用止期", minWidth: 160 },
         { prop: "costsDescription", label: "费用描述", minWidth: 220 },
@@ -474,16 +474,16 @@ export default {
         },
         { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
       ],
-      batchSizeList:[],
-      isBatch:false,
-      allAgreementList:[],
+      batchSizeList: [],
+      isBatch: false,
+      allAgreementList: [],
     }
   },
   // 生命周期函数
   created() {
-      this.$api.task.findPtlAgreementList().then((res) => {
-        this.allAgreementList=res.data;
-      });
+    this.$api.task.findPtlAgreementList().then((res) => {
+      this.allAgreementList = res.data;
+    });
     this.getFactorTemplate();
     //获取操作符
     this.$api.dict.findPage(this.operator).then(res => {
@@ -507,15 +507,18 @@ export default {
   },
   // 方法函数
   methods: {
-    handleDelete(ids){
-      this.isBatch=true
+    costQuery() {
+      this.costPage();
+    },
+    handleDelete(ids) {
+      this.isBatch = true
       this.batchSizeList = ids;
       this.productCostAddVehicleFactorVisible = true;
-  },
+    },
     approval() {
-      let data={
-        costsIds: this.isBatch ?this.batchSizeList :[this.productCostForm.id],
-        isAudit:'1',
+      let data = {
+        costsIds: this.isBatch ? this.batchSizeList : [this.productCostForm.id],
+        isAudit: '1',
       }
 
       this.$api.insCompany.auditBatch(data).then((res) => {
@@ -536,9 +539,9 @@ export default {
 
     },
     //保险公司选择后刷新协议列表
-    refreshAgreement(e){
+    refreshAgreement(e) {
       let thef = this;
-      this.$api.insCompany.findAgreementByCompanyId({partnerCompaniesId:e}).then((res)=>{
+      this.$api.insCompany.findAgreementByCompanyId({ partnerCompaniesId: e }).then((res) => {
         if (res.data) {
           //清空搜索参数
           thef.productpageRequest.agreementId = '';
@@ -547,16 +550,16 @@ export default {
       })
     },
     rejectionReason() {
-      if(!this.reject){
+      if (!this.reject) {
         return this.$message({
           message: '驳回操作，请说明驳回原因',
           type: 'warning'
         });
       }
-      let data={
-        costsIds: this.isBatch ?this.batchSizeList :[this.productCostForm.id],
-        isAudit:'2',
-          reject:this.reject
+      let data = {
+        costsIds: this.isBatch ? this.batchSizeList : [this.productCostForm.id],
+        isAudit: '2',
+        reject: this.reject
       }
       this.$api.insCompany.auditBatch(data).then((res) => {
         if (res.code == '200') {
@@ -564,7 +567,7 @@ export default {
           this.costPage();
           this.$message({
             type: 'success',
-            message:"已驳回",
+            message: "已驳回",
           });
         } else {
           this.$message({
@@ -598,7 +601,7 @@ export default {
     },
     //查看详情
     viewDetails({ row, column }) {
-      this.isBatch=false
+      this.isBatch = false
       this.$api.insCompany.productcostFactorQuery(row.id).then((res) => {
         if (res.code == '200') {
           let obj = Object.assign({}, res.data);
@@ -632,27 +635,30 @@ export default {
       if (data && data.pageRequest) {
         this.productpageRequest.pageNum = data.pageRequest.pageNum;
         this.productpageRequest.pageSize = data.pageRequest.pageSize;
-      }else{
+      } else {
         this.productpageRequest.pageNum = 1;
         this.productpageRequest.pageSize = 20;
       }
       if (this.date != null) {
         this.productpageRequest.createStartTime = this.date[0];
         this.productpageRequest.createEndTime = this.date[1];
+      } else {
+        this.productpageRequest.createStartTime = "";
+        this.productpageRequest.createEndTime = "";
       }
       this.$api.insCompany
         .getCostsAuditList(this.productpageRequest)
         .then((res) => {
-          if(res.code==200){
+          if (res.code == 200) {
             this.costAudit = res.data;
           }
-          else{
+          else {
             this.$message.error(res.msg)
           }
         });
     },
-    agreementIdFormatter(row, column){
-      return  this.allAgreementList.find(val=>val.id==row.agreementId).agreementName;
+    agreementIdFormatter(row, column) {
+      return this.allAgreementList.find(val => val.id == row.agreementId).agreementName;
     }
   },
   // 计算属性

src/views/PeopleManage/Player/RegionPerformanceManage.vue

@@ -41,7 +41,7 @@
           </el-form>
         </el-row>
         <!-- 表格 -->
-        <el-table v-loading="loading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+        <el-table v-loading="loading" element-loading-text="拼命加载中..." height="700" element-loading-spinner="el-icon-loading"
           :data="pageRequest.content" :stripe="true" row-key border default-expand-all :header-cell-style="{
             background: '#F2F7FC',
             fontWeight: '900',
@@ -68,7 +68,7 @@
           </el-table-column>
           <el-table-column v-for="(item, index) in pageColumns" :key="index" :min-width="item.minWidth" :prop="item.prop"
             align="center" :label="item.label"></el-table-column>
-          <el-table-column width="130" align="center" label="操作">
+          <el-table-column width="130" align="center" label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button @click="handleDetail(scope.row)" type="text" size="small">详情</el-button>
               <el-button @click="handlePersonnelDetail(scope.row)" type="text" size="small">人员详情</el-button>
@@ -133,11 +133,11 @@
           </el-table-column>
           <el-table-column v-for="(item, index) in detailColumns" :key="index" :min-width="item.minWidth"
             :prop="item.prop" align="center" :label="item.label"></el-table-column>
-            <el-table-column label="操作"  v-if="isPersonnel">
-                    <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
-                    </template>
-                </el-table-column>
+          <el-table-column label="操作" v-if="isPersonnel">
+            <template slot-scope="scope">
+              <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -158,7 +158,7 @@ import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import RegionTable from "../RegionTable.vue"; // 按钮权限组件
 export default {
   name: "InvoiceInformation",
-  components: { KtCommonTable,RegionTable },
+  components: { KtCommonTable, RegionTable },
   data() {
     return {
       isPersonnel: false,
@@ -210,16 +210,17 @@ export default {
         pageSize: 10,
       },
       pageColumns: [
-        { prop: "quoteNum", label: "报价次数", type: "text" },
-        { prop: "submitNum", label: "提交核保次数", type: "text" },
-        { prop: "hasInsuredNum", label: "已承保数量", type: "text" },
-        { prop: "taxaMountSum", label: "车船税", type: "text" },
-        { prop: "jqPremiumSum", label: "交强险费用", type: "text" },
-        { prop: "syPremiumSum", label: "商业保费", type: "text" },
+        { prop: "quoteNum", label: "报价次数", type: "text",minWidth:120, },
+        { prop: "submitNum", label: "提交核保次数", type: "text",minWidth:120, },
+        { prop: "hasInsuredNum", label: "已承保数量", type: "text" ,minWidth:120,},
+        { prop: "taxaMountSum", label: "车船税", type: "text" ,minWidth:120,},
+        { prop: "jqPremiumSum", label: "交强险费用", type: "text",minWidth:120, },
+        { prop: "syPremiumSum", label: "商业保费", type: "text",minWidth:120, },
         {
           prop: "totalSumpremium",
           label: "总承保保费总数",
           type: "text",
+          minWidth:120,
         },
       ],
       detailData: [],
@@ -261,7 +262,7 @@ export default {
   },
   created() {
     this.findLeftTreeData(); // 获取机构树的数据
-    this.findPage(); // 
+    this.findPage(); //
     this.$api.dept.queryTree().then((res) => {
       if (res.code == 200) {
         this.formData.areaCode = '140000'
@@ -373,12 +374,12 @@ export default {
         }
       });
     },
-    handleClick(row){
-      this.$refs.regionTable.detaiList={
-        userId:row.userId,
-        createTimeStart:this.formData.createTimeStart,
-        createTimeEnd:this.formData.createTimeEnd,
-        quMarks:'3'
+    handleClick(row) {
+      this.$refs.regionTable.detaiList = {
+        userId: row.userId,
+        createTimeStart: this.formData.createTimeStart,
+        createTimeEnd: this.formData.createTimeEnd,
+        quMarks: '3'
       }
       this.$refs.regionTable.open()
       this.$refs.regionTable.getDetailData()
@@ -417,6 +418,5 @@ export default {
   },
 };
 </script>
-        
+
 <style scoped></style>
-