财务统计部分修改，加上到账时间

src/components/Pagination/index.vue

@@ -54,7 +54,7 @@ export default {
     hidden: {
       type: Boolean,
       default: false
-    }
+    },
   },
   computed: {
     currentPage: {

src/components/YPageListLayout/index.vue

@@ -22,7 +22,7 @@
     <template>
       <slot name="table"></slot>
     </template>
-    <pagination style="border: 1px solid #EBECED" v-if="pageList.total>0" :total="pageList.total" :page.sync="pagePara.current" :limit.sync="pagePara.size" @pagination="getPageList" />
+    <pagination style="border: 1px solid #EBECED" v-if="pageList.total>0" :total="pageList.total" :page.sync="pagePara.current" :limit.sync="pagePara.size" @pagination="getPageList" :pageSizes="pageSizes"/>
   </div>
 </template>
 
@@ -52,6 +52,12 @@
 
           }
         },
+        pageSizes:{
+          type: Array,
+          default() {
+            return [10, 20, 30, 50,100]
+          }
+        }
       },
       data(){
           return{

src/views/finance/assetsRealFundStat.vue

@@ -6,11 +6,18 @@
         <div>
             <y-page-list-layout :get-page-list="getAssetsSate" :page-list="pageData" :page-para="listQuery">
                 <template slot="left">
-                    <el-date-picker style="margin-right: 20px;float: left;" v-model="selectDate" type="daterange"
+                    <el-input v-model="listQuery.keyword" placeholder="项目编号、产品号" clearable
+                    style="width: 300px;float: left;">
+                    </el-input>
+                    <el-date-picker style="margin-left: 20px;float: left;" v-model="selectDate" type="daterange"
                         :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd"
                         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                     </el-date-picker>
-                    <el-input v-model="listQuery.orderId" placeholder="项目编号" clearable style="width: 200px;margin-right: 20px;float: left;">
+                    <el-date-picker  clearable v-model="paymentDate" 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;">
+                    </el-date-picker>
+                    <!-- <el-input v-model="listQuery.orderId" placeholder="项目编号" clearable style="width: 200px;margin-right: 20px;float: left;">
                     </el-input>
                     <el-input v-model="listQuery.reportNo" placeholder="报告号" clearable style="width: 200px;margin-right: 20px;float: left;">
                     </el-input>
@@ -24,16 +31,16 @@
                     </el-select>
                     <el-input v-model="listQuery.claimAmount" placeholder="认领金额" clearable
                         style="width: 200px;margin-right: 20px;float: left;">
-                    </el-input>
+                    </el-input> -->
                     <el-select v-model="listQuery.assetsBusinessGener" placeholder="资产业务类型" clearable
-                        style="width: 200px;margin-right: 20px;float: left;">
+                        style="width: 100px;margin-left: 20px;float: left;">
                         <el-option v-for="(s, value) in assetsBusinessGeners" :label="s.label" :value="s.value"></el-option>
-                    </el-select>
-                    <el-select v-model="listQuery.ifSaveFile" placeholder="是否归档" clearable style="width: 200px;margin-right: 20px;float: left;">
+                    </el-select> 
+                    <el-select v-model="listQuery.ifSaveFile" placeholder="是否归档" clearable style="width: 100px;margin-left: 20px;float: left;">
                         <el-option label="已归档" value="true"></el-option>
                         <el-option label="未归档" value="false"></el-option>
                     </el-select>
-                    <el-button class="filter-item" type="primary" @click="searchList()" round>搜索
+                    <el-button class="filter-item" type="primary" @click="searchList()" round style="margin-left: 20px;">搜索
                     </el-button>
                     <el-button class="filter-item" round type="success" @click="resetParams()">重置
                     </el-button>
@@ -88,7 +95,7 @@
                             <span>{{ row.payer }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="入账时间" width="120" align="center">
+                    <el-table-column label="到账时间" width="120" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.payDateTime }}</span>
                         </template>
@@ -176,6 +183,7 @@ export default {
             listLoading: false,
             // 时间
             selectDate: '',
+            paymentDate: '',
             listQuery: {
                 page: 1,
                 size: 10,
@@ -190,7 +198,10 @@ export default {
                 claimUserId: null,
                 claimAmount: null,
                 assetsBusinessGener: null,
-                ifSaveFile: null
+                ifSaveFile: null,
+                keyword:null,
+                payStartTime:null,
+                payEndTime:null
             },
             // 用户下拉列表
             allUsers: [],
@@ -270,6 +281,7 @@ export default {
         resetParams() {
             this.exportStatus = true;
             this.selectDate = '';
+            this.paymentDate = '' ;
             this.$router.push({ query: {} });
             this.listQuery = {
                 current: 1,
@@ -282,6 +294,10 @@ export default {
                 this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
                 this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
             }
+            if (this.paymentDate) {
+                this.listQuery.payStartTime = this.paymentDate[0] + ' 00:00:00';
+                this.listQuery.payEndTime = this.paymentDate[1] + ' 23:59:59';
+            }
             this.$api.financeClaim.getAssetsSate(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;

src/views/finance/calculateMajor.vue

@@ -122,6 +122,10 @@
                             range-separator="至" start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
                             value-format="yyyy-MM-dd" style="float: left; width: 300px;">
               </el-date-picker>
+              <el-date-picker  clearable v-model="paymentDate1" 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;">
+            </el-date-picker>
               <el-input v-model="listQuery2.userName" placeholder="姓名" clearable
                 style="margin-left: 20px;width: 200px;float: left;">
               </el-input>
@@ -294,6 +298,7 @@
         evaluatorProd:[],
         marketAmount:[],
         marketProd:[],
+      
       }
     },
     created() {
@@ -348,6 +353,7 @@
         this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
         this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
       }
+    
       this.majorEvaluatorAmount()
     },
 
@@ -370,6 +376,7 @@
         this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
       }
+    
       this.majorMarketEvaluatorAmount()
     },
 
@@ -380,6 +387,7 @@
           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;
@@ -410,6 +418,7 @@
           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.marketAmount = res.data;

src/views/finance/fundClaim.vue

@@ -201,7 +201,7 @@
       <y-page-list-layout :page-list="myMajorPageData" :page-para="majorListQuery" :get-page-list="getMyMajor">
         <template slot="left">
           <el-switch style="width: 270px;float: left;margin-top: 5px;" v-model="toProd" active-color="#13ce66"
-            inactive-color="#ff4949" active-text="认领到产品" inactive-text="认领到订单">
+            inactive-color="#ff4949" active-text="认领到产品" inactive-text="认领到订单" disabled>
           </el-switch>
           <el-input v-model="majorListQuery.name" placeholder="订单/项目名称" clearable style="width: 270px;float: left;">
           </el-input>

src/views/finance/fundList.vue

@@ -3,7 +3,7 @@
     <div class="title-container">
       <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
-    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList" :pageSizes="pageSizes">
       <template slot="left">
         <PermissionButton menu-code="_views_finance_real_fund_create" class-name="filter-item" type="success" icon="el-icon-circle-plus-outline"
           :page-jump="false" round style="float: left" @click="createdRealFundDialog = true" />
@@ -25,23 +25,19 @@
           end-placeholder="到账时日（结束）"
           :picker-options="pickerOptions" value-format="yyyy-MM-dd">
         </el-date-picker>
-        <el-date-picker
-          style="margin-left: 20px;float: left;"
-          v-model="orderDate"
-          type="daterange"
-          align="center"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="录入时间（开始）"
-          end-placeholder="录入时间（结束）"
-          :picker-options="pickerOptions" value-format="yyyy-MM-dd">
-        </el-date-picker>
-        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" round>搜索
+        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" v-loading.fullscreen.lock="loading" round>搜索
         </el-button>
         <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
         </el-button>
+        <el-button class="filter-item" style="margin-left: 10px;float: left;"  type="info" @click="exportData()" round>导出
+        </el-button>
       </template>
-      <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
+      <el-table ref="table" size="medium" slot="table" :data="pageData.records" show-summary  border
+        :summary-method="getSummaries" fit stripe highlight-current-row
+        :header-row-style="{ color: '#333333' }" style="
+          border-left: 1px solid #ebeced;
+          border-right: 1px solid #ebeced;
+          color: #333333;">
         <el-table-column label="付款方" align="center" width='250' >
           <template slot-scope="{row}">
             <span>{{ row.payer }}</span>
@@ -52,12 +48,7 @@
             <span>{{ row.payerBank?row.payerBank:'-' }}</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="付款账号" align="center" width='100'>
-          <template slot-scope="{row}">
-            <span>{{ row.payerAccount?row.payerAccount:'-' }}</span>
-          </template>
-        </el-table-column> -->
-        <el-table-column label="付款金额(元)" align="center" >
+        <el-table-column label="付款金额(元)" align="center" prop="amount" >
           <template slot-scope="{row}">
             <span>{{ row.amount }}</span>
           </template>
@@ -67,12 +58,12 @@
             <span>{{ row.payDatetime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="已认领(元)" align="center">
+        <el-table-column label="已认领(元)" align="center" prop="claimAmount" >
           <template slot-scope="{row}">
             <span  style="color:green">{{ row.claimAmount }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="未认领(元)" align="center">
+        <el-table-column label="未认领(元)" align="center" prop="notClaimAmount" >
           <template slot-scope="{row}">
             <span style="color:red">{{ row.notClaimAmount }}</span>
           </template>
@@ -108,7 +99,7 @@
               :page-jump="false"  @click="remove(row.id)" />
           </template>
         </el-table-column>
-      </parentTable>
+      </el-table>
     </y-page-list-layout>
     <el-dialog :visible.sync="createdRealFundDialog" width="45%" center  custom-class="doWarehouseClass" @closed="cleanFund">
       <el-form ref="realFund" :model="realFund" >
@@ -263,21 +254,13 @@ export default {
     excelImport
   },
 
-  watch:{
-
-  },
-
-  computed:{
-
-  },
-
   
   data() {
     return {
       pageData: { records: [] },
       listQuery: {
         page: 1,
-        size: 20,
+        size: 500,
         descs: 'id',
         keyword:null,
         startDate:null,
@@ -303,7 +286,6 @@ export default {
       },
       payer:null,
       amount:null,
-      orderDate:'',
       pickerOptions: {
           shortcuts: [{
             text: '最近一周',
@@ -331,20 +313,20 @@ export default {
             }
           }]
       },
+      loading: false,
+      pageSizes:[10, 20, 30, 50,100,200,500,1000]
     }
   },
   created() {
     this.getList();
   },
   methods: {
-  
     resetSearch() {
       this.$router.push({ query: {} });
-      this.orderDate = '';
       this.payDate = '';
       this.listQuery = {
         current: 1,
-        size: 20,
+        size: 500,
         descs: 'id',
         notFinished:true
       }
@@ -352,24 +334,27 @@ export default {
     },
     searchList() {
       // 重置分页
+     
       this.listQuery.page = 1
-      this.listQuery.size = 20
+      this.listQuery.size = 500
       if (this.payDate){
         this.listQuery.startDate = this.payDate[0];
         this.listQuery.endDate = this.payDate[1];
       }
-      if (this.orderDate){
-        this.listQuery.xStartDate = this.orderDate[0]+' 00:00:00';
-        this.listQuery.xEndDate = this.orderDate[1]+ ' 23:59:59';
-      }
+     
       this.getList()
+     
     },
     getList() {
+      this.loading = true;
       this.$api.financeRealFund.list(Object.assign({}, this.listQuery)).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
         }
       })
+      setTimeout(() => {
+          this.loading = false;
+        }, 500);
     },
     saveRealFund(){
       this.$refs.realFund.validate(valid=>{
@@ -466,31 +451,6 @@ export default {
       })
     },
 
-
-    // doUpdateClaim(){
-    //   if (this.claimDTO.id){
-    //     this.$api.financeClaim.edit(this.claimDTO).then(res=>{
-    //       if (res.code === 200 && res.data){
-    //         this.$notify({
-    //                 title: '成功',
-    //                 message: '修改认领金额成功',
-    //                 type: 'success',
-    //                 duration: 2000
-    //               });
-    //         this.clamiList(this.claimDTO.realFundId);
-    //         this.getList();
-    //         this.allotAmountDialog = false;
-    //       }else {
-    //         this.$notify({
-    //                 title: '失败',
-    //                 message: '修改认领金额失败',
-    //                 type: 'error',
-    //                 duration: 2000
-    //           });
-    //       }
-    //     })
-    //   }
-    // },
     removeClaim(id){
       this.$confirm('请确认是否删除此条认领记录？','提示',{
         confirmButtonText: '确定',
@@ -540,32 +500,39 @@ export default {
       this.realFund.creator=null;
     },
 
-
-    downloadTemp(){
-      window.location.href  = "/api/financeClaim/personal/claim/template"
+    exportData(){
+      this.$utils.exportUtil(
+      "/financeRealFund/export", this.listQuery,
+      "导出"
+      );
     },
+    getSummaries(param){
+      const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += ' 元';
+          } else {
+            sums[index] = '-';
+          }
+        });
 
-    doClaimPersonal(){
-      this.$api.businessProduction.personalAllotRealAmount(this.claimOrders).then(res=>{
-        if (res.code === 200 && res.data){
-          this.$notify({
-            title: '成功',
-            message: '实收款认领成功',
-            type: 'success',
-            duration: 2000
-          });
-          this.getMyPersonalOrder();
-          this.allotAmountDialog = false;
-        }else {
-          this.$notify({
-            title: '失败',
-            message: '实收款认领失败',
-            type: 'error',
-            duration: 2000
-          });
-        }
-      })
-    },
+        return sums;
+    }
 
   },
   

src/views/finance/personalRealFundStat.vue

@@ -3,109 +3,111 @@
     <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="personal">
-          <y-page-list-layout :get-page-list="getPersonalStat" :page-list="personalStat" :page-para="listQuery1">
-            <template slot="left">
-              <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable style="width: 200px;float: left;">
-              </el-input>
-              <el-date-picker  clearable v-model="claimDate" 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;">
-              </el-date-picker>
-              <el-input v-model="listQuery1.claimAmount" placeholder="认领金额" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 20px;width: 200px;float: left;">
-                  <el-option :value="false" label="未归档">未归档</el-option>
-                  <el-option :value="true" label="已归档">已归档</el-option>
-              </el-select>
-              <el-input v-model="listQuery1.claimUser" 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="exportPersonalStat()">导出
-              </el-button>
-            </template>
-            <el-table
-              size="medium"
-              slot="table"
-              row-key="id"
-              :data="personalStat.records"
-              fit
-              highlight-current-row
-              :header-row-style="{color: '#333333'}"
-              style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
-              <el-table-column label="归档状况" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.ifSaveFile?'已归档':'未归档' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目编号" width="150"  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.location }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="所属部门"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.marketDepartment }}</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="入账日期" width="110" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.payDatetime }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领日期" width="110" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.claimDatetime }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="实收金额(元)"   align="center">
-                <template slot-scope="{row}">
-                  <span  style="color:red">{{ row.claimAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领人"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.claimUser }}</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.bailorA }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="评估价值(万元)"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.amount }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </y-page-list-layout>
-        </el-tab-pane>
-      </el-tabs>
+    <y-page-list-layout :get-page-list="getPersonalStat" :page-list="personalStat" :page-para="listQuery1">
+      <template slot="left">
+        <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable style="width: 150px;float: left;">
+        </el-input>
+        <el-date-picker  clearable v-model="claimDate" 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;">
+        </el-date-picker>
+        <el-date-picker  clearable v-model="paymentDate" 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;">
+        </el-date-picker>
+        <el-input v-model="listQuery1.claimAmount" placeholder="认领金额" clearable style="margin-left: 20px;width: 120px;float: left;">
+        </el-input>
+        <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 20px;width: 120px;float: left;">
+            <el-option :value="false" label="未归档">未归档</el-option>
+            <el-option :value="true" label="已归档">已归档</el-option>
+        </el-select>
+        <el-input v-model="listQuery1.claimUser" placeholder="认领人" clearable style="margin-left: 20px;width: 120px;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="exportPersonalStat()">导出
+        </el-button>
+      </template>
+      <el-table
+        size="medium"
+        slot="table"
+        row-key="id"
+        :data="personalStat.records"
+        fit
+        highlight-current-row
+        :header-row-style="{color: '#333333'}"
+        style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
+        <el-table-column label="序号" align="center" type="index">
+        </el-table-column>
+        <el-table-column label="归档状况" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.ifSaveFile?'已归档':'未归档' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" width="150"  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.location }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属部门"  align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.marketDepartment }}</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="到账日期" width="110" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.payDatetime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="认领日期" width="110" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.claimDatetime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实收金额(元)"   align="center">
+          <template slot-scope="{row}">
+            <span  style="color:red">{{ row.claimAmount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="认领人"  align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.claimUser }}</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.bailorA }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评估价值(万元)"  align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.amount }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </y-page-list-layout>
   </div>
 </template>
 <script>
@@ -120,7 +122,6 @@
     },
     data() {
       return {
-        activeName: 'personal',
         pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -149,6 +150,7 @@
                 }]
             },
         claimDate: '',
+        paymentDate:'',
         listQuery1: {
           page: 1,
           size: 10,
@@ -172,12 +174,15 @@
     resetSearch1() {
       this.$router.push({ query: {} });
       this.claimDate = '';
+      this.paymentDate= '';
       this.listQuery1 = {
         current: 1,
         size: 10,
         descs: 'id',
         startTime:null,
         endTime:null,
+        payStartTime:null,
+        payEndTime:null,
       }
       this.getPersonalStat()
     },
@@ -190,6 +195,10 @@
         this.listQuery1.startTime = this.claimDate[0]+' 00:00:00';
         this.listQuery1.endTime = this.claimDate[1]+ ' 23:59:59';
       }
+      if (this.paymentDate){
+        this.listQuery1.payStartTime = this.paymentDate[0]+' 00:00:00';
+        this.listQuery1.payEndTime = this.paymentDate[1]+ ' 23:59:59';
+      }
       this.getPersonalStat()
     },
 

src/views/finance/realFundStat.vue

@@ -3,157 +3,142 @@
     <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 :get-page-list="getMajorStat" :page-list="majorStat" :page-para="listQuery1">
-            <template slot="left">
-              <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable style="width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery1.reportNo" placeholder="产品号" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-date-picker  clearable v-model="claimDate" 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;">
-              </el-date-picker>
-              <el-input v-model="listQuery1.principal" placeholder="负责人" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery1.claimAmount" placeholder="认领金额" clearable style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 20px;width: 200px;float: left;">
+      <y-page-list-layout :get-page-list="getMajorStat" :page-list="majorStat" :page-para="listQuery1">
+        <template slot="left">
+          <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、人员、金额" clearable
+          style="width: 300px;float: left;">
+        </el-input>
+        <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 20px;width: 150px;float: left;">
                   <el-option :value="false" label="未归档">未归档</el-option>
                   <el-option :value="true" label="已归档">已归档</el-option>
               </el-select>
-              <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 200px;float: left;margin-left:20px;">
+              <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 150px;float: left;margin-left:20px;">
                   <el-option :value="true" label="金融">金融</el-option>
                   <el-option :value="false" label="非金融">非金融</el-option>
               </el-select>
-              <el-input v-model="listQuery1.claimUser" 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="exportMajorStat()">导出
-              </el-button>
+          <el-date-picker  clearable v-model="claimDate" 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;">
+          </el-date-picker>
+          <el-date-picker  clearable v-model="paymentDate" 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;">
+          </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="exportMajorStat()">导出
+          </el-button>
+        </template>
+        <el-table
+          size="medium"
+          slot="table"
+          row-key="id"
+          :data="majorStat.records"
+          fit
+          highlight-current-row
+          :header-row-style="{color: '#333333'}"
+          style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
+          <el-table-column label="序号" align="center" type="index">
+          </el-table-column>
+          <el-table-column label="分类" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.financial?'金融':'非金融' }}</span>
             </template>
