财务管理大中型评估人员提成计算

src/api/modules/financeRealFund.js

@@ -30,4 +30,10 @@ export default {
   majorMarketSettleProd(params) {
     return request.get(`financeRealFund/major/market/settle/prod`, { params: params })
   },
+  majorEvaluatorCommission(params) {
+    return request.get(`financeRealFund/commission/major/evaluator`, { params: params })
+  },
+  majorEvaluatorCommissionDetail(params){
+    return request.get(`financeRealFund/commission/major/evaluator/detail`, { params: params })
+  }
 }

src/components/BaseTable/parentTable.vue

@@ -29,8 +29,6 @@
 </template>
 
 <script>
-  import {underscoreName} from "@/utils/index";
-
   export default {
     name: "parentTable",
     props: {

src/router/urlMap.js

@@ -121,7 +121,7 @@ import _views_income_assets_declare_detail from '@/views/income/assets/declareDe
 import _views_income_assets_declare_market from '@/views/income/assets/market'
 import _views_finance_fund_warning from '@/views/finance/fundWarning'
 import _views_finance_settle_major from '@/views/finance/settleMajor'
-
+import _views_finance_major_commission_calculate from '@/views/finance/calculateMajor'
 
 export default {
   _views_set_menu,
@@ -231,6 +231,7 @@ export default {
   _views_income_assets_declare_detail,
   _views_income_assets_declare_market,
   _views_finance_fund_warning,
-  _views_finance_settle_major
+  _views_finance_settle_major,
+  _views_finance_major_commission_calculate
 
 }

src/views/finance/calculateMajor.vue

@@ -0,0 +1,437 @@
+<template>
+  <div class="app-container organization-index">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
+    </div>
+      <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" style="margin-top: 10px;">
+        <el-tab-pane label="评估人员" name="evaluate">
+            <div style="width: 100%; height: 50px;">
+              <el-date-picker  clearable v-model="findDate" type="daterange" align="center" unlink-panels
+                            range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
+                            value-format="yyyy-MM-dd" style="float: left;">
+              </el-date-picker>
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList1()" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="exportEvaluateSettleProd()">导出
+              </el-button>
+            </div>
+            <div style="width: 100%;">
+              <el-table  :data="evaluatorAmount" 
+                fit
+                stripe
+                highlight-current-row
+                @row-click="userAmountDetail"
+                :header-row-style="{ color: '#333333','font-size':'14px'}"
+                style=" width: 21.2%; float: left;
+                  border-left: 1px solid #ebeced;
+                  border-right: 1px solid #ebeced;
+                  color: #333333; font-size: 14px;
+                ">
+              <el-table-column label="姓名" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.userName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="提成金额(元)"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.commissionTotalAmount }}</span>
+                </template>
+              </el-table-column>
+              </el-table>
+              <el-table :data="evaluatorProd" 
+                  fit
+                  stripe
+                  highlight-current-row
+                  :header-row-style="{ color: '#333333','font-size':'14px'}"
+                  style=" width: 78%; float: right;
+                    border-left: 1px solid #ebeced;
+                    border-right: 1px solid #ebeced;
+                    color: #333333; font-size: 14px;
+                  "
+              >
+                <el-table-column label="产品号" width="200" align="center">
+                  <template slot-scope="{row}">
+                    <el-tag type="success">{{ row.reportNo }}</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="项目名称"  width="200" align="center"  show-overflow-tooltip>
+                  <template slot-scope="{row}">
+                    <span>{{ row.name }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="项目分类"  width="100" align="center" show-overflow-tooltip>
+                  <template slot-scope="{row}">
+                    <span>{{ row.businessCate }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="提成比例" align="center">
+                  <template slot-scope="{row}">
+                    <span>{{ row.ratio}}%</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="总提成额(￥)"   align="center">
+                  <template slot-scope="{row}">
+                    <span>{{ row.totalAmount }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="分配比例"   align="center">
+                  <template slot-scope="{row}">
+                    <span>{{ row.allotRatio*100 }}%</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="提成额(￥)"   align="center">
+                  <template slot-scope="{row}">
+                    <span style="color:red">{{ row.commissionAmount }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="出报告日期"   align="center">
+                  <template slot-scope="{row}">
+                    <span>{{ row.created }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="实收款(￥)"   align="center">
+                  <template slot-scope="{row}">
+                    <span>{{ row.realAmount }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="提成日期"  width="100" align="center">
+                  <template slot-scope="{row}">
+                    <span>{{ row.settleDate }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+        </el-tab-pane>
+        <el-tab-pane label="市场人员" name="market">
+          <y-page-list-layout :get-page-list="majorMarketSettleProd" :page-list="marketProd" :page-para="listQuery2">
+            <template slot="left">
+              <el-date-picker  clearable v-model="findDate1" type="daterange" align="center" unlink-panels
+                            range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
+                            value-format="yyyy-MM-dd" style="float: left;">
+              </el-date-picker>
+              <el-input v-model="listQuery2.orderId" placeholder="项目编号" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery2.reportNo" placeholder="产品号" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery2.principal" placeholder="负责人" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery2.clientManager" placeholder="客户经理" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList2()" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch2()">重置
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="exportMarketSettleProd()">导出
+              </el-button>
+            </template>
+            <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
+              <el-table-column label="项目编号"  width="110" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.orderId }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="产品号" width="200" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.reportNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="结算日期"  width="100" align="center">
+                <template slot-scope="{row}">
+                  <span style="color:red">{{ row.settleDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="认领日期"  width="100" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.claimDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="送达日期"  width="100" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.deliveryDate}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="项目名称"  width="200" align="center"  show-overflow-tooltip>
+                <template slot-scope="{row}">
+                  <span>{{ row.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户名称"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="业务来源"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientSubName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="委托方"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.bailor }}</span>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="分配产值"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientSubName }}</span>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="市场部"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.marketDepartmentName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="评估部"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.evaluateDepartmentName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户经理" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientManager }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="负责人"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.principal }}</span>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="参与人"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.principal }}</span>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="结算金额(元)"  align="center">
+                <template slot-scope="{row}">
+                  <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="评估价值(万元)"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.evaluateAmount/10000 }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票日期"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.invoiceDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票人"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.invoiceUser }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="发票号"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.invoiceNo }}</span>
+                </template>
+              </el-table-column>
+            </parentTable>
+          </y-page-list-layout>
+        </el-tab-pane>
+      </el-tabs>
+  </div>
+</template>
+<script>
+  import Breadcrumb from '@/components/Breadcrumb'
+  import YPageListLayout from '@/components/YPageListLayout'
+
+  export default {
+    name: 'calculateMajor',
+    components: {
+      Breadcrumb,
+      YPageListLayout
+    },
+
+    data() {
+      return {
+        activeName: 'evaluate',
+        listQuery1: {
+          page: 1,
+          size: 10,
+          descs: 'id',
+          startDate:'2024-05-01 00:00:00',
+          endDate:'2024-06-01 00:00:00'
+        },
+         listQuery2: {
+          page: 1,
+          size: 10,
+          descs: 'id',
+          startDate:'2024-05-01 00:00:00',
+          endDate:'2024-06-01 00:00:00'
+        },
+        pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }]
+        },
+        findDate: [],
+        findDate1: [],
+        evaluatorAmount:[],
+        evaluatorProd:[],
+        marketProd:{
+          records:[]
+        }
+      }
+    },
+    created() {
+      this.findDate.push(this.getDefaultStartDate());
+      this.findDate.push(this.getDefaultEndDate());
+      this.findDate1.push(this.getDefaultStartDate());
+      this.findDate1.push(this.getDefaultEndDate());
+      this.majorEvaluatorAmount();
+    },
+    methods: {
+
+      getDefaultStartDate(){
+        const currentDate = new Date();
+        const currentYear = currentDate.getFullYear();
+        var currentMonth = String(currentDate.getMonth()).padStart(2,"0");
+        return currentYear+'-'+currentMonth+'-'+'23'
+      },
+
+      getDefaultEndDate(){
+        const currentDate = new Date();
+        const currentYear = currentDate.getFullYear();
+        var currentMonth = String(currentDate.getMonth() + 1).padStart(2,"0");
+        return currentYear+'-'+currentMonth+'-'+'22'
+      },
+   
+      handleClick(tab, event) {
+          if (tab.name==='market'){
+              this.majorMarketSettleProd();
+          }
+          if (tab.name==='evaluate'){
+            this.majorEvaluatorSettleProd()
+          }
+      },
+
+        
+    resetSearch1() {
+      this.$router.push({ query: {} });
+      this.findDate = '';
+      this.listQuery1 = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+        startDate:null,
+        endDate:null,
+      }
+      this.resetSearch1()
+    },
+   
+    searchList1() {
+      // 重置分页
+      this.listQuery1.page = 1
+      this.listQuery1.size = 10
+      if (this.findDate){
+        this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
+        this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
+      }
+      this.majorEvaluatorAmount()
+    },
+
+    resetSearch2() {
+      this.$router.push({ query: {} });
+      this.findDate2 = '';
+      this.listQuery2 = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+        startDate:null,
+        endDate:null,
+      }
+      this.majorMarketSettleProd()
+    },
+   
+    searchList2() {
+      // 重置分页
+      this.listQuery2.page = 1
+      this.listQuery2.size = 10
+      if (this.findDate){
+        this.listQuery2.startDate = this.findDate2[0]+' 00:00:00';
+        this.listQuery2.endDate = this.findDate2[1]+ ' 23:59:59';
+      }
+      this.majorMarketSettleProd()
+    },
+
+    majorEvaluatorAmount(){
+        if (this.findDate){
+          this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
+          this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
+        }
+        this.$api.financeRealFund.majorEvaluatorCommission(this.listQuery1).then(res=>{
+          if (res.code === 200){
+              this.evaluatorAmount = res.data;
+              if (this.evaluatorAmount.length > 0){
+                this.listQuery1.userId = this.evaluatorAmount[0].id;
+                this.$api.financeRealFund.majorEvaluatorCommissionDetail(this.listQuery1).then(res=>{
+                  if (res.code === 200){
+                      this.evaluatorProd = res.data;
+                  }
+                })
+              }
+          }
+        })
+      },
+      userAmountDetail(row, column, event){
+        this.listQuery1.userId = row.id;
+        this.$api.financeRealFund.majorEvaluatorCommissionDetail(this.listQuery1).then(res=>{
+          if (res.code === 200){
+              this.evaluatorProd = res.data;
+          }
+        })
+      },
+    majorMarketSettleProd(){
+      if (this.findDate1){
+        this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
+        this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
+      }
+      this.$api.financeRealFund.majorMarketSettleProd(this.listQuery2).then(res=>{
+        if (res.code === 200){
+            this.marketProd = res.data;
+        }
+      })
+    },
+    exportMarketSettleProd(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/market/settle/export", this.listQuery2,
+      "导出"
+      );
+    },
+    exportEvaluateSettleProd(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/evaluator/settle/export", this.listQuery1,
+      "导出"
+      );
+    }
+    }
+  }
+</script>
+<style scoped lang="scss">
+
+
+</style>

