Просмотр исходного кода

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

@dongkboy 2 лет назад
Родитель
Сommit
b3298a057d

+ 2 - 2
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/"',//

+ 8 - 1
src/components/TemplateTable/index.vue

@@ -73,7 +73,7 @@
       </el-form-item> -->
     </el-form>
 
-    <!--表格-->
+    <slot v-if="custom" show-overflow-tooltip ></slot>
 
     <el-table :data="data" border size="small" style="width: 100%" :height="tableHeight" v-loading="tableConfig.loading"
       element-loading-text="数据加载中" element-loading-spinner="el-icon-loading" @selection-change="handleSelectionChange"
@@ -162,6 +162,12 @@ export default {
     KtButton,
   },
   props: {
+    custom: {
+      type: Boolean,
+      default: () => {
+        return false;
+      }
+    },
     formList: {
       type: Array,
       default: () => {
@@ -319,4 +325,5 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
 </style>

+ 22 - 0
src/http/moudules/task.js

@@ -1100,6 +1100,28 @@ export const findAllTree = () => {
     method: "get",
   })
 }
+// 平台结算-手续费合计
+export const totalAmount = (data) => {
+  return axios({
+    url: "/fnc/plyFee/totalAmount",
+    method: "post",
+    data
+  })
+}
+export const batchPinBalance = (data) => {
+  return axios({
+    url: "/fnc/plyFee/batchPinBalance",
+    method: "put",
+    data
+  })
+}
+export const totalPinAmount = (data) => {
+  return axios({
+    url: "/fnc/plyFee/totalPinAmount",
+    method: "post",
+    data
+  })
+}
 
 
 //省市区门店数据获取

+ 16 - 1
src/http/moudules/user.js

@@ -388,7 +388,22 @@ export const quUserNumList = (data) => {
     data
   })
 }