-            <el-table
-              size="medium"
-              slot="table"
-              row-key="id"
-              :data="majorStat.records"
-              fit
-              highlight-current-row
-              :header-row-style="{color: '#333333'}"
-              style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
-              <el-table-column label="分类" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.financial?'金融':'非金融' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="是否归档" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.ifSaveFile?'已归档':'未归档' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目编号" width="150"  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="产品类型"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.productionType==='REPORT'?'报告':(row.productionType==='STATEMENT'?'意见书':'复评函')}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目名称"  width="200"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.name }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="市场部"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.marketDepartment }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="评估部"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.evaluateDepartment }}</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.membersName }}</span>
-                </template>
-              </el-table-column> -->
-              <!-- <el-table-column label="分配产值"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.prodValue }}</span>
-                </template>
-              </el-table-column> -->
-              <el-table-column label="入账时间" width="100" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.payDateTime }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领时间" width="100" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.claimDatetime }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="应收款(元)"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.prodShouldAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领金额(元)"   align="center">
-                <template slot-scope="{row}">
-                  <span  style="color:red">{{ row.claimAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="认领人"  align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.claimUser }}</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.evaluateAmount/10000 }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </y-page-list-layout>
-        </el-tab-pane>
-      </el-tabs>
+          </el-table-column>
+          <el-table-column label="是否归档" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.ifSaveFile?'已归档':'未归档' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目编号" width="150"  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="产品类型"  align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.productionType==='REPORT'?'报告':(row.productionType==='STATEMENT'?'意见书':'复评函')}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目名称"  width="200"   align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="市场部"  align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.marketDepartment }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="评估部"  align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.evaluateDepartment }}</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="到账时间" width="110" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.payDateTime }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="认领时间" width="110" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.claimDatetime }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="应收款(元)"   align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.orderShouldAmount }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="认领金额(元)"   align="center">
+            <template slot-scope="{row}">
+              <span  style="color:red">{{ row.claimAmount }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="认领人"  align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.claimUser }}</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.evaluateAmount/10000 }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </y-page-list-layout>
   </div>
 </template>
 <script>