src/views/finance/fundList.vue

@@ -277,6 +277,8 @@ export default {
       },
       createdRealFundDialog: false,
       claimListDialog:false,
+      payDate:'',
+      claimListData:null,
       realFund:{
         id:null,
         payer:null,

src/views/finance/settleMajor.vue

@@ -9,7 +9,7 @@
             <template slot="left">
               <el-date-picker  clearable v-model="findDate" type="daterange" align="center" unlink-panels
                             range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
-                            value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
+                            value-format="yyyy-MM-dd" style="float: left;">
               </el-date-picker>
               <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable style="margin-left: 20px;width: 200px;float: left;">
               </el-input>
@@ -23,7 +23,7 @@
               </el-button>
               <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
               </el-button>
-              <el-button class="filter-item" style="float: left;" round type="info" @click="exportOverdueMajor()">导出
+              <el-button class="filter-item" style="float: left;" round type="info" @click="exportEvaluateSettleProd()">导出
               </el-button>
             </template>
             <parentTable :data="evaluatorProd.records" slot="table" style="width: 100%;">
@@ -39,7 +39,7 @@
               </el-table-column>
               <el-table-column label="结算日期"  width="100" align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.settleDate }}</span>
+                  <span style="color:red">{{ row.settleDate }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="认领日期"  width="100" align="center">
@@ -104,7 +104,133 @@
               </el-table-column> -->
               <el-table-column label="结算金额(元)"  align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.claimAmount }}</span>
