绩效工资人员列表

src/api/modules/businessIncome.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+/*
+* 人员收入
+*/
+export default {
+  myMajorIncome(params) {
+    return request.get(`businessIncome/my/major`, { params: params })
+  },
+
+}

src/api/modules/financeRealFund.js

@@ -35,5 +35,11 @@ export default {
   },
   majorEvaluatorCommissionDetail(params){
     return request.get(`financeRealFund/commission/major/evaluator/detail`, { params: params })
+  },
+  majorMarketCommission(params) {
+    return request.get(`financeRealFund/commission/major/market`, { params: params })
+  },
+  majorMarketCommissionDetail(params){
+    return request.get(`financeRealFund/commission/major/market/detail`, { params: params })
   }
 }

src/router/urlMap.js

@@ -122,6 +122,7 @@ 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'
+import _views_income_mine from '@/views/income/myIncome'
 
 export default {
   _views_set_menu,
@@ -232,6 +233,7 @@ export default {
   _views_income_assets_declare_market,
   _views_finance_fund_warning,
   _views_finance_settle_major,
-  _views_finance_major_commission_calculate
+  _views_finance_major_commission_calculate,
+  _views_income_mine
 
 }

src/views/complex/index.vue

@@ -839,7 +839,7 @@ export default {
         return;
       }
       if (row.nodeCode === 'REPORT_OUT_FINANCE_CHECK' || row.nodeCode === 'REPORT_OUT_DEPARTMENT_CHECK' || row.nodeCode === 'LETTER_OUT_FINANCE_CHECK' || row.nodeCode === 'LETTER_OUT_DEPARTMENT_CHECK') {
-        this.$router.push(`/out/warehouse/check?todoBusinessId=${row.businessId}&sNo=${statementNo}&rNo=${reportNo}&tId=${row.taskId}&cId=${row.currentNodeId}&nCode=${row.nodeCode}&businessType=PERSONAL_BUSINESS`)
+        this.$router.push(`/out/warehouse/check?todoBusinessId=${row.businessId}&sNo=${statementNo}&rNo=${reportNo}&tId=${row.taskId}&cId=${row.currentNodeId}&nCode=${row.nodeCode}&businessType=MAJOR_BUSINESS`)
         return;
       }
       if (row.nodeCode === 'BUSINESS_ARCHIVING') {

src/views/finance/calculateMajor.vue

@@ -6,15 +6,22 @@
       <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
+              <el-date-picker  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;">
+                            value-format="yyyy-MM-dd" style="float: left; width: 300px;">
               </el-date-picker>
+              <el-input v-model="listQuery1.userName" 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="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 class="filter-item" style="float: left;" round type="info" @click="evaluatorTotalAmountExport()">导出合计
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="evaluatorCurUserDetailExport()">导出当前员工提成详情
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="evaluatorAllUserDetailExport()">导出所有员工提成详情
               </el-button>
             </div>
             <div style="width: 100%;">
@@ -22,9 +29,9 @@
                 fit
                 stripe
                 highlight-current-row
-                @row-click="userAmountDetail"
+                @row-click="evaluatorAmountDetail"
                 :header-row-style="{ color: '#333333','font-size':'14px'}"
-                style=" width: 21.2%; float: left;
+                style=" width: 18.1%; float: left;
                   border-left: 1px solid #ebeced;
                   border-right: 1px solid #ebeced;
                   color: #333333; font-size: 14px;
@@ -45,12 +52,17 @@
                   stripe
                   highlight-current-row
                   :header-row-style="{ color: '#333333','font-size':'14px'}"
-                  style=" width: 78%; float: right;
+                  style=" width: 80.5%; float: right;
                     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="产品号" width="200" align="center">
                   <template slot-scope="{row}">
                     <el-tag type="success">{{ row.reportNo }}</el-tag>
@@ -105,130 +117,116 @@
             </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
+          <div style="width: 100%; height: 50px;">
+              <el-date-picker  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;">
+                            value-format="yyyy-MM-dd" style="float: left; width: 300px;">
               </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 v-model="listQuery2.userName" 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 class="filter-item" style="float: left;" round type="info" @click="marketTotalAmountExport()">导出合计
               </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">
+              <el-button class="filter-item" style="float: left;" round type="info" @click="marketCurUserDetailExport()">导出当前员工提成详情
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="marketAllUserDetailExport()">导出所有员工提成详情
+              </el-button>
+            </div>
+            <div style="width: 100%;">
+              <el-table  :data="marketAmount" 
+                fit
+                stripe
+                highlight-current-row
+                @row-click="marketAmountDetail"
+                :header-row-style="{ color: '#333333','font-size':'14px'}"
+                style=" width: 18.1%; 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.invoiceDate }}</span>
+                  <span>{{ row.userName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="开票人"   align="center">
+              <el-table-column label="提成金额(元)"  align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.invoiceUser }}</span>
+                  <span>{{ row.commissionTotalAmount }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="发票号"   align="center">
+              </el-table>
+              <el-table :data="marketProd" 
+                  fit
+                  stripe
+                  highlight-current-row
+                  :header-row-style="{ color: '#333333','font-size':'14px'}"
+                  style=" width: 80.5%; float: right;
+                    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.invoiceNo }}</span>
+                  <span>{{ row.userName }}</span>
                 </template>
               </el-table-column>
-            </parentTable>
-          </y-page-list-layout>
+                <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-tabs>
   </div>
@@ -252,14 +250,16 @@
           size: 10,
           descs: 'id',
           startDate:'2024-05-01 00:00:00',
-          endDate:'2024-06-01 00:00:00'
+          endDate:'2024-06-01 00:00:00',
+          userName:null
         },
          listQuery2: {
           page: 1,
           size: 10,
           descs: 'id',
           startDate:'2024-05-01 00:00:00',
-          endDate:'2024-06-01 00:00:00'
+          endDate:'2024-06-01 00:00:00',
+          userName:null
         },
         pickerOptions: {
                 shortcuts: [{
@@ -292,9 +292,8 @@
         findDate1: [],
         evaluatorAmount:[],
         evaluatorProd:[],
-        marketProd:{
-          records:[]
-        }
+        marketAmount:[],
+        marketProd:[],
       }
     },
     created() {
@@ -322,25 +321,23 @@
    
       handleClick(tab, event) {
           if (tab.name==='market'){
-              this.majorMarketSettleProd();
+              this.majorMarketEvaluatorAmount();
           }
           if (tab.name==='evaluate'){
-            this.majorEvaluatorSettleProd()
+            this.majorEvaluatorAmount()
           }
       },
 
         
     resetSearch1() {
       this.$router.push({ query: {} });
-      this.findDate = '';
       this.listQuery1 = {
         current: 1,
         size: 10,
         descs: 'id',
-        startDate:null,
-        endDate:null,
+        userName:null,
       }
-      this.resetSearch1()
+      this.searchList1()
     },
    
     searchList1() {
@@ -356,28 +353,28 @@
 
     resetSearch2() {
       this.$router.push({ query: {} });
-      this.findDate2 = '';
       this.listQuery2 = {
         current: 1,
         size: 10,
         descs: 'id',
-        startDate:null,
-        endDate:null,
+        userName:null,
       }
-      this.majorMarketSettleProd()
+      this.searchList2()
     },
    
     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';
+      if (this.findDate1){
+        this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
+        this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
       }
-      this.majorMarketSettleProd()
+      this.majorMarketEvaluatorAmount()
     },
 
+    
+
     majorEvaluatorAmount(){
         if (this.findDate){
           this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
@@ -393,38 +390,84 @@
                       this.evaluatorProd = res.data;
                   }
                 })
+              }else {
+                  this.evaluatorProd = []
               }
           }
         })
       },