@@ -168,7 +153,6 @@
     },
     data() {
       return {
-        activeName: 'major',
         pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -197,10 +181,12 @@
                 }]
             },
         claimDate: '',
+        paymentDate: '',
         listQuery1: {
           page: 1,
           size: 10,
           descs: 'id',
+          keyword:null
         },
         majorStat:{
           records:[]
@@ -220,12 +206,15 @@
     resetSearch1() {
       this.$router.push({ query: {} });
       this.claimDate = '';
+      this.paymentDate = '',
       this.listQuery1 = {
         current: 1,
         size: 10,
         descs: 'id',
         startDate:null,
         endDate:null,
+        payStartDate:null,
+        payEndDate:null
       }
       this.getMajorStat()
     },
@@ -238,6 +227,10 @@
         this.listQuery1.startDate = this.claimDate[0]+' 00:00:00';
         this.listQuery1.endDate = this.claimDate[1]+ ' 23:59:59';
       }
+      if (this.paymentDate){
+        this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
+        this.listQuery1.payEndDate = this.paymentDate[1]+ ' 23:59:59';
+      }
       this.getMajorStat()
     },
 

src/views/finance/settleAssets.vue

@@ -8,22 +8,17 @@
                 <y-page-list-layout :get-page-list="assetsEvaluatorSettleProd" :page-list="evaluatorProd"
                     :page-para="listQuery1">
                     <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="float: left;">