-
+// 人员管理-个代管理-区域业绩管理
+export const quAgentAreaAdmin = (data) => {
+  return axios({
+    url: '/user/quAgentAreaAdmin',
+    method: 'post',
+    data
+  })
+}
+// 人员管理-个代管理-区域业绩管理详情接口
+export const quAgentAreaAdminDetail = (data) => {
+  return axios({
+    url: '/user/quAgentAreaAdminDetail',
+    method: 'post',
+    data
+  })
+}
 // 区域业绩管理列详情接口
 export const quUserNumDetail = (data) => {
   return axios({

+ 536 - 0
src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -0,0 +1,536 @@
+<template>
+  <!--布局容器-->
+  <div class="container" style="width: 99%; margin-top: 0px">
+    <templateTable
+      :formList="formList"
+      custom
+      :searchData.sync="searchData"
+      :tableConfig="tableConfig"
+      :btnGroup="btnGroup"
+      :data="tableData"
+      @findPage="findPage"
+      @handleSearchList="handleSearchList"
+      :pagination="pageData"
+    >
+    <div v-if="!Object.keys(moneyList).length === 0">
+    <el-row class="customStyle" >
+      <el-col :span="4">预收金额:{{moneyList.totalFeevalue}}</el-col>
+      <el-col :span="4">手续费金额:{{moneyList.commissionFeevalue}}</el-col>
+      <el-col :span="4">跟单费金额:{{moneyList.otherFeevalue}}</el-col>
+      <el-col :span="4">未结算金额:{{moneyList.readyTotalFeevalue}}</el-col>
+      <el-col :span="4">未结算手续费金额:{{moneyList.readyCommissionFeevalue}}</el-col>
+      <el-col :span="4">未结算跟单金额:{{moneyList.readyOtherFeevalue}}</el-col>
+    </el-row>
+  </div>
+    <template slot="data">
+      <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+    </template>
+    </templateTable>
+    <el-dialog
+      v-dialogDrag
+      title="结算"
+      :visible.sync="dialogVisible"
+      width="50%"
+      @close="closdialogVisible"
+    >
+    <el-date-picker
+      type="date"
+      size="small"
+      v-model="dataValue"
+      @change="selectDate"
+      placeholder="选择日期">
+    </el-date-picker>
+    <el-table
+      v-if="dataValue"
+      :data="tableDataselect"
+      class="dataTable"
+      ref="dataTable"
+      @selection-change="handleSelectionChange"
+      style="width: 100%">
+      <el-table-column type="selection"  align="center" />
+      <el-table-column
+        prop="companyName"
+        label="保险公司名称"
+       >
+      </el-table-column>
+      <el-table-column
+        prop="companyId"
+        label="保险公司id"
+       >
+      </el-table-column>
+      <el-table-column
+        prop="totalFeevalue"
+        label="预收金额">
+      </el-table-column>
+      <el-table-column
+        prop="commissionFeevalue"
+        label="手续费金额">
+      </el-table-column>
+      <el-table-column
+        prop="otherFeevalue"
+        label="跟单费金额">
+      </el-table-column>
+      <el-table-column
+        prop="readyTotalFeevalue"
+        label="未结算金额">
+      </el-table-column>
+      <el-table-column
+        prop="readyCommissionFeevalue"
+        label="未结算手续费金额">
+      </el-table-column>
+      <el-table-column
+        prop="readyOtherFeevalue"
+        label="未结算跟单金额">
+      </el-table-column>
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+  <script>
+import KtCommonTable from "@/views/Core/KtCommonTable.vue";//表格组件
+import templateTable from '@/components/TemplateTable/index.vue'
+import { mapState } from 'vuex'
+import yearMonthYay from './yearMonthYay.vue'
+
+export default {
+  name: "baosi",
+  components: { KtCommonTable,templateTable,yearMonthYay },
+  created() {
+  },
+  computed: {
+    ...mapState({
+      perms: state =>state.user.perms
+    })
+  },
+  data() {
+    return {
+      moneyList:{},
+      searchData:{},
+      tableDataselect:[],
+        formList:[
+       {
+          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: "settlementTime",
+          type: "date",
+        },
+        {
+          label: "年月日",
+          name: "data",
+          type: "slot",
+        },
+        {
+          label: "签单日期",
+          prop: "signDate",
+          type: "datePicker",
+        },
+    ],
+    btnGroup:[
+      {
+        name:'批量结算',
+        click:(row, index) => {return this.balanceFunPro()},
+      }
+    ],
+    tableConfig:{
+        columns: [
+          {
+            prop: "orderno",
+            label: "子订单号",
+            type: "text"
+          },
+          {
+            prop: "signDate",
+            label: "签单日期",
+            type: "text"
+          },
+          {
+            prop: "licenseno",
+            label: "车牌号",
+            type: "text"
+          },
+          {
+            prop: "userId",
+            label: "被保险人",
+            type: "text"
+          },
+          {
+            prop: "companyName",
+            label: "保险公司",
+            type: "text"
+          },
+          {
+            prop: "riskcode",
+            label: "险种",
+            type: "text"
+          },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司机构",
+            type: "text"
+          },
+          {
+            prop: "agreementId",
+            label: "协议号",
+            type: "text"
+          },
+          {
+            prop: "policyno",
+            label: "交强保单号",
+            type: "text"
+          },{
+            prop: "syPolicyno",
+            label: "商业保单号",
+            type: "text"
+
+          },{
+            prop: "noPolicyno",
+            label: "非车保单号",
+            type: "text"
+
+          },{
+            prop: "jqPremium",
+            label: "交强险保费",
+            type: "text"
+          },{
+            prop: "taxamount",
+            label: "车船税",
+            type: "text"
+          },{
+            prop: "syPremium",
+            label: "商业险保费",
+            type: "text"
+
+          },{
+            prop: "noPremium",
+            label: "非车保费",
+            type: "text"
+
+          },{
+            prop: "jqReceivableProportion",
+            label: "交强应收比例",
+            type: "text"
+
+          },{
+            prop: "jqSuperviseCostsProportion",
+            label: "交强手续费比例",
+            type: "text"
+
+          },{
+            prop: "jqOtherCostsProportion",
+            label: "交强非跟单比例",
+            type: "text"
+
+          },{
+            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: "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: "settlementTime",
+            label: "结算日期",
+            type: "text"
+          },{
+            prop: "settlementUserId",
+            label: "结算人",
+            type: "text"
+          },{
+            prop: "updateUserId",
+            label: "修改人",
+            type: "text"
+          },{
+            prop: "handlingFeesStatus",
+            label: "手续费结算状态",
+            type: "statMap",
+            options:[{
+              value:'1',
+              label:'已结算'
+            },{
+              value:'0',
+              label:'未结算'
+            }]
+          }
+        ],
+        isCheckBox:true,
+        loading:true,
+        isPaginationShow:true,
+        isShowIndex: true,
+        // optBtns:[
+        // {
+        //     type:'primary',
+        //     label:'结算',
+        //     hide:(row)=>{
+        //       return row.handlingFeesStatus == 0?true:false
+        //     },
+        //     click:(row, index) => {return this.balanceFun(row)},
+        // }
+        // ]
+    },
+    tableData: [],
+      formData: {},
+      dialogVisible: false,
+      pageData:{
+        pageNum: 1,
+        pageSize: 20,
+        agreementType: '1',
+        isNotCar:'0',
+        isOther:'0',
+        handlingFeesStatus:'0'
+      },
+      dataValue:'',
+      selectionOption:[]
+    };
+  },
+  created(){
+    this.findPage();
+  },
+  
+  methods: {
+    getYearData(val){
+      this.formData.year=val
+    },
+    getMonthData(val){
+      this.formData.month=val
+    },
+    getDayData(val){
+      this.formData.day=val
+    },
+    handleSelectionChange(selection){
+      if (selection.length > 1) {
+        selection.shift();
+        this.$refs.dataTable.clearSelection();
+        this.$refs.dataTable.toggleRowSelection(selection[0]);
+      }
+      this.selectionOption=selection
+     
+    },
+    selectDate(val){
+      let month= val.getMonth() + 1;
+      let year= val.getFullYear() ;
+      let date= val.getDate();
+      this.$api.task
+        .totalAmount({year,month,date,agreeType:1})
+        .then(res => {
+          if (res.code==200) {
+              this.tableDataselect=res.data
+          }
+          else{
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    // 查询
+    handleSearchList(data) {
+      this.findPage(data);
+    },
+    //列表数据
+    findPage(data) {
+      let signDateStart=''
+      let signDateEnd=''
+      if(data && data.signDate && data.signDate.length>0){
+        signDateStart=data.signDate[0]
+        signDateEnd=data.signDate[1]
+      }
+      else{
+        // data.signDate=[]
+        signDateStart=''
+        signDateEnd=''
+      }
+      console.log(this.moneyList,333333);
+      this.tableConfig.loading = true;
+      this.$api.task
+        .plyFeeQuery({...this.pageData,...data,... this.formData,signDateStart,signDateEnd} )
+        .then(res => {
+          if (res.code==200) {
+            this.tableData = res.data.content;
+            this.pageData.pageNum = res.data.pageNum;
+            this.pageData.pageSize = res.data.pageSize;
+            this.pageData.totalSize = res.data.totalSize;
+            this.tableConfig.loading = false;
+          }
+          else{
+            this.tableConfig.loading = false;
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    closdialogVisible() {
+      this.dialogVisible = false;
+    },
+    balanceFunPro(){
+      if( this.formData.year ||  this.formData.month ||  this.formData.date){
+        this.$api.task
+          .totalAmount({...this.formData,agreeType:1})
+          .then(res => {
+            if (res.code==200) {
+                this.moneyList={}
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          });
+        }
+      // this.dataValue=''
+      // this.dialogVisible=true
+    },
+    // 结算
+    balanceFun(row){
+        this.$api.task.plyFeebalance(row).then(res => {
+            if (res.code == "200") {
+                this.$message({
+                    message: res.msg,
+                    type: 'success'
+                })
+                this.dialogVisible=false
+                this.findPage()
+            }
+            else{
+                this.$message.error(res.msg)
+            }
+          })
+    },
+ 
+    submit(){
+      this.$api.task
+        .batchPinBalance(this.selectionOption[0]?this.selectionOption[0]:{})
+        .then(res => {
+          if (res.code==200) {
+            this.$message({
+                message: '批量结算成功',
+                type: 'success'
+            })
+            this.dialogVisible=false
+            this.findPage()
+          }
+          else{
+            this.$message.error(res.msg)
+          }
+        })
+    },
+    tablePageChange(val) {
+      this.pageData.pageSize = val;
+      this.findPage();
+    },
+    tableCurrentChange(val) {
+      this.pageData.pageNum = val;
+      this.findPage();
+    },
+  
+  }
+};
+</script>
+    
+  <style scoped>
+
+.customStyle{
+    margin-bottom: 20px;
+    font-size: 14px;
+}
+  >>> .dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
+ 	 display: none;
+}
+</style>
+    

+ 46 - 350
src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceno.vue

@@ -10,59 +10,21 @@
       @handleSearchList="handleSearchList"
       :pagination="pageData"
     >
+    <template slot="data">
+      <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+    </template>
     </templateTable>
-    <el-dialog
-      v-dialogDrag
-      title="结算"
-      :visible.sync="dialogVisible"
-      width="40%"
-      @close="closdialogVisible"
-    >
-    <el-form :model="formData" :rules="rules" ref="formData" :inline="true" label-width="130px" size="small">
-        <el-row>
-            <el-col :span="12">
-                <el-form-item label="凭证号" prop="voucherNumber">
-                    <el-input v-model="formData.voucherNumber" ></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item label="合同号" prop="contractId">
-                    <el-input v-model="formData.contractId"></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24">
-                <el-form-item label="合同附件"  prop="contractFileId" style="width: 50%">
-                    <el-upload
-                        v-model="formData.contractFileId"
-                        class="upload-demo"
-                        action=""
-                        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">只能上传pdf/word文件</div>
-                    </el-upload>
-                    </el-form-item>
-            </el-col>
-        </el-row>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit('formData')">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
   <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue";//表格组件
 import templateTable from '@/components/TemplateTable/index.vue'
 import { mapState } from 'vuex'
+import yearMonthYay from './yearMonthYay.vue'
 
 export default {
   name: "baosi",
-  components: { KtCommonTable,templateTable },
+  components: { KtCommonTable,templateTable ,yearMonthYay},
   created() {
   },
   computed: {
@@ -74,373 +36,107 @@ export default {
     return {
       searchData:{},
         formList:[
-       {
-          label: "车牌号:",
-          prop: "licenseno",
-          type: "input",
-        },
-        {
-          label: "被保人:",
-          prop: "userId",
-          type: "input",
-        },
         {
-          label: "保险公司:",
+          label: "保险公司",
           prop: "companyName",
           type: "company",
         },
-       
         {
-          label: "险种:",
-          prop: "riskcode",
-          type: "input",
-        },
-        {
-          label: "保司机构:",
+          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",
+          label: "年月日",
+          name: "data",
+          type: "slot",
         },
     ],
     tableConfig:{
-        columns: [
-          {
-            prop: "orderno",
-            label: "子订单号",
-            type: "text"
-          },
-          {
-            prop: "signDate",
-            label: "签单日期",
-            type: "text"
-          },
-          {
-            prop: "licenseno",
-            label: "车牌号",
-            type: "text"
-          },
-          {
-            prop: "userId",
-            label: "被保险人",
-            type: "text"
-          },
+      columns: [
           {
             prop: "companyName",
-            label: "保险公司",
-            type: "text"
-          },
-          {
-            prop: "riskcode",
-            label: "险种",
+            label: "保险公司名称",
             type: "text"
           },
           {
             prop: "partnerCompaniesName",
-            label: "保司机构",
+            label: "合作公司名称",
             type: "text"
           },
           {
-            prop: "agreementId",
-            label: "协议号",
+            prop: "totalFeevalue",
+            label: "未结算总额",
             type: "text"
           },
           {
-            prop: "policyno",
-            label: "交强保单号",
-            type: "text"
-          },{
-            prop: "syPolicyno",
-            label: "商业保单号",
-            type: "text"
-
-          },{
-            prop: "noPolicyno",
-            label: "非车保单号",
-            type: "text"
-
-          },{
-            prop: "jqPremium",
-            label: "交强险保费",
-            type: "text"
-          },{
-            prop: "taxamount",
-            label: "车船税",
-            type: "text"
-          },{
-            prop: "syPremium",
-            label: "商业险保费",
-            type: "text"
-
-          },{
-            prop: "noPremium",
-            label: "非车保费",
-            type: "text"
-
-          },{
-            prop: "jqReceivableProportion",
-            label: "交强应收比例",
-            type: "text"
-
-          },{
-            prop: "jqSuperviseCostsProportion",
-            label: "交强手续费比例",
-            type: "text"
-
-          },{
-            prop: "jqOtherCostsProportion",
-            label: "交强非跟单比例",
-            type: "text"
-
-          },{
-            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: "noOtherCostsProportion",
-            label: "非车非跟单比例",
-            type: "text"
-
-          },{
             prop: "commissionFeevalue",
-            label: "手续费金额",
+            label: "未结算手续费",
             type: "text"
-
-          },{
+          },
+          {
             prop: "otherFeevalue",
-            label: "非跟单金额",
-            type: "text"
-
-          },{
-            prop: "allFeeValue",
-            label: "应收金额",
-            type: "text"
-          },{
-            prop: "createTime",
-            label: "创建时间",
+            label: "未结算跟单费",
             type: "text"
-          },{
-            prop: "settlementTime",
-            label: "结算日期",
-            type: "text"
-          },{
-            prop: "settlementUserId",
-            label: "结算人",
-            type: "text"
-          },{
-            prop: "updateUserId",
-            label: "修改人",
-            type: "text"
-          },{
-            prop: "handlingFeesStatus",
-            label: "手续费结算状态",
-            type: "statMap",
-            options:[{
-              value:'1',
-              label:'已结算'
-            },{
-              value:'0',
-              label:'未结算'
-            }]
-          }
+          },
         ],
         loading:true,
         isPaginationShow:true,
         isShowIndex: true,
-        optBtns:[
-          
-        {
-            type:'primary',
-            label:'结算',
-            hide:(row)=>{
-              return row.handlingFeesStatus == 0?true:false
-            },
-            click:(row, index) => {return this.balanceFun(row)},
-        }
-        ]
+        // optBtns:[
+        // {
+        //     type:'primary',
+        //     label:'结算',
+        //     click:(row, index) => {return this.balanceFun(row)},
+        // }
+        // ]
     },
     tableData: [],
-      formData: {},
-      dialogVisible: false,
+    formData:{},
       pageData:{
         pageNum: 1,
         pageSize: 20,
         agreementType: '1',
-        isNotCar:'1',
-        isOther:'0',
         handlingFeesStatus:'0'
       },
-      formData:{},
-      rules: {
-        voucherNumber: [
-            { required: true, message: '请输入凭证号', trigger: 'blur' },
-          ],
-          contractId: [
-            { required: true, message: '请输入合同号', trigger: 'blur' },
-          ],
-          contractFileId: [
-            { required: true, message: '请上传合同', trigger: 'blur' },
-          ],
-      }
     };
   },
   created(){
     this.findPage();
   },
   methods: {
+    getYearData(val){
+      this.formData.year=val
+    },
+    getMonthData(val){
+      this.formData.month=val
+    },
+    getDayData(val){
+      this.formData.day=val
+    },
     // 查询
-    handleSearchList() {
-      this.findPage();
+    handleSearchList(val) {
+      this.findPage(val);
     },
     //列表数据
     findPage(data) {
       this.tableConfig.loading = true;
       this.$api.task
-        .plyFeeQuery(this.pageData, )
+        .totalPinAmount({...this.pageData,...data,...this.formData} )
         .then(res => {
           if (res.data) {
-            this.tableData = res.data.content;
-            this.pageData.pageNum = res.data.pageNum;
-            this.pageData.pageSize = res.data.pageSize;
-            this.pageData.totalSize = res.data.totalSize;
+            this.tableData = res.data;
+            // this.pageData.pageNum = res.data.pageNum;
+            // this.pageData.pageSize = res.data.pageSize;
+            // this.pageData.totalSize = res.data.totalSize;
             this.tableConfig.loading = false;
           }
         });
     },
-    closdialogVisible() {
-      this.dialogVisible = false;
-    },
+ 
     // 结算
     balanceFun(row){
-        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
-    },
-    //上传影像
-    httpRequest(options) {
-      let file = options.file;
-      const params = new FormData(); // 声明formData数据类型
-      params.append("multipartFile", file);
-      params.append("type", 'settle');
-      this.$api.letter.uploadFile(params).then(res => {
-        if (res.code == "200") {
-            this.$message({
-                message: '上传成功',
-                type: 'success'
-            })
-            this.formData.contractFileId=res.data.id
-        }
-        else{
-            this.$message.error(res.msg)
-        }
-      });
-    },
-    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;

+ 46 - 361
src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceyes.vue

@@ -3,65 +3,27 @@
   <div class="container" style="width: 99%; margin-top: 0px">
     <templateTable
       :formList="formList"
-      :searchData.sync="searchData"
       :tableConfig="tableConfig"
-      :btnGroup="btnGroup"
       :data="tableData"
       @findPage="findPage"
       @handleSearchList="handleSearchList"
       :pagination="pageData"
     >
+    <template  slot="data">
+      <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+    </template>
     </templateTable>
-    <!-- <el-dialog
-      v-dialogDrag
-      title="结算"
-      :visible.sync="dialogVisible"
-      width="40%"
-      @close="closdialogVisible"
-    >
-    <el-form :model="formData" :rules="rules" ref="formData" :inline="true" label-width="130px" size="small">
-        <el-row>
-            <el-col :span="12">
-                <el-form-item label="凭证号" prop="voucherNumber">
-                    <el-input v-model="formData.voucherNumber" ></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item label="合同号" prop="contractId">
-                    <el-input v-model="formData.contractId"></el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24">
-                <el-form-item label="银行收款截图"  prop="contractFileId" style="width: 50%">
-                    <el-upload
-                        v-model="formData.contractFileId"
-                        class="upload-demo"
-                        action=""
-                        name="DX_00"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                    >
-                    <el-button size="small" type="primary">点击上传</el-button>
-                    </el-upload>
-                    </el-form-item>
-            </el-col>
-        </el-row>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit('formData')">确 定</el-button>
-      </span>
-    </el-dialog> -->
   </div>
 </template>
   <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue";//表格组件
 import templateTable from '@/components/TemplateTable/index.vue'
 import { mapState } from 'vuex'
+import yearMonthYay from './yearMonthYay.vue'
 
 export default {
   name: "baosi",
-  components: { KtCommonTable,templateTable },
+  components: { KtCommonTable,templateTable,yearMonthYay },
   created() {
   },
   computed: {
@@ -73,260 +35,53 @@ export default {
     return {
       searchData:{},
         formList:[
-       {
-          label: "车牌号:",
-          prop: "licenseno",
-          type: "input",
-        },
-        {
-          label: "被保人:",
-          prop: "userId",
-          type: "input",
-        },
         {
-          label: "保险公司:",
+          label: "保险公司",
           prop: "companyName",
           type: "company",
         },
-       
         {
-          label: "险种:",
-          prop: "riskcode",
-          type: "input",
-        },
-        {
-          label: "保司机构:",
+          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: "年月日",
+          name: "data",
+          type: "slot",
         },
-        {
-          label: "结算日期:",
-          prop: "settlementTime",
-          type: "date",
-        },
-    ],
-    btnGroup:[
-      {
-        name:'批量结算',
-        click:(row, index) => {return this.balanceFun(row)},
-      }
     ],
     tableConfig:{
         columns: [
-          {
-            prop: "orderno",
-            label: "子订单号",
-            type: "text"
-          },
-          {
-            prop: "signDate",
-            label: "签单日期",
-            type: "text"
-          },
-          {
-            prop: "licenseno",
-            label: "车牌号",
-            type: "text"
-          },
-          {
-            prop: "userId",
-            label: "被保险人",
-            type: "text"
-          },
           {
             prop: "companyName",
-            label: "保险公司",
-            type: "text"
-          },
-          {
-            prop: "riskcode",
-            label: "险种",
+            label: "保险公司名称",
             type: "text"
           },
           {
             prop: "partnerCompaniesName",
-            label: "保司机构",
+            label: "合作公司名称",
             type: "text"
           },
           {
-            prop: "agreementId",
-            label: "协议号",
+            prop: "totalFeevalue",
+            label: "已结算总额",
             type: "text"
           },
           {
-            prop: "policyno",
-            label: "交强保单号",
-            type: "text"
-          },{
-            prop: "syPolicyno",
-            label: "商业保单号",
-            type: "text"
-
-          },{
-            prop: "noPolicyno",
-            label: "非车保单号",
-            type: "text"
-
-          },{
-            prop: "jqPremium",
-            label: "交强险保费",
-            type: "text"
-          },{
-            prop: "taxamount",
-            label: "车船税",
-            type: "text"
-          },{
-            prop: "syPremium",
-            label: "商业险保费",
-            type: "text"
-
-          },{
-            prop: "noPremium",
-            label: "非车保费",
-            type: "text"
-
-          },{
-            prop: "jqReceivableProportion",
-            label: "交强应收比例",
-            type: "text"
-
-          },{
-            prop: "jqSuperviseCostsProportion",
-            label: "交强手续费比例",
-            type: "text"
-
-          },{
-            prop: "jqOtherCostsProportion",
-            label: "交强非跟单比例",
-            type: "text"
-
-          },{
-            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: "noOtherCostsProportion",
-            label: "非车非跟单比例",
-            type: "text"
-
-          },{
             prop: "commissionFeevalue",
-            label: "手续费金额",
+            label: "已结算手续费",
             type: "text"
-
-          },{
+          },
+          {
             prop: "otherFeevalue",
-            label: "非跟单金额",
-            type: "text"
-
-          },{
-            prop: "allFeeValue",
-            label: "应收金额",
-            type: "text"
-          },{
-            prop: "createTime",
-            label: "创建时间",
-            type: "text"
-          },{
-            prop: "settlementTime",
-            label: "结算日期",
+            label: "已结算跟单费",
             type: "text"
-          },{
-            prop: "settlementUserId",
-            label: "结算人",
-            type: "text"
-          },{
-            prop: "updateUserId",
-            label: "修改人",
-            type: "text"
-          },{
-            prop: "handlingFeesStatus",
-            label: "手续费结算状态",
-            type: "statMap",
-            options:[{
-              value:'1',
-              label:'已结算'
-            },{
-              value:'0',
-              label:'未结算'
-            }]
-          }
+          },
         ],
-        isCheckBox:true,
         loading:true,
         isPaginationShow:true,
         isShowIndex: true,
-        optBtns:[
-        {
-            type:'primary',
-            label:'结算',
-            hide:(row)=>{
-              return row.handlingFeesStatus == 0?true:false
-            },
-            click:(row, index) => {return this.balanceFun(row)},
-        }
-        ]
     },
     tableData: [],
       formData: {},
@@ -334,122 +89,49 @@ export default {
       pageData:{
         pageNum: 1,
         pageSize: 20,
-        agreementType: '1',
-        isNotCar:'1',
-        isOther:'0',
-        handlingFeesStatus:'1'
+        agreeType:1,
+        handlingFeesStatus:1
       },
-      formData:{},
-      rules: {
-        voucherNumber: [
-            { required: true, message: '请输入凭证号', trigger: 'blur' },
-          ],
-          contractId: [
-            { required: true, message: '请输入合同号', trigger: 'blur' },
-          ],
-          contractFileId: [
-            { required: true, message: '请上传合同', trigger: 'blur' },
-          ],
-      }
     };
   },
   created(){
     this.findPage();
   },
   methods: {
-    handleSelectionChange(row){
-      console.log(row,33333);
+    getYearData(val){
+      this.formData.year=val
+    },
+    getMonthData(val){
+      this.formData.month=val
+    },
+    getDayData(val){
+      this.formData.day=val
     },
     // 查询
-    handleSearchList() {
-      this.findPage();
+    handleSearchList(val) {
+      this.findPage(val);
     },
     //列表数据
     findPage(data) {
       this.tableConfig.loading = true;
       this.$api.task
-        .plyFeeQuery(this.pageData, )
+        .totalPinAmount({...this.pageData,...data,...this.formData} )
         .then(res => {
-          if (res.data) {
-            this.tableData = res.data.content;
-            this.pageData.pageNum = res.data.pageNum;
-            this.pageData.pageSize = res.data.pageSize;
-            this.pageData.totalSize = res.data.totalSize;
+          if (res.code==200) {
+            this.tableData = res.data;
+            // this.pageData.pageNum = res.data.pageNum;
+            // this.pageData.pageSize = res.data.pageSize;
+            // this.pageData.totalSize = res.data.totalSize;
             this.tableConfig.loading = false;
           }
-        });
-    },
-    closdialogVisible() {
-      this.dialogVisible = false;
-    },
-    // 结算
-    balanceFun(row){
-        // this.formData={
-        //     voucherNumber:'',
-        //     contractId:'',
-        //     contractFileId:'',
-        //     orderno:row.orderno,
-        //     policyno:row.policyno,
-        //     commissionFeevalue:row.commissionFeevalue,
-        // }
-        this.dialogVisible=true
-        // 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) {
-      let file = options.file;
-      const params = new FormData(); // 声明formData数据类型
-      params.append("multipartFile", file);
-      params.append("type", 'settle');
-      this.$api.letter.uploadFile(params).then(res => {
-        if (res.code == "200") {
-            this.$message({
-                message: '上传成功',
-                type: 'success'
-            })
-            this.formData.contractFileId=res.data.id
-        }
-        else{
+          else{
+            this.tableConfig.loading = false;
             this.$message.error(res.msg)
-        }
-      });
+          }
+        });
     },
-    // 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();
@@ -465,5 +147,8 @@ export default {
     
   <style scoped>
 
+  >>> .dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
+ 	 display: none;
+}
 </style>
     

+ 114 - 0
src/views/FinancialManagement/CarInsurance/PlatformSettlement/yearMonthYay.vue

@@ -0,0 +1,114 @@
+<template>
+    <div>
+        <el-select class="col-md-2" clearable v-model="year" @change="changeYear" size="small">
+            <el-option
+            v-for="item in yearlist"
+            :key="item"
+            :label="item"
+            :value="item">
+            </el-option>
+        </el-select>
+        <el-select class="col-md-2" clearable v-model="month" @change="changeMonth" size="small">
+                  <el-option
+                    v-for="item in monthlist"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+        <el-select class="col-md-2" clearable v-model="day" size="small" @change="changeDay">
+            <el-option
+            v-for="item in daylist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            </el-option>
+        </el-select>
+    </div>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            year:'',
+            month:'',
+            day:'',
+            monthlist:[],
+            daylist:[],
+            yearlist:[]
+        }
+    },
+    mounted() {
+        this.getYearData()
+    },
+    methods:{
+        getYearData(data){
+            const currentYear = new Date().getFullYear(); // 获取当前年份
+            const oldestYear = 1900; // 设定最早的年份
+            this.yearlist  = Array.from(Array(currentYear - oldestYear + 1).keys()).map(i => currentYear - i);
+        },
+        //获取月份
+        changeYear(val){
+            let arr = [];
+            for(let i = 1;i < 13; i ++){
+                arr.push({
+                    value:i,
+                    label:i+"月"
+                })
+            }
+            this.monthlist = arr;
+            this.$emit('getYearData',val)
+            if(!val){
+                this.month=''
+                this.day=''
+                this.monthlist = [];
+                this.daylist = [];
+                this.$emit('getMonthData','')
+                this.$emit('getDayData','')
+            }
+            
+        },
+        //月份变化时
+        changeMonth(val){
+            this.$emit('getMonthData',val)
+            this.getDayData(this.year,this.month);
+            if(!val){
+                this.day=''
+                this.$emit('getDayData','')
+            }
+        },
+        changeDay(val){
+            this.$emit('getDayData',val)
+        },
+        //计算日期
+        getDayData(year,month){
+            let day;
+            if (month == 1 || month == 3 || month == 5 || month == 7 || month == 8 || month == 10 || month == 12) {
+                day = 31
+            } else if (month == 4 || month == 6 || month == 11 || month == 9) {
+                day = 30
+            } else if (month == 2) {
+                if (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) { //闰年
+                    day = 29
+                } else {
+                    day = 28
+                }
+            }
+            let arr =[];
+            for(let i = 1;i < day + 1; i ++){
+                arr.push({
+                    value:i,
+                    label:i+"日"
+                })
+            }
+            this.daylist = arr;
+
+        },
+    }
+}
+</script>
+<style scoped>
+.col-md-2{
+    width: 100px;
+}
+</style>

+ 454 - 0
src/views/PeopleManage/Generations/RegionalPerformance.vue

@@ -0,0 +1,454 @@
+<template>
+  <!--布局容器-->
+  <div class="container" style="width: 99%; margin-top: 0px">
+        <!-- 顶部查询 -->
+        <el-row class="top">
+          <el-form
+            v-model="formData"
+            size="small"
+            label-width="95px"
+            :inline="true"
+            class="form"
+          >
+            <el-form-item label="省市区" prop="areaCode">
+              <el-select clearable  v-model="formData.areaCode" placeholder="请选择" @change="provinceFun">
+                <el-option
+                  v-for="item in provinceOptions"
+                  :key="item.areaCode"
+                  :label="item.areaCname"
+                  :value="item.areaCode">
+                </el-option>
+              </el-select>
+              <el-select   v-model="formData.cityCode" placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in cityOptions"
+                  :key="item.areaCode"
+                  :label="item.areaCname"
+                  :value="item.areaCode">
+                </el-option>
+              </el-select>
+              <!-- <el-cascader
+                v-model="formData.areaCode"
+                :options="areaOptions"
+                :props="{label:'areaCname', value:'areaCode',children:'child',checkStrictly: true }"
+                clearable
+                ref="area"
+              ></el-cascader> -->
+            </el-form-item>
+            <el-form-item label="日期区间" label-width="95px" prop="applyTime">
+              <el-date-picker
+                v-model="formData.date"
+                type="daterange"
+                range-separator="至"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                @change="dateChange"
+                clearable
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" size="small" @click="queryStaffInfo">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <!-- 表格 -->
+        <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>
+        
+
+    <el-dialog
+      class="dialog detailtTable"
+      :title="title"
+      :close-on-click-modal="false"
+      :before-close="resetForm"
+      :visible.sync="detailDialog"
+      width="70%"
+    >
+      <div class="dialog-body">
+        <el-table
+          v-loading="loading"
+          element-loading-text="拼命加载中..."
+          element-loading-spinner="el-icon-loading"
+          :data="detailData"
+          :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" width="50"></el-table-column>
+          <el-table-column v-if="isPersonnel" prop="userName" label="人员姓名" align="center" ></el-table-column>
+          <el-table-column
+              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"
+            :min-width="item.minWidth"
+            :prop="item.prop"
+            align="center"
+            :label="item.label"
+          ></el-table-column>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <div class="bottomFixed" style="padding-bottom: 50px;" ref="bottomFixed">
+          <el-pagination
+            @size-change="handleSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+            @current-change="refreshformData"
+            :current-page="detailParams.pageNum"
+             :page-size="detailParams.pageSize"
+            :page-sizes="[10,20, 50, 100, 200, 300, 400, 500]"
+            :total="detailParams.totalSize"
+            style="float: left; margin-left: 20px"
+          ></el-pagination>
+        </div>
+        <el-button @click="resetForm" size="small">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+        <script>
+  import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+  import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
+  export default {
+    name: "InvoiceInformation",
+    components: { KtCommonTable, KtButton },
+    data() {
+      return {
+        isPersonnel:false,
+        provinceOptions:[],
+        cityOptions:[],
+        currentTreeNode: null,
+        title: "详情",
+        loading: true,
+        detailDialog: false,
+        showOperation:true,
+        operationWidth: 160, //操作列宽度
+        queryFrom: {
+          //查询条件
+        },
+        pageRequest: {
+          content:[],
+          pageNum: 1,
+          pageSize: 10,
+        }, //表格参数
+        formData: {
+          date: [], //日期区间数组
+          areaCode:'140000',
+          level:'1',
+          createTimeStart: "", //日期开始时间
+          createTimeEnd: "", //日期结束时间
+        },
+        detailParams: {
+          pageNum: 1,
+          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: "totalSumpremium",
+            label: "总承保保费总数",
+            type: "text",
+          },
+        ],
+        detailData:[],
+        detailColumns: [
+        {
+          prop: "quoteNum",
+          label: "报价次数",
+          type: "text",
+        },
+        {
+          prop: "submitNum",
+          label: "提交核保次数",
+          type: "text",
+        },
+        {
+          prop: "hasInsuredNum",
+          label: "已承保数量",
+          type: "text",
+        },
+        {
+          prop: "syPremiumSum",
+          label: "商业保费",
+          type: "text",
+        },
+        { prop: "taxaMountSum", label: "车船税", type: "text" },
+        {
+          prop: "jqPremiumSum",
+          label: "交强险费用",
+          type: "text",
+        },
+        {
+          prop: "totalSumpremium",
+          label: "总承保保费总数",
+          type: "text",
+        },
+      ],
+      quMarks:''
+      };
+    },
+    created() {
+         this.findPage(); // 
+         this.$api.dept.queryTree().then((res) => {
+            if(res.code==200){
+              this.formData.areaCode='140000'
+              this.provinceOptions=res.data
+              this.cityOptions=res.data.filter(e=>e.areaCode=='140000')[0].child
+            }
+         })
+    },
+    methods: {
+      provinceFun(val){
+        this.cityOptions=[]
+        this.cityOptions=this.provinceOptions.filter(e=>e.areaCode==val)[0].child
+      },
+      //选择时间区间
+      dateChange(e) {
+        if (e == null) {
+          this.formData.createTimeStart = "";
+          this.formData.createTimeEnd = "";
+        } else {
+          this.formData.createTimeStart = e[0];
+          this.formData.createTimeEnd = e[1];
+        }
+      },
+      // 换页刷新
+    refreshformData: function (pageNum) {
+      this.detailParams.pageNum = pageNum;
+      this.getDetailData()
+    },
+    // 每页条数发生改变
+    handleSizeChange(pageSize) {
+      this.detailParams.pageSize = pageSize;
+      this.getDetailData()
+    },
+        // 列表换页刷新
+        refreshListData: function (pageNum) {
+      this.pageRequest.pageNum = pageNum;
+      this.findPage()
+    },
+    // 每页条数发生改变
+    handleSizeList(pageSize) {
+      this.pageRequest.pageSize = pageSize;
+      this.findPage()
+    },
+    //取消隐藏弹框
+    resetForm() {
+      this.detailDialog = false;
+      this.detailParams.pageNum = 1;
+      this.detailParams.pageSize = 10;
+    },
+    //查看详情
+    handleDetail(index) {
+      this.quMarks='1'
+      this.detailParams.areaCode = index.areaCode;
+      this.detailDialog = true;
+      this.getDetailData()
+      this.isPersonnel=false
+    },
+    handlePersonnelDetail(index) {
+      this.quMarks='2'
+      this.detailParams.areaCode = index.areaCode;
+      this.detailDialog = true;
+      this.getDetailData()
+      this.isPersonnel=true
+    },
+    getDetailData(){
+      this.loading = true;
+      this.$api.user.quAgentAreaAdminDetail({...this.detailParams,createTimeStart:this.formData.createTimeStart,createTimeEnd:this.formData.createTimeEnd,quMarks:this.quMarks }).then((res) => {
+        if (res.code == 200) {
+          this.detailData = res.data.records;
+          this.detailParams.pageNum = res.data.current;
+          this.detailParams.pageSize = res.data.size;
+          this.detailParams.totalPages = res.data.pages;
+          this.detailParams.totalSize = res.data.total;
+          this.loading = false;
+        } else {
+          this.$message.error(res.msg);
+          this.loading = false;
+        }
+      });
+    },
+      //获取页面数据
+      async  findPage(data) {
+        let areaCode=''
+          this.formData.level=''
+          if(this.formData.cityCode){
+            areaCode=this.formData.cityCode
+              this.formData.level='2'
+          }
+          else{
+            areaCode=this.formData.areaCode
+            this.formData.level='1'
+          }
+        this.loading = true;
+        let res=await this.$api.user.quAgentAreaAdmin({...this.formData,areaCode,pageNum:this.pageRequest.pageNum, pageSize:this.pageRequest.pageSize})
+        if (res.code == 200) {
+            this.pageRequest = {
+                content: res.data.records,
+                pageNum: res.data.current,
+                pageSize: res.data.size,
+                totalSize: res.data.total,
+            };
+            this.loading = false;
+        } else {
+            this.$message.error(res.msg);
+        }
+      },
+      // 查询
+      queryStaffInfo() {
+        this.pageRequest.pageNum = 1;
+        this.findPage();
+      },
+    },
+  };
+  </script>
+        
+  <style scoped>
+</style>
+        

+ 12 - 11
src/views/PeopleManage/Player/RegionPerformanceManage.vue

@@ -207,7 +207,6 @@
           <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"
@@ -328,8 +327,7 @@
         }, //表格参数
         formData: {
           // 列表查询条件
-          pageNum: 1,
-          pageSize: 20,
+         
           date: [], //日期区间数组
           createTimeStart: "", //日期开始时间
           createTimeEnd: "", //日期结束时间
@@ -385,6 +383,7 @@
           type: "text",
         },
       ],
+      quMarks:''
       };
     },
     created() {
@@ -447,12 +446,12 @@
       // 换页刷新
     refreshformData: function (pageNum) {
       this.detailParams.pageNum = pageNum;
-      this.getDetailData(2)
+      this.getDetailData()
     },
     // 每页条数发生改变
     handleSizeChange(pageSize) {
       this.detailParams.pageSize = pageSize;
-      this.getDetailData(2)
+      this.getDetailData()
     },
         // 列表换页刷新
         refreshListData: function (pageNum) {
@@ -474,18 +473,20 @@
     handleDetail(index) {
       this.detailParams.areaCode = index.areaCode;
       this.detailDialog = true;
-      this.getDetailData(1)
+      this.quMarks='1'
+      this.getDetailData()
       this.isPersonnel=false
     },
     handlePersonnelDetail(index) {
+      this.quMarks='2'
       this.detailParams.areaCode = index.areaCode;
       this.detailDialog = true;
-      this.getDetailData(2)
+      this.getDetailData()
       this.isPersonnel=true
     },
-    getDetailData(quMarks){
+    getDetailData(){
       this.loading = true;
-      this.$api.user.quUserNumDetail({...this.detailParams,userId:this.userId,createTimeStart:this.formData.createTimeStart,createTimeEnd:this.formData.createTimeEnd,quMarks }).then((res) => {
+      this.$api.user.quUserNumDetail({...this.detailParams,userId:this.userId,createTimeStart:this.formData.createTimeStart,createTimeEnd:this.formData.createTimeEnd,quMarks:this.quMarks }).then((res) => {
         if (res.code == 200) {
           this.detailData = res.data.records;
           this.detailParams.pageNum = res.data.current;
@@ -512,7 +513,7 @@
             this.formData.level='1'
           }
         this.loading = true;
-        let res=await this.$api.user.quUserNumList({...this.formData,userId: this.userId,areaCode })
+        let res=await this.$api.user.quUserNumList({...this.formData,userId: this.userId,areaCode,pageNum:this.pageRequest.pageNum,pageSize:this.pageRequest.pageSize })
         if (res.code == 200) {
             this.pageRequest = {
                 content: res.data.records,
@@ -527,7 +528,7 @@
       },
       // 查询
       queryStaffInfo() {
-        this.formData.pageNum = 1;
+        this.pageRequest.pageNum = 1;
         this.findPage();
       },
     },