+                  <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="评估价值(万元)"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.evaluateAmount/10000 }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票日期"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.invoiceDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票人"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.invoiceUser }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="发票号"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.invoiceNo }}</span>
+                </template>
+              </el-table-column>
+            </parentTable>
+          </y-page-list-layout>
+        </el-tab-pane>
+        <el-tab-pane label="市场人员" name="market">
+          <y-page-list-layout :get-page-list="majorMarketSettleProd" :page-list="marketProd" :page-para="listQuery2">
+            <template slot="left">
+              <el-date-picker  clearable v-model="findDate1" type="daterange" align="center" unlink-panels
+                            range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
+                            value-format="yyyy-MM-dd" style="float: left;">
+              </el-date-picker>
+              <el-input v-model="listQuery2.orderId" placeholder="项目编号" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery2.reportNo" placeholder="产品号" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery2.principal" placeholder="负责人" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-input v-model="listQuery2.clientManager" placeholder="客户经理" clearable style="margin-left: 20px;width: 200px;float: left;">
+              </el-input>
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList2()" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch2()">重置
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="exportMarketSettleProd()">导出
+              </el-button>
+            </template>
+            <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
+              <el-table-column label="项目编号"  width="110" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.orderId }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="产品号" width="200" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.reportNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="结算日期"  width="100" align="center">
+                <template slot-scope="{row}">
+                  <span style="color:red">{{ row.settleDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="认领日期"  width="100" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.claimDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="送达日期"  width="100" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.deliveryDate}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="项目名称"  width="200" align="center"  show-overflow-tooltip>
+                <template slot-scope="{row}">
+                  <span>{{ row.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户名称"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="业务来源"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientSubName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="委托方"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.bailor }}</span>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="分配产值"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientSubName }}</span>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="市场部"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.marketDepartmentName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="评估部"   align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.evaluateDepartmentName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户经理" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.clientManager }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="负责人"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.principal }}</span>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column label="参与人"  align="center">
+                <template slot-scope="{row}">
+                  <span>{{ row.principal }}</span>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="结算金额(元)"  align="center">
+                <template slot-scope="{row}">
+                  <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="评估价值(万元)"  align="center">
@@ -154,10 +280,12 @@
           startDate:'2024-05-01 00:00:00',
           endDate:'2024-06-01 00:00:00'
         },