-      userAmountDetail(row, column, event){
-        this.listQuery1.userId = row.id;
-        this.$api.financeRealFund.majorEvaluatorCommissionDetail(this.listQuery1).then(res=>{
+    evaluatorAmountDetail(row, column, event){
+      this.listQuery1.userId = row.id;
+      this.$api.financeRealFund.majorEvaluatorCommissionDetail(this.listQuery1).then(res=>{
+        if (res.code === 200){
+            this.evaluatorProd = res.data;
+        }
+      })
+    },
+
+    majorMarketEvaluatorAmount(){
+        if (this.findDate1){
+          this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
+          this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
+        }
+        this.$api.financeRealFund.majorMarketCommission(this.listQuery2).then(res=>{
           if (res.code === 200){
-              this.evaluatorProd = res.data;
+              this.marketAmount = res.data;
+              if (this.marketAmount.length > 0){
+                this.listQuery2.userId = this.marketAmount[0].id;
+                this.$api.financeRealFund.majorMarketCommissionDetail(this.listQuery2).then(res=>{
+                  if (res.code === 200){
+                      this.marketProd = res.data;
+                  }
+                })
+              }else {
+                  this.marketProd = []
+              }
           }
         })
       },
-    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=>{
+    marketAmountDetail(row, column, event){
+      this.listQuery2.userId = row.id;
+      this.$api.financeRealFund.majorMarketCommissionDetail(this.listQuery2).then(res=>{
         if (res.code === 200){
             this.marketProd = res.data;
         }
       })
     },
-    exportMarketSettleProd(){
+
+    evaluatorTotalAmountExport(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/evaluator/commission/total/export", this.listQuery1,
+      "导出"
+      );
+    },
+    evaluatorCurUserDetailExport(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/evaluator/commission/current/export", this.listQuery1,
+      "导出"
+      );
+    },
+    evaluatorAllUserDetailExport(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/evaluator/commission/all/export", this.listQuery1,
+      "导出"
+      );
+    },
+    marketTotalAmountExport(){
+      this.$utils.exportUtil(
+      "/financeRealFund/major/market/commission/total/export", this.listQuery2,
+      "导出"
+      );
+    },
+    marketCurUserDetailExport(){
       this.$utils.exportUtil(
-      "/financeRealFund/major/market/settle/export", this.listQuery2,
+      "/financeRealFund/major/market/commission/current/export", this.listQuery2,
       "导出"
       );
     },
-    exportEvaluateSettleProd(){
+    marketAllUserDetailExport(){
       this.$utils.exportUtil(
-      "/financeRealFund/major/evaluator/settle/export", this.listQuery1,
+      "/financeRealFund/major/market/commission/all/export", this.listQuery2,
       "导出"
       );
     }

src/views/finance/outWarehouseCheck.vue

@@ -192,10 +192,7 @@ export default {
       this.getList()
     },
     getList() {
-      this.listQuery.keyword = this.$route.query.sNo;
-      if (this.$route.query.businessType === 'ASSET_BUSINESS') {
-        this.listQuery.keyword = this.$route.query.rNo;
-      }
+      this.listQuery.keyword = this.$route.query.rNo;
       this.$api.productionOutWarehouse.list(Object.assign({businessType:this.businessType}, this.listQuery)).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;

src/views/finance/settleMajor.vue

@@ -67,7 +67,7 @@
                   <span>{{ row.clientSubName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="委托方"   align="center">
+              <el-table-column label="委托方"  width="200" align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.bailor }}</span>
                 </template>
@@ -193,7 +193,7 @@
                   <span>{{ row.clientSubName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="委托方"   align="center">
+              <el-table-column label="委托方" width="100"  align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.bailor }}</span>
                 </template>
@@ -399,8 +399,8 @@
       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.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
+        this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
       }
       this.majorMarketSettleProd()
     },

src/views/income/major/evaluate.vue

@@ -35,7 +35,7 @@
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" width="150" align="center"  >
+        <el-table-column label="项目名称" width="160" align="center"  show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.name?row.name:row.orderName }}</span>
           </template>