-                        </el-date-picker>
-                        <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable
-                            style="margin-left: 20px;width: 200px;float: left;">
-                        </el-input>
-                        <el-input v-model="listQuery1.reportNo" placeholder="产品号" clearable
-                            style="margin-left: 20px;width: 200px;float: left;">
-                        </el-input>
-                        <el-input v-model="listQuery1.principal" placeholder="负责人" clearable
-                            style="margin-left: 20px;width: 200px;float: left;">
-                        </el-input>
-                        <el-input v-model="listQuery1.clientManager" placeholder="客户经理" clearable
-                            style="margin-left: 20px;width: 200px;float: left;">
-                        </el-input>
+                        <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、负责人、客户经理" clearable
+                            style="width: 300px;float: left;">
+                            </el-input>
+                            <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;">
+                            </el-date-picker>
+                            <el-date-picker  clearable v-model="paymentDate" 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;">
+                            </el-date-picker>
                         <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary"
                             @click="searchList1()" round>搜索
                         </el-button>
@@ -34,32 +29,39 @@
                         </el-button>
                     </template>
                     <parentTable :data="evaluatorProd.records" slot="table" style="width: 100%;">
-                        <el-table-column label="项目编号" align="center">
+                        <el-table-column label="序号" align="center" type="index">
+                        </el-table-column>
+                        <el-table-column label="项目编号" width="110" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.orderId }}</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.productionNo }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="结算日期" align="center">
+                        <el-table-column label="结算日期" width="110" align="center">
                             <template slot-scope="{row}">
                                 <span style="color:red">{{ row.settleDate }}</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.claimDate }}</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.saveFileDate }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="项目名称" align="center" show-overflow-tooltip>