-        listQuery2: {
+         listQuery2: {
           page: 1,
           size: 10,
-          descs: 'id'
+          descs: 'id',
+          startDate:'2024-05-01 00:00:00',
+          endDate:'2024-06-01 00:00:00'
         },
         pickerOptions: {
                 shortcuts: [{
@@ -185,8 +313,9 @@
                         picker.$emit('pick', [start, end]);
                     }
                 }]
-            },
-        findDate: '',
+        },
+        findDate: [],
+        findDate1: [],
         evaluatorProd:{
           records:[]
         },
@@ -196,12 +325,35 @@
       }
     },
     created() {
-        this.majorEvaluatorSettleProd();
+      this.findDate.push(this.getDefaultStartDate());
+      this.findDate.push(this.getDefaultEndDate());
+      this.findDate1.push(this.getDefaultStartDate());
+      this.findDate1.push(this.getDefaultEndDate());
+      this.majorEvaluatorSettleProd();
     },
     methods: {
+
+      getDefaultStartDate(){
+        const currentDate = new Date();
+        const currentYear = currentDate.getFullYear();
+        var currentMonth = String(currentDate.getMonth()).padStart(2,"0");
+        return currentYear+'-'+currentMonth+'-'+'23'
+      },
+
+      getDefaultEndDate(){
+        const currentDate = new Date();
+        const currentYear = currentDate.getFullYear();
+        var currentMonth = String(currentDate.getMonth() + 1).padStart(2,"0");
+        return currentYear+'-'+currentMonth+'-'+'22'
+      },
    
       handleClick(tab, event) {
-      
+          if (tab.name==='market'){
+              this.majorMarketSettleProd();
+          }
+          if (tab.name==='evaluate'){
+            this.majorEvaluatorSettleProd()
+          }
       },
 
         
@@ -229,7 +381,35 @@
       this.majorEvaluatorSettleProd()
     },
 
+    resetSearch2() {
+      this.$router.push({ query: {} });
+      this.findDate2 = '';
+      this.listQuery2 = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+        startDate:null,
+        endDate:null,
+      }
+      this.majorMarketSettleProd()
+    },
+   
+    searchList2() {
+      // 重置分页
+      this.listQuery2.page = 1
+      this.listQuery2.size = 10
+      if (this.findDate){
+        this.listQuery2.startDate = this.findDate2[0]+' 00:00:00';
+        this.listQuery2.endDate = this.findDate2[1]+ ' 23:59:59';
+      }
+      this.majorMarketSettleProd()
+    },
+
     majorEvaluatorSettleProd(){
+        if (this.findDate){
+          this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
+          this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
+        }
         this.$api.financeRealFund.majorEvaluatorSettleProd(this.listQuery1).then(res=>{
           if (res.code === 200){
               this.evaluatorProd = res.data;
@@ -237,15 +417,25 @@
         })
       },
     majorMarketSettleProd(){
+      if (this.findDate1){
+        this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
+        this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
+      }
       this.$api.financeRealFund.majorMarketSettleProd(this.listQuery2).then(res=>{
         if (res.code === 200){
             this.marketProd = res.data;
         }
       })
     },
-    exportOverdueMajor(){
+    exportMarketSettleProd(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/market/settle/export", this.listQuery2,
+      "导出"
+      );
+    },
+    exportEvaluateSettleProd(){
       this.$utils.exportUtil(
-      "/financeRealFund/overdue/major/export", this.listQuery1,
+      "/financeRealFund/major/evaluator/settle/export", this.listQuery1,
       "导出"
       );
     }