@@ -45,7 +45,7 @@
             <span>{{ row.reportNo?row.reportNo:'--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="评估对象类别" align="center">
+        <el-table-column label="对象类别" align="center">
           <template slot-scope="{row}">
             <span>{{ row.businessObjectType }}</span>
           </template>
@@ -55,7 +55,7 @@
             <span>{{ row.bailor }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托联系人" align="center" >
+        <el-table-column label="联系人" align="center" >
           <template slot-scope="{row}">
             <span>{{ row.bailorContactName }}</span>
           </template>
@@ -80,12 +80,12 @@
             <span>{{ row.principal }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" >
+        <el-table-column label="下单时间"  width="110" align="center" >
           <template slot-scope="{row}">
             <span>{{ row.orderCreated}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="提成类型" width="150" align="center">
+        <el-table-column label="提成类型" width="150" align="center"  show-overflow-tooltip>
           <template slot-scope="{row}">
             <span style="color:red">{{ row.commissionType?row.commissionType:'--'}}</span>
           </template>

src/views/income/major/market.vue

@@ -40,7 +40,7 @@
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" width="150" align="center">
+        <el-table-column label="项目名称" width="160" align="center" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.name ? row.name : row.orderName }}</span>
           </template>
@@ -50,7 +50,7 @@
             <span>{{ row.reportNo ? row.reportNo : '--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="评估对象类别" align="center">
+        <el-table-column label="对象类别" align="center">
           <template slot-scope="{row}">
             <span>{{ row.businessObjectType }}</span>
           </template>
@@ -60,7 +60,7 @@
             <span>{{ row.bailor }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托联系人" align="center">
+        <el-table-column label="联系人" align="center">
           <template slot-scope="{row}">
             <span>{{ row.bailorContactName }}</span>
           </template>
@@ -85,12 +85,12 @@
             <span>{{ row.principal }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center">
+        <el-table-column label="下单时间" width="110" align="center">
           <template slot-scope="{row}">
             <span>{{ row.orderCreated }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="提成类型" width="150" align="center">
+        <el-table-column label="提成类型" width="150" align="center" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span style="color:red">{{ row.commissionType ? row.commissionType : '--' }}</span>
           </template>

src/views/income/myIncome.vue

@@ -0,0 +1,211 @@
+<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="major">
+          <y-page-list-layout :page-list="majorIncome" :page-para="listQuery1" :get-page-list="getMyMajorIncome">
+            <template slot="left">
+              <el-date-picker  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; width: 300px;">
+              </el-date-picker>
+              <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList()" round>搜索
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="exportDetail()">导出
+              </el-button>
+            </template>
+            <parentTable slot="table" :data="majorIncome.records" style=" width: 100%;">
+            <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.userType }}</span>
+              </template>
+            </el-table-column>
+              <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>
+            </parentTable>
+          </y-page-list-layout>
+        </el-tab-pane>
+        <el-tab-pane label="个贷业务" name="personal">
+
+        </el-tab-pane>
+        <el-tab-pane label="资产业务" name="assets">
+          
+        </el-tab-pane>
+      </el-tabs>
+  
+  </div>
+</template>
+<script>
+  import Breadcrumb from '@/components/Breadcrumb'
+  import YPageListLayout from '@/components/YPageListLayout'
+
+  export default {
+    name: 'myIncome',
+    components: {
+      Breadcrumb,
+      YPageListLayout
+    },
+
+    data() {
+      return {
+        activeName:'major',
+        listQuery1: {
+          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: [],
+        majorIncome:{
+          records:[]
+        }
+      }
+    },
+    created() {
+      this.findDate.push(this.getDefaultStartDate());
+      this.findDate.push(this.getDefaultEndDate());
+      this.getMyMajorIncome();
+    },
+    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==='major'){
+              this.getMyMajorIncome();
+          }
+      },
+        
+      resetSearch() {
+        this.$router.push({ query: {} });
+        this.listQuery1 = {
+          current: 1,
+          size: 10,
+          descs: 'id',
+        }
+        this.getMyMajorIncome()
+      },
+    
+      searchList() {
+        // 重置分页
+        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.getMyMajorIncome()
+      },
+
+      getMyMajorIncome(){
+        this.$api.businessIncome.myMajorIncome(this.listQuery1).then(res=>{
+          if (res.code === 200){
+              this.majorIncome = res.data;
+          }
+        })
+      }
+  
+    }
+  }
+</script>
+<style scoped lang="scss">
+
+
+</style>

src/views/major/todoList.vue

@@ -250,7 +250,7 @@ export default {
          return;
       }
       if (row.nodeCode === 'REPORT_OUT_FINANCE_CHECK' || row.nodeCode === 'REPORT_OUT_DEPARTMENT_CHECK' || row.nodeCode === 'LETTER_OUT_FINANCE_CHECK' || row.nodeCode === 'LETTER_OUT_DEPARTMENT_CHECK'){
-         this.$router.push(`/out/warehouse/check?todoBusinessId=${row.businessId}&sNo=${statementNo}&rNo=${reportNo}&tId=${row.taskId}&cId=${row.currentNodeId}&nCode=${row.nodeCode}&businessType=PERSONAL_BUSINESS`)
+         this.$router.push(`/out/warehouse/check?todoBusinessId=${row.businessId}&sNo=${statementNo}&rNo=${reportNo}&tId=${row.taskId}&cId=${row.currentNodeId}&nCode=${row.nodeCode}&businessType=MAJOR_BUSINESS`)
          return;
       }
       if (row.nodeCode === 'BUSINESS_ARCHIVING'){