+                        <el-table-column label="到账日期" width="110" align="center">
+                        <template slot-scope="{row}">
+                            <span>{{ row.payDateTime }}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="项目名称" width="200"  align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
                                 <span>{{ row.projectName }}</span>
                             </template>
@@ -74,7 +76,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>
@@ -140,22 +142,17 @@
             <el-tab-pane label="市场人员" name="market">
                 <y-page-list-layout :get-page-list="assetsMarketSettleProd" :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-input v-model="listQuery2.keyword" placeholder="项目编号、产品号、负责人、客户经理" clearable
+                            style="width: 300px;float: left;">
+                            </el-input>
+                            <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="margin-left: 20px;float: left;">
+                            </el-date-picker>
+                            <el-date-picker  clearable v-model="paymentDate1" 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;">
+                            </el-date-picker>
                         <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary"
                             @click="searchList2()" round>搜索
                         </el-button>
@@ -166,6 +163,8 @@
                         </el-button>
                     </template>
                     <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
+                        <el-table-column label="序号" align="center" type="index">
+                        </el-table-column>
                         <el-table-column label="项目编号" width="110" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.orderId }}</span>
@@ -176,21 +175,26 @@
                                 <span>{{ row.productionNo }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="结算日期" width="100" align="center">
+                        <el-table-column label="结算日期" width="110" 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">
+                        <el-table-column label="认领日期" width="110" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.claimDate }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="送达日期" width="100" align="center">
+                        <el-table-column label="送达日期" width="110" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.deliveryDate }}</span>
                             </template>
                         </el-table-column>
