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

config/dev.env.js

@@ -5,13 +5,13 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

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

@@ -1,15 +1,6 @@
 <template>
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
-    <!-- <kt-common-table 
-    permsButton3="sys:handlingFees:balance"
-    :data="pageResult" 
-    :columns="columns"  
-    :button3Name="'结算'"
-    @handleButton3="balanceFun"
-    :showBatchDelete="false" 
-    @findPage="findPage" >
-    </kt-common-table> -->
     <templateTable
       :formList="formList"
       :searchData.sync="searchData"
@@ -83,15 +74,77 @@ export default {
     return {
       searchData:{},
         formList:[
-        {
-          label: "订单号:",
-          prop: "orderno",
-          type: "input",
-        },{
+       {
           label: "车牌号:",
           prop: "licenseno",
           type: "input",
         },
+        {
+          label: "被保人:",
+          prop: "userId",
+          type: "input",
+        },
+        {
+          label: "保险公司:",
+          prop: "companyName",
+          type: "company",
+        },
+       
+        {
+          label: "险种:",
+          prop: "riskcode",
+          type: "input",
+        },
+        {
+          label: "保司机构:",
+          prop: "partnerCompaniesName",
+          type: "input",
+        },
+        {
+          label: "协议号:",
+          prop: "agreementId",
+          type: "input",
+        },
+        {
+          label: "交强保单号:",
+          prop: "policyno",
+          type: "input",
+        },
+        {
+          label: "商业保单号:",
+          prop: "syPolicyno",
+          type: "input",
+        }, {
+          label: "非车保单号:",
+          prop: "noPolicyno",
+          type: "input",
+        }, {
+          label: "结算状态:",
+          prop: "handlingFeesStatus",
+          type: "select",
+          options:[
+            {
+              label:'已结算',
+              value:'1'
+            },{
+              label:'未结算',
+              value:'0'
+            }
+          ]
+        }, {
+          label: "签单日期:",
+          prop: "signDate",
+          type: "date",
+        }, {
+          label: "创建日期:",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "结算日期:",
+          prop: "settlementTime",
+          type: "date",
+        },
     ],
     tableConfig:{
         columns: [
@@ -101,23 +154,23 @@ export default {
             type: "text"
           },
           {
-            prop: "noPolicyno",
-            label: "非车保单号",
+            prop: "signDate",
+            label: "签单日期",
             type: "text"
           },
           {
-            prop: "syPolicyno",
-            label: "商业保单号",
+            prop: "licenseno",
+            label: "车牌号",
             type: "text"
           },
           {
-            prop: "policyno",
-            label: "交强保单号",
+            prop: "userId",
+            label: "被保险人",
             type: "text"
           },
           {
-            prop: "deptId",
-            label: "机构",
+            prop: "companyName",
+            label: "保险公司",
             type: "text"
           },
           {
@@ -126,78 +179,121 @@ export default {
             type: "text"
           },
           {
-            prop: "payDate",
-            label: "出单时间",
+            prop: "partnerCompaniesName",
+            label: "保司机构",
             type: "text"
           },
           {
-            prop: "Signdate",
-            label: "签单日期",
+            prop: "agreementId",
+            label: "协议号",
             type: "text"
           },
           {
-            prop: "companyId",
-            label: "保险公司",
+            prop: "policyno",
+            label: "交强保单号",
             type: "text"
           },{
-            prop: "agreementId",
-            label: "协议号",
+            prop: "syPolicyno",
+            label: "商业保单号",
             type: "text"
 
           },{
-            prop: "licenseno",
-            label: "车牌号",
+            prop: "noPolicyno",
+            label: "非车保单号",
             type: "text"
 
+          },{
+            prop: "jqPremium",
+            label: "交强险保费",
+            type: "text"
           },{
             prop: "taxamount",
             label: "车船税",
             type: "text"
           },{
-            prop: "noTaxPremium",
-            label: "不含税保费",
+            prop: "syPremium",
+            label: "商业险保费",
             type: "text"
+
           },{
-            prop: "commissionFeerate",
-            label: "手续费比例",
+            prop: "noPremium",
+            label: "非车保费",
             type: "text"
 
           },{
-            prop: "otherFeerate",
-            label: "其他费用比例",
+            prop: "jqReceivableProportion",
+            label: "交强应收比例",
             type: "text"
 
           },{
-            prop: "commissionFeevalue",
-            label: "手续费金额",
+            prop: "jqSuperviseCostsProportion",
+            label: "交强手续费比例",
             type: "text"
 
           },{
-            prop: "otherFeevalue",
-            label: "其他费用金额",
+            prop: "jqOtherCostsProportion",
+            label: "交强非跟单比例",
             type: "text"
 
           },{
-            prop: "allFeeValue",
-            label: "总费用",
+            prop: "syReceivableProportion",
+            label: "商业应收比例",
+            type: "text"
+
+          },{
+            prop: "sySuperviseCostsProportion",
+            label: "商业手续费比例",
+            type: "text"
+
+          },{
+            prop: "syOtherCostsProportion",
+            label: "商业非跟单比例",
+            type: "text"
+
+          },{
+            prop: "noReceivableProportion",
+            label: "非车应收比例",
             type: "text"
 
           },{
-            prop: "finalFeeValue",
-            label: "已结算费用",
+            prop: "noSuperviseCostsProportion",
+            label: "非车手续费比例",
             type: "text"
 
+          },{
+            prop: "noOtherCostsProportion",
+            label: "非车非跟单比例",
+            type: "text"
+
+          },{
+            prop: "commissionFeevalue",
+            label: "手续费金额",
+            type: "text"
+
+          },{
+            prop: "otherFeevalue",
+            label: "非跟单金额",
+            type: "text"
+
+          },{
+            prop: "allFeeValue",
+            label: "应收金额",
+            type: "text"
           },{
             prop: "createTime",
             label: "创建时间",
             type: "text"
           },{
-            prop: "voucherNumber",
-            label: "凭证号",
+            prop: "settlementTime",
+            label: "结算日期",
+            type: "text"
+          },{
+            prop: "settlementUserId",
+            label: "结算人",
             type: "text"
           },{
-            prop: "contractId",
-            label: "合同号",
+            prop: "updateUserId",
+            label: "修改人",
             type: "text"
           },{
             prop: "handlingFeesStatus",
@@ -216,6 +312,7 @@ export default {
         isPaginationShow:true,
         isShowIndex: true,
         optBtns:[
+          
         {
             type:'primary',
             label:'结算',
@@ -234,7 +331,8 @@ export default {
         pageSize: 20,
         agreementType: '1',
         isNotCar:'1',
-        isOther:'0'
+        isOther:'0',
+        handlingFeesStatus:'0'
       },
       formData:{},
       rules: {

src/views/FinancialManagement/CarInsurance/PlatformSettlement/CarInsuranceBalance.vue → src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceyes.vue

@@ -1,26 +1,18 @@
 <template>
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
-    <!-- <kt-common-table 
-    permsButton3="sys:handlingFees:balance"
-    :data="pageResult" 
-    :columns="columns"  
-    :button3Name="'结算'"
-    @handleButton3="balanceFun"
-    :showBatchDelete="false" 
-    @findPage="findPage" >
-    </kt-common-table> -->
     <templateTable
       :formList="formList"
       :searchData.sync="searchData"
       :tableConfig="tableConfig"
+      :btnGroup="btnGroup"
       :data="tableData"
       @findPage="findPage"
       @handleSearchList="handleSearchList"
       :pagination="pageData"
     >
     </templateTable>
-    <el-dialog
+    <!-- <el-dialog
       v-dialogDrag
       title="结算"
       :visible.sync="dialogVisible"
@@ -40,7 +32,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-form-item label="合同附件"  prop="contractFileId" style="width: 50%">
+                <el-form-item label="银行收款截图"  prop="contractFileId" style="width: 50%">
                     <el-upload
                         v-model="formData.contractFileId"
                         class="upload-demo"
@@ -48,10 +40,8 @@
                         name="DX_00"
                         :show-file-list="false"
                         :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload"
                     >
                     <el-button size="small" type="primary">点击上传</el-button>
-                    <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                     </el-upload>
                     </el-form-item>
             </el-col>
@@ -61,7 +51,7 @@
         <el-button size="small" @click="dialogVisible = false">取 消</el-button>
         <el-button size="small" type="primary" @click="submit('formData')">确 定</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
   <script>
@@ -83,15 +73,83 @@ export default {
     return {
       searchData:{},
         formList:[
-        {
-          label: "订单号:",
-          prop: "orderno",
-          type: "input",
-        },{
+       {
           label: "车牌号:",
           prop: "licenseno",
           type: "input",
         },
+        {
+          label: "被保人:",
+          prop: "userId",
+          type: "input",
+        },
+        {
+          label: "保险公司:",
+          prop: "companyName",
+          type: "company",
+        },
+       
+        {
+          label: "险种:",
+          prop: "riskcode",
+          type: "input",
+        },
+        {
+          label: "保司机构:",
+          prop: "partnerCompaniesName",
+          type: "input",
+        },
+        {
+          label: "协议号:",
+          prop: "agreementId",
+          type: "input",
+        },
+        {
+          label: "交强保单号:",
+          prop: "policyno",
+          type: "input",
+        },
+        {
+          label: "商业保单号:",
+          prop: "syPolicyno",
+          type: "input",
+        }, {
+          label: "非车保单号:",
+          prop: "noPolicyno",
+          type: "input",
+        }, {
+          label: "结算状态:",
+          prop: "handlingFeesStatus",
+          type: "select",
+          options:[
+            {
+              label:'已结算',
+              value:'1'
+            },{
+              label:'未结算',
+              value:'0'
+            }
+          ]
+        }, {
+          label: "签单日期:",
+          prop: "signDate",
+          type: "date",
+        }, {
+          label: "创建日期:",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "结算日期:",
+          prop: "settlementTime",
+          type: "date",
+        },
+    ],
+    btnGroup:[
+      {
+        name:'批量结算',
+        click:(row, index) => {return this.balanceFun(row)},
+      }
     ],
     tableConfig:{
         columns: [
@@ -101,23 +159,23 @@ export default {
             type: "text"
           },
           {
-            prop: "noPolicyno",
-            label: "非车保单号",
+            prop: "signDate",
+            label: "签单日期",
             type: "text"
           },
           {
-            prop: "syPolicyno",
-            label: "商业保单号",
+            prop: "licenseno",
+            label: "车牌号",
             type: "text"
           },
           {
-            prop: "policyno",
-            label: "交强保单号",
+            prop: "userId",
+            label: "被保险人",
             type: "text"
           },
           {
-            prop: "deptId",
-            label: "机构",
+            prop: "companyName",
+            label: "保险公司",
             type: "text"
           },
           {
@@ -126,78 +184,121 @@ export default {
             type: "text"
           },
           {
-            prop: "payDate",
-            label: "出单时间",
+            prop: "partnerCompaniesName",
+            label: "保司机构",
             type: "text"
           },
           {
-            prop: "Signdate",
-            label: "签单日期",
+            prop: "agreementId",
+            label: "协议号",
             type: "text"
           },
           {
-            prop: "companyId",
-            label: "保险公司",
+            prop: "policyno",
+            label: "交强保单号",
             type: "text"
           },{
-            prop: "agreementId",
-            label: "协议号",
+            prop: "syPolicyno",
+            label: "商业保单号",
             type: "text"
 
           },{
-            prop: "licenseno",
-            label: "车牌号",
+            prop: "noPolicyno",
+            label: "非车保单号",
             type: "text"
 
+          },{
+            prop: "jqPremium",
+            label: "交强险保费",
+            type: "text"
           },{
             prop: "taxamount",
             label: "车船税",
             type: "text"
           },{
-            prop: "noTaxPremium",
-            label: "不含税保费",
+            prop: "syPremium",
+            label: "商业险保费",
             type: "text"
+
           },{
-            prop: "commissionFeerate",
-            label: "手续费比例",
+            prop: "noPremium",
+            label: "非车保费",
             type: "text"
 
           },{
-            prop: "otherFeerate",
-            label: "其他费用比例",
+            prop: "jqReceivableProportion",
+            label: "交强应收比例",
             type: "text"
 
           },{
-            prop: "commissionFeevalue",
-            label: "手续费金额",
+            prop: "jqSuperviseCostsProportion",
+            label: "交强手续费比例",
             type: "text"
 
           },{
-            prop: "otherFeevalue",
-            label: "其他费用金额",
+            prop: "jqOtherCostsProportion",
+            label: "交强非跟单比例",
             type: "text"
 
           },{
-            prop: "allFeeValue",
-            label: "总费用",
+            prop: "syReceivableProportion",
+            label: "商业应收比例",
+            type: "text"
+
+          },{
+            prop: "sySuperviseCostsProportion",
+            label: "商业手续费比例",
+            type: "text"
+
+          },{
+            prop: "syOtherCostsProportion",
+            label: "商业非跟单比例",
+            type: "text"
+
+          },{
+            prop: "noReceivableProportion",
+            label: "非车应收比例",
+            type: "text"
+
+          },{
+            prop: "noSuperviseCostsProportion",
+            label: "非车手续费比例",
             type: "text"
 
           },{
-            prop: "finalFeeValue",
-            label: "已结算费用",
+            prop: "noOtherCostsProportion",
+            label: "非车非跟单比例",
             type: "text"
 
+          },{
+            prop: "commissionFeevalue",
+            label: "手续费金额",
+            type: "text"
+
+          },{
+            prop: "otherFeevalue",
+            label: "非跟单金额",
+            type: "text"
+
+          },{
+            prop: "allFeeValue",
+            label: "应收金额",
+            type: "text"
           },{
             prop: "createTime",
             label: "创建时间",
             type: "text"
           },{
-            prop: "voucherNumber",
-            label: "凭证号",
+            prop: "settlementTime",
+            label: "结算日期",
+            type: "text"
+          },{
+            prop: "settlementUserId",
+            label: "结算人",
             type: "text"
           },{
-            prop: "contractId",
-            label: "合同号",
+            prop: "updateUserId",
+            label: "修改人",
             type: "text"
           },{
             prop: "handlingFeesStatus",
@@ -212,6 +313,7 @@ export default {
             }]
           }
         ],
+        isCheckBox:true,
         loading:true,
         isPaginationShow:true,
         isShowIndex: true,
@@ -233,8 +335,9 @@ export default {
         pageNum: 1,
         pageSize: 20,
         agreementType: '1',
-        isNotCar:'0',
-        isOther:'0'
+        isNotCar:'1',
+        isOther:'0',
+        handlingFeesStatus:'1'
       },
       formData:{},
       rules: {
@@ -254,6 +357,9 @@ export default {
     this.findPage();
   },
   methods: {
+    handleSelectionChange(row){
+      console.log(row,33333);
+    },
     // 查询
     handleSearchList() {
       this.findPage();
@@ -278,30 +384,29 @@ export default {
     },
     // 结算
     balanceFun(row){
-        this.formData={
-            voucherNumber:'',
-            contractId:'',
-            contractFileId:'',
-            orderno:row.orderno,
-            policyno:row.policyno,
-            commissionFeevalue:row.commissionFeevalue,
-        }
+        // this.formData={
+        //     voucherNumber:'',
+        //     contractId:'',
+        //     contractFileId:'',
+        //     orderno:row.orderno,
+        //     policyno:row.policyno,
+        //     commissionFeevalue:row.commissionFeevalue,
+        // }
         this.dialogVisible=true
-       
-    },
-     // 上传图片的方法Start
-     beforeAvatarUpload(file) {
-      // var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
-      // const extension = testmsg === "pdf";//限制只能上传pdf文件，否则阻止上传
-      // const extension1 = testmsg === "docx";//限制只能上传pdf文件，否则阻止上传
-      // const extension2 = testmsg === "doc";//限制只能上传pdf文件，否则阻止上传
-      // if (!extension && !extension1 && !extension2 ) {
-      //   this.$message({
-      //     message: "只允许上传PDF和Word文件!",
-      //     type: "warning",
-      //   });
-      // }
-      // return extension && extension1 && extension2
+        // this.$api.task.plyFeebalance({...this.formData,id:this.formData.contractFileId}).then(res => {
+        this.$api.task.plyFeebalance({...this.formData,id:this.formData.contractFileId}).then(res => {
+            if (res.code == "200") {
+                this.$message({
+                    message: res.msg,
+                    type: 'success'
+                })
+                this.dialogVisible=false
+                this.findPage()
+            }
+            else{
+                this.$message.error(res.msg)
+            }
+          })
     },
     //上传影像
     httpRequest(options) {
@@ -322,29 +427,29 @@ export default {
         }
       });
     },
-    submit(formData){
-        this.$refs[formData].validate((valid) => {
-          if (valid) {
-            this.$api.task.plyFeebalance({...this.formData,id:this.formData.contractFileId}).then(res => {
-            if (res.code == "200") {
-                this.$message({
-                    message: res.msg,
-                    type: 'success'
-                })
-                this.dialogVisible=false
-                this.findPage()
-            }
-            else{
-                this.$message.error(res.msg)
-            }
-            });
-            } else {
-                return false;
-            }
-        });
+    // submit(formData){
+    //     this.$refs[formData].validate((valid) => {
+    //       if (valid) {
+    //         this.$api.task.plyFeebalance({...this.formData,id:this.formData.contractFileId}).then(res => {
+    //         if (res.code == "200") {
+    //             this.$message({
+    //                 message: res.msg,
+    //                 type: 'success'
+    //             })
+    //             this.dialogVisible=false
+    //             this.findPage()
+    //         }
+    //         else{
+    //             this.$message.error(res.msg)
+    //         }
+    //         });
+    //         } else {
+    //             return false;
+    //         }
+    //     });
        
         
-    },
+    // },
     tablePageChange(val) {
       this.pageData.pageSize = val;
       this.findPage();

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -282,6 +282,7 @@ export default {
             })
           })
           this.feeOrderNewVo=list;
+          this.isAuditing.adjustFeeFlag=false
           this.adjustFeeFlag=false;
           this.$message({
             type: 'success',
@@ -300,6 +301,9 @@ export default {
     },
     //调整费用
     adjustFee() {
+      // this.$refs.detailsDialog.setBackupVisible(false);
+
+      this.isAuditing.adjustFeeFlag=!this.adjustFeeFlag
       this.adjustFeeFlag = !this.adjustFeeFlag;
       if (!this.adjustFeeFlag) {
         //取消调整时，值置为原始比例

src/views/PeopleManage/Player/RegionPerformanceManage.vue

@@ -66,14 +66,103 @@
           </el-form>
         </el-row>
         <!-- 表格 -->
-        <kt-common-table
+        <el-table
+          v-loading="loading"
+          element-loading-text="拼命加载中..."
+          element-loading-spinner="el-icon-loading"
+          :data="pageRequest.content"
+          :stripe="true"
+          row-key
+          border
+          default-expand-all
+          :header-cell-style="{
+            background: '#F2F7FC',
+            fontWeight: '900',
+            color: '#606266',
+          }"
+        >
+          <el-table-column type="index" label="序号" align="center" ></el-table-column>
+          <el-table-column
+              prop="areaName"
+              label="区域名称"
+              align="center"
+              >
+            </el-table-column>
+          <el-table-column label="主订单" align="center">
+            <el-table-column
+              prop="mainWaitAuditSum"
+              label="待核保"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="mainWaitPaySum"
+              label="已核保待缴费"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="mainAcceptInsuranceSum" 
+              label="已承保"
+              align="center"
+              >
+            </el-table-column>
+              </el-table-column>
+              <el-table-column label="子订单" align="center">
+            <el-table-column
+              prop="subWaitAuditSum"
+              label="待核保"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="subWaitPaySum"
+              label="已核保待缴费"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="subAcceptInsuranceSum"
+              label="已承保"
+              align="center"
+              >
+            </el-table-column>
+              </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="操作">
+            <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>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeList"
+            layout="total, sizes, prev, pager, next, jumper"
+            @current-change="refreshListData"
+            :current-page="pageRequest.pageNum"
+             :page-size="pageRequest.pageSize"
+            :page-sizes="[10,20, 50, 100, 200, 300, 400, 500]"
+            :total="pageRequest.totalSize"
+            style="float: left; margin-left: 20px"
+          ></el-pagination>
+        <!-- <kt-common-table
           v-if="flag"
           v-loading="loading"
           element-loading-text="拼命加载中..."
           element-loading-spinner="el-icon-loading"
           :operationWidth="operationWidth"
           class="ktTable"
-          permsEdit="sys:performanceManage:view"
           ref="dataTable"
           :data="pageRequest"
           :columns="columns"
@@ -86,7 +175,7 @@
           button3Name="人员详情"
           @handleButton3="handlePersonnelDetail"
         >
-        </kt-common-table>
+        </kt-common-table> -->
       </SplitArea>
     </Split>
 
@@ -96,7 +185,7 @@
       :close-on-click-modal="false"
       :before-close="resetForm"
       :visible.sync="detailDialog"
-      width="60%"
+      width="70%"
     >
       <div class="dialog-body">
         <el-table
@@ -105,12 +194,10 @@
           element-loading-spinner="el-icon-loading"
           :data="detailData"
           :stripe="true"
-          style="
-            width: 100%;
-          "
           row-key
           border
           default-expand-all
+          
           :header-cell-style="{
             background: '#F2F7FC',
             fontWeight: '900',
@@ -118,6 +205,54 @@
           }"
         >
           <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
+          <el-table-column v-if="isPersonnel" prop="userName" label="人员姓名" align="center" ></el-table-column>
+          <el-table-column
+             v-else
+              prop="insCompany"
+              label="保险名称"
+              align="center"
+              >
+            </el-table-column>
+          <el-table-column label="主订单" align="center">
+            <el-table-column
+              prop="mainWaitAuditSum"
+              label="待核保"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="mainWaitPaySum"
+              label="已核保待缴费"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="mainAcceptInsuranceSum"
+              label="已承保"
+              align="center"
+              >
+            </el-table-column>
+              </el-table-column>
+              <el-table-column label="子订单" align="center">
+            <el-table-column
+              prop="subWaitAuditSum"
+              label="待核保"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="subWaitPaySum"
+              label="已核保待缴费"
+              align="center"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="subAcceptInsuranceSum"
+              label="已承保"
+              align="center"
+              >
+            </el-table-column>
+              </el-table-column>
           <el-table-column
             v-for="(item, index) in detailColumns"
             :key="index"
@@ -126,7 +261,6 @@
             align="center"
             :label="item.label"
           ></el-table-column>
-          <el-table-column v-if="isPersonnel" prop="userName" label="人员姓名" align="center" ></el-table-column>
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -158,7 +292,6 @@
         isPersonnel:false,
         provinceOptions:[],
         cityOptions:[],
-        flag:false,
      /**Split 开始 */
      leftSplitWidth: 15,
         rightSplitWidth: 85,
@@ -188,7 +321,11 @@
         queryFrom: {
           //查询条件
         },
-        pageRequest: {}, //表格参数
+        pageRequest: {
+          content:[],
+          pageNum: 1,
+          pageSize: 10,
+        }, //表格参数
         formData: {
           // 列表查询条件
           pageNum: 1,
@@ -201,10 +338,7 @@
           pageNum: 1,
           pageSize: 10,
         },
-        columns: [
-          { prop: "areaName", label: "区域名称", type: "text" },
-          { prop: "mainOrderCount", label: "大订单总数", type: "text" },
-          { prop: "subOrderCount", label: "小订单总数", type: "text" },
+        pageColumns: [
           { prop: "quoteNum", label: "报价次数", type: "text" },
           { prop: "submitNum", label: "提交核保次数", type: "text" },
           { prop: "hasInsuredNum", label: "已承保数量", type: "text" },
@@ -219,11 +353,6 @@
         ],
         detailData:[],
         detailColumns: [
-        {
-          prop: "insCompany",
-          label: "保险公司",
-          type: "text",
-        },
         {
           prop: "quoteNum",
           label: "报价次数",
@@ -260,6 +389,7 @@
     },
     created() {
          this.findLeftTreeData(); // 获取机构树的数据
+         this.findPage(); // 
          this.$api.dept.queryTree().then((res) => {
             if(res.code==200){
               this.formData.areaCode='140000'
@@ -288,13 +418,11 @@
         if(data.code==200){
           this.ztreeNodes = data.data;
           this.userId=data.data[0].id
-          this.flag=true
         }
         else{
           this.$message.error(data.msg)
           this.ztreeNodes=[]
           this.userId=''
-          this.flag=true
         }
      },
       onZTreeClick: function (evt, treeId, treeNode) {
@@ -325,6 +453,16 @@
     handleSizeChange(pageSize) {
       this.detailParams.pageSize = pageSize;
       this.getDetailData(2)
+    },
+        // 列表换页刷新
+        refreshListData: function (pageNum) {
+      this.pageRequest.pageNum = pageNum;
+      this.findPage()
+    },
+    // 每页条数发生改变
+    handleSizeList(pageSize) {
+      this.pageRequest.pageSize = pageSize;
+      this.findPage()
     },
     //取消隐藏弹框
     resetForm() {
@@ -334,13 +472,13 @@
     },
     //查看详情
     handleDetail(index) {
-      this.detailParams.areaCode = index.row.areaCode;
+      this.detailParams.areaCode = index.areaCode;
       this.detailDialog = true;
       this.getDetailData(1)
       this.isPersonnel=false
     },
     handlePersonnelDetail(index) {
-      this.detailParams.areaCode = index.row.areaCode;
+      this.detailParams.areaCode = index.areaCode;
       this.detailDialog = true;
       this.getDetailData(2)
       this.isPersonnel=true
@@ -362,11 +500,7 @@
       });
     },
       //获取页面数据
-      async  findPage(data) {
-        if (data && data.pageRequest) {
-          this.formData.pageNum = data.pageRequest.pageNum;
-          this.formData.pageSize = data.pageRequest.pageSize;
-        }   
+      async  findPage() {
         let areaCode=''
           this.formData.level=''
           if(this.formData.cityCode){

src/views/Task/daikeComponents/KtLetter.vue

@@ -1280,7 +1280,17 @@
                     <i style="color:red" class="el-icon-time"></i>
                   </el-tooltip>
                 </span>
-
+              <div>
+                <span v-show="reslistitem.result.JqExportFee">
+                    交强出口费用<span>{{ reslistitem.result.JqExportFee }}</span>
+                </span>
+                <span v-show="reslistitem.result.syExportFee ">
+                  商业出口费用<span>{{ reslistitem.result.syExportFee  }}</span>
+                </span>
+                <span v-show="reslistitem.result.noExportFee">
+                  非车出口费用<span> {{ reslistitem.result.noExportFee }}</span>
+                </span>
+              </div>
                 <div>
                   <span v-if="reslistitem.namesimple == '永诚财险'">
                     光博分：
@@ -1346,6 +1356,7 @@
                   <span v-if="reslistitem.result.iszdj && reslistitem.result.iszdj=='0'">假单交</span>
                 </div>
               </div>
+              
               <div style="text-align: right;">
                 <div style="color:#2D4D89; ">
                   <el-tooltip class="item" effect="dark" content="上年信息" placement="top">
@@ -3528,7 +3539,6 @@ export default {
         limitLoad: "", //核定载质量
         caryear: null, //年款
         cimodelclass: "A0", //车辆种类
-        powertype: "汽油", //
         energyType: "0", //能源类型
         enginedesc: "", //排量
         registerDate: "", //注册日期
@@ -8264,10 +8274,11 @@ export default {
       this.carInfo.modelCode = row.modelCode; //型号代码
       this.carInfo.familyName = row.series; //系列
       this.carInfo.enginedesc = row.displacement; //排量
-      this.carInfo.powertype = row.fuelType; //燃油种类
+      this.carInfo.energyType= row.energyTypes
       this.carInfo.powerScale = row.powerScale; //功率
       this.chexingdialogVisible = false;
       this.sbdmdialogVisible = false;
+
     },
     //是否过户事件
     transferFlagChange(e) {