+                        <el-table-column label="到账日期" width="110" align="center">
+                        <template slot-scope="{row}">
+                            <span>{{ row.payDateTime }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
                                 <span>{{ row.projectName }}</span>
@@ -291,14 +295,20 @@ export default {
                 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',
+                payStartDate:'',
+                payEndDate:'',
+                keyword: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',
+                payStartDate:'',
+                payEndDate:'',
+                keyword:null
             },
             pickerOptions: {
                 shortcuts: [{
@@ -334,7 +344,9 @@ export default {
             },
             marketProd: {
                 records: []
-            }
+            },
+            paymentDate:[],
+            paymentDate1:[]
         }
     },
     created() {
@@ -367,13 +379,16 @@ export default {
         },
         resetSearch1() {
             this.$router.push({ query: {} });
-            this.findDate = '';
+            this.findDate = [this.getDefaultStartDate(), this.getDefaultEndDate()];
+            this.paymentDate = [];
             this.listQuery1 = {
                 current: 1,
                 size: 10,
                 descs: 'id',
                 startDate: null,
                 endDate: null,
+                payStartDate:null,
+                payEndDate:null
             }
             this.assetsEvaluatorSettleProd()
         },
@@ -385,17 +400,24 @@ export default {
                 this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
                 this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
             }
+            if (this.paymentDate.length>1){
+                this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
+                this.listQuery1.payEndDate = this.paymentDate[1]+ ' 23:59:59';
+            }
             this.assetsEvaluatorSettleProd()
         },
         resetSearch2() {
             this.$router.push({ query: {} });
-            this.findDate1 = '';
+            this.findDate1 = [this.getDefaultStartDate(), this.getDefaultEndDate()];
+            this.paymentDate1 = [];
             this.listQuery2 = {
                 current: 1,
                 size: 10,
                 descs: 'id',
                 startDate: null,
                 endDate: null,
+                payStartDate:null,
+                payEndDate:null
             }
             this.assetsMarketSettleProd()
         },
@@ -407,6 +429,10 @@ export default {
                 this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
                 this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
             }
+            if (this.paymentDate1.length>1){
+                this.listQuery2.payStartDate = this.paymentDate1[0]+' 00:00:00';
+                this.listQuery2.payEndDate = this.paymentDate1[1]+ ' 23:59:59';
+            }
             this.assetsMarketSettleProd()
         },
         assetsEvaluatorSettleProd() {
@@ -414,6 +440,10 @@ export default {
                 this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
                 this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
             }
+            if (this.paymentDate.length>1){
+                this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
+                this.listQuery1.payEndDate = this.paymentDate[1]+ ' 23:59:59';
+                }
             this.$api.financeRealFund.assetsEvaluatorSettleProd(this.listQuery1).then(res => {
                 if (res.code === 200) {
                     this.evaluatorProd = res.data;
@@ -425,6 +455,10 @@ export default {
                 this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
                 this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
             }
+            if (this.paymentDate1.length>1){
+                this.listQuery2.payStartDate = this.paymentDate1[0]+' 00:00:00';
+                this.listQuery2.payEndDate = this.paymentDate1[1]+ ' 23:59:59';
+                }
             this.$api.financeRealFund.assetsMarketSettleProd(this.listQuery2).then(res => {
                 if (res.code === 200) {
                     this.marketProd = res.data;

src/views/finance/settleMajor.vue

@@ -7,22 +7,17 @@
       <el-tab-pane label="评估人员" name="evaluate">
         <y-page-list-layout :get-page-list="majorEvaluatorSettleProd" :page-list="evaluatorProd" :page-para="listQuery1">
           <template slot="left">
+            <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、负责人、客户经理" clearable
+              style="width: 300px;float: left;">
+            </el-input>
             <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;">
+              value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
             </el-date-picker>
-            <el-input v-model="listQuery1.orderId" placeholder="项目编号" clearable
-              style="margin-left: 20px;width: 200px;float: left;">
-            </el-input>
-            <el-input v-model="listQuery1.reportNo" placeholder="产品号" clearable
-              style="margin-left: 20px;width: 200px;float: left;">
-            </el-input>
-            <el-input v-model="listQuery1.principal" placeholder="负责人" clearable
-              style="margin-left: 20px;width: 200px;float: left;">
-            </el-input>
-            <el-input v-model="listQuery1.clientManager" placeholder="客户经理" clearable
-              style="margin-left: 20px;width: 200px;float: left;">
-            </el-input>
+            <el-date-picker  clearable v-model="paymentDate" 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;">
+              </el-date-picker>
             <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList1()"
               round>搜索
             </el-button>
@@ -32,6 +27,8 @@
             </el-button>
           </template>
           <parentTable :data="evaluatorProd.records" slot="table" style="width: 100%;">
+            <el-table-column label="序号" align="center" type="index">
+            </el-table-column>
             <el-table-column label="项目编号" width="110" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
@@ -42,21 +39,26 @@
                 <span>{{ row.reportNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="结算日期" width="100" align="center">
+            <el-table-column label="结算日期" width="110" 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">
+            <el-table-column label="认领日期" width="110" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.claimDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="归档日期" width="100" align="center">
+            <el-table-column label="归档日期" width="110" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.saveFileDate }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="到账日期" width="110" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.payDateTime }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.name }}</span>
@@ -72,7 +74,7 @@
                 <span>{{ row.clientSubName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="委托方" width="200" align="center">
+            <el-table-column label="委托方" width="100" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.bailor }}</span>
               </template>
@@ -138,22 +140,17 @@
       <el-tab-pane label="市场人员" name="market">
         <y-page-list-layout :get-page-list="majorMarketSettleProd" :page-list="marketProd" :page-para="listQuery2">
           <template slot="left">
+            <el-input v-model="listQuery2.keyword" placeholder="项目编号、产品号、负责人、客户经理" clearable
+              style="width: 300px;float: left;">
+            </el-input>
             <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;">
+              value-format="yyyy-MM-dd" style="margin-left:20px;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-date-picker  clearable v-model="paymentDate1" 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;">
+              </el-date-picker>
             <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList2()"
               round>搜索
             </el-button>
@@ -163,6 +160,8 @@
             </el-button>
           </template>
           <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
+            <el-table-column label="序号" align="center" type="index">
+            </el-table-column>
             <el-table-column label="项目编号" width="110" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
@@ -173,21 +172,26 @@
                 <span>{{ row.reportNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="结算日期" width="100" align="center">
+            <el-table-column label="结算日期" width="110" 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">
+            <el-table-column label="认领日期" width="110" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.claimDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="送达日期" width="100" align="center">
+            <el-table-column label="送达日期" width="110" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.deliveryDate }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="到账日期" width="110" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.payDateTime }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.name }}</span>
@@ -288,14 +292,20 @@ export default {
         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',
+        payStartDate:'',
+        payEndDate:'',
+        keyword: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',
+        payStartDate:'',
+        payEndDate:'',
+        keyword:null
       },
       pickerOptions: {
         shortcuts: [{
@@ -331,7 +341,9 @@ export default {
       },
       marketProd: {
         records: []
-      }
+      },
+      paymentDate:[],
+      paymentDate1:[]
     }
   },
   created() {
@@ -369,13 +381,16 @@ export default {
 
     resetSearch1() {
       this.$router.push({ query: {} });
-      this.findDate = [this.getDefaultStartDate(), this.getDefaultEndDate()];;
+      this.findDate = [this.getDefaultStartDate(), this.getDefaultEndDate()];
+      this.paymentDate = [];
       this.listQuery1 = {
         current: 1,
         size: 10,
         descs: 'id',
         startDate: null,
         endDate: null,
+        payStartDate:null,
+        payEndDate:null
       }
       this.majorEvaluatorSettleProd()
     },
@@ -388,11 +403,16 @@ export default {
         this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
         this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
       }
+      if (this.paymentDate.length>1){
+        this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
+        this.listQuery1.payEndDate = this.paymentDate[1]+ ' 23:59:59';
+      }
       this.majorEvaluatorSettleProd()
     },
 
     resetSearch2() {
       this.$router.push({ query: {} });
+      this.paymentDate1 = [];
       this.findDate1 = [this.getDefaultStartDate(), this.getDefaultEndDate()];
       this.listQuery2 = {
         current: 1,
@@ -400,6 +420,8 @@ export default {
         descs: 'id',
         startDate: null,
         endDate: null,
+        payStartDate:null,
+        payEndDate:null
       }
       this.majorMarketSettleProd()
     },
@@ -412,6 +434,10 @@ export default {
         this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
       }
+      if (this.paymentDate1.length>1){
+        this.listQuery2.payStartDate = this.paymentDate1[0]+' 00:00:00';
+        this.listQuery2.payEndDate = this.paymentDate1[1]+ ' 23:59:59';
+      }
       this.majorMarketSettleProd()
     },
 
@@ -420,6 +446,10 @@ export default {
         this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
         this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
       }
+      if (this.paymentDate.length>1){
+          this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
+          this.listQuery1.payEndDate = this.paymentDate[1]+ ' 23:59:59';
+        }
       this.$api.financeRealFund.majorEvaluatorSettleProd(this.listQuery1).then(res => {
         if (res.code === 200) {
           this.evaluatorProd = res.data;
@@ -431,6 +461,10 @@ export default {
         this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
       }
+      if (this.paymentDate1.length>1){
+          this.listQuery2.payStartDate = this.paymentDate1[0]+' 00:00:00';
+          this.listQuery2.payEndDate = this.paymentDate1[1]+ ' 23:59:59';
+        }
       this.$api.financeRealFund.majorMarketSettleProd(this.listQuery2).then(res => {
         if (res.code === 200) {
           this.marketProd = res.data;

src/views/major/myOrder.vue

@@ -85,7 +85,7 @@
                 size="mini"
                 :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
               <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
-              <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button>
+              <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
             </div>
             <div>
               <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clienteleName,row.clienteleSubName)">申请开票</el-button>
@@ -1245,6 +1245,7 @@ export default {
       this.orderProduction.orderName = row.orderName;
       this.orderProduction.realAmount = row.realAmount;
       this.orderProduction.orderFundId = row.orderFundId;
+      
     },
     getProductionList(orderFundId) {
       if (orderFundId) {