1.资产评估人员与市场人员提成计算开发

2.资产收款预警开发
3.资产结算页面开发

src/api/modules/financeRealFund.js

@@ -47,5 +47,20 @@ export default {
   },
   assetsEvaluatorCommissionDetail(params){
     return request.get(`financeRealFund/commission/assets/evaluator/detail`, { params: params })
+  },
+  assetsMarketCommission(params){
+    return request.get(`financeRealFund/commission/assets/market`, { params: params })
+  },
+  assetsMarketCommissionDetail(params){
+    return request.get(`financeRealFund/commission/assets/market/detail`, { params: params })
+  },
+  overdueAssets(params){
+    return request.get(`financeRealFund/overdue/assets`, { params: params })
+  },
+  assetsEvaluatorSettleProd(params){
+    return request.get(`financeRealFund/assets/evaluator/settle/prod`, { params: params })
+  },
+  assetsMarketSettleProd(params){
+    return request.get(`financeRealFund/assets/market/settle/prod`, { params: params })
   }
 }

src/router/urlMap.js

@@ -126,6 +126,7 @@ import _views_income_mine from '@/views/income/myIncome'
 import _views_assets_edit_order from '@/views/assets/addAssetsOrder'
 import _views_finance_assets_fund_stats from '@/views/finance/assetsRealFundStat'
 import _views_finance_assets_commission_calculate from '@/views/finance/calculateAssets'
+import _views_finance_settle_assets from '@/views/finance/settleAssets'
 
 export default {
   _views_set_menu,
@@ -240,6 +241,7 @@ export default {
   _views_income_mine,
   _views_assets_edit_order,
   _views_finance_assets_fund_stats,
-  _views_finance_assets_commission_calculate
+  _views_finance_assets_commission_calculate,
+  _views_finance_settle_assets
 
 }

src/views/finance/calculateAssets.vue

@@ -84,7 +84,7 @@
                         </el-table-column>
                         <el-table-column label="分配比例" align="center">
                             <template slot-scope="{row}">
-                                <span>{{ row.allotRatio * 100 }}%</span>
+                                <span>{{ row.allotRatio }}%</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="提成额(￥)" align="center">
@@ -158,7 +158,7 @@
                       border-right: 1px solid #ebeced;
                       color: #333333; font-size: 14px;
                     ">
-                        <el-table-column label="姓名" width="120" align="center">
+                        <el-table-column label="姓名" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.userName }}</span>
                             </template>
@@ -168,7 +168,7 @@
                                 <el-tag type="success">{{ row.reportNo }}</el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="项目名称" width="300" align="center" show-overflow-tooltip>
+                        <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
                             <template slot-scope="{row}">
                                 <span>{{ row.name }}</span>
                             </template>
@@ -178,32 +178,32 @@
                                 <span>{{ row.businessCate }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="提成比例" width="120" align="center">
+                        <el-table-column label="提成比例" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.ratio }}%</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="总提成额(￥)" width="120" align="center">
+                        <el-table-column label="总提成额(￥)" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.totalAmount }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="分配比例" width="120" align="center">
+                        <el-table-column label="分配比例" align="center">
                             <template slot-scope="{row}">
-                                <span>{{ row.allotRatio * 100 }}%</span>
+                                <span>{{ row.allotRatio }}%</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="提成额(￥)" width="120" align="center">
+                        <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="出报告日期" width="120" align="center">
+                        <el-table-column label="出报告日期" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.created }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="实收款(￥)" width="120" align="center">
+                        <el-table-column label="实收款(￥)" align="center">
                             <template slot-scope="{row}">
                                 <span>{{ row.realAmount }}</span>
                             </template>
@@ -224,7 +224,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import YPageListLayout from '@/components/YPageListLayout'
 
 export default {
-    name: 'calculateMajor',
+    name: 'calculateAssets',
     components: {
         Breadcrumb,
         YPageListLayout
@@ -292,31 +292,26 @@ export default {
         this.assetsEvaluatorAmount();
     },
     methods: {
-
         getDefaultStartDate() {
             const currentDate = new Date();
             const currentYear = currentDate.getFullYear();
             var currentMonth = String(currentDate.getMonth()).padStart(2, "0");
             return currentYear + '-' + currentMonth + '-' + '23'
         },
-
         getDefaultEndDate() {
             const currentDate = new Date();
             const currentYear = currentDate.getFullYear();
             var currentMonth = String(currentDate.getMonth() + 1).padStart(2, "0");
             return currentYear + '-' + currentMonth + '-' + '22'
         },
-
         handleClick(tab, event) {
             if (tab.name === 'market') {
-                this.majorMarketEvaluatorAmount();
+                this.assetsMarketAmount();
             }
             if (tab.name === 'evaluate') {
                 this.assetsEvaluatorAmount()
             }
         },
-
-
         resetSearch1() {
             this.$router.push({ query: {} });
             this.listQuery1 = {
@@ -327,7 +322,6 @@ export default {
             }
             this.searchList1()
         },
-
         searchList1() {
             // 重置分页
             this.listQuery1.page = 1
@@ -338,7 +332,6 @@ export default {
             }
             this.assetsEvaluatorAmount()
         },
-
         resetSearch2() {
             this.$router.push({ query: {} });
             this.listQuery2 = {
@@ -349,7 +342,6 @@ export default {
             }
             this.searchList2()
         },
-
         searchList2() {
             // 重置分页
             this.listQuery2.page = 1
@@ -358,7 +350,7 @@ export default {
                 this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
                 this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
             }
-            this.majorMarketEvaluatorAmount()
+            this.assetsMarketAmount()
         },
         assetsEvaluatorAmount() {
             if (this.findDate) {
@@ -389,18 +381,17 @@ export default {
                 }
             })
         },
-
-        majorMarketEvaluatorAmount() {
+        assetsMarketAmount() {
             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 => {
+            this.$api.financeRealFund.assetsMarketCommission(this.listQuery2).then(res => {
                 if (res.code === 200) {
                     this.marketAmount = res.data;
                     if (this.marketAmount.length > 0) {
                         this.listQuery2.userId = this.marketAmount[0].id;
-                        this.$api.financeRealFund.majorMarketCommissionDetail(this.listQuery2).then(res => {
+                        this.$api.financeRealFund.assetsMarketCommissionDetail(this.listQuery2).then(res => {
                             if (res.code === 200) {
                                 this.marketProd = res.data;
                             }
@@ -413,46 +404,45 @@ export default {
         },
         marketAmountDetail(row, column, event) {
             this.listQuery2.userId = row.id;
-            this.$api.financeRealFund.majorMarketCommissionDetail(this.listQuery2).then(res => {
+            this.$api.financeRealFund.assetsMarketCommissionDetail(this.listQuery2).then(res => {
                 if (res.code === 200) {
                     this.marketProd = res.data;
                 }
             })
         },
-
         evaluatorTotalAmountExport() {
             this.$utils.exportUtil(
-                "/financeRealFund/major/evaluator/commission/total/export", this.listQuery1,
+                "/financeRealFund/assets/evaluator/commission/total/export", this.listQuery1,
                 "导出"
             );
         },
         evaluatorCurUserDetailExport() {
             this.$utils.exportUtil(
-                "/financeRealFund/major/evaluator/commission/current/export", this.listQuery1,
+                "/financeRealFund/assets/evaluator/commission/current/export", this.listQuery1,
                 "导出"
             );
         },
         evaluatorAllUserDetailExport() {
             this.$utils.exportUtil(
-                "/financeRealFund/major/evaluator/commission/all/export", this.listQuery1,
+                "/financeRealFund/assets/evaluator/commission/all/export", this.listQuery1,
                 "导出"
             );
         },
         marketTotalAmountExport() {
             this.$utils.exportUtil(
-                "/financeRealFund/major/market/commission/total/export", this.listQuery2,
+                "/financeRealFund/assets/market/commission/total/export", this.listQuery2,
                 "导出"
             );
         },
         marketCurUserDetailExport() {
             this.$utils.exportUtil(
-                "/financeRealFund/major/market/commission/current/export", this.listQuery2,
+                "/financeRealFund/assets/market/commission/current/export", this.listQuery2,
                 "导出"
             );
         },
         marketAllUserDetailExport() {
             this.$utils.exportUtil(
-                "/financeRealFund/major/market/commission/all/export", this.listQuery2,
+                "/financeRealFund/assets/market/commission/all/export", this.listQuery2,
                 "导出"
             );
         }

src/views/finance/fundWarning.vue

@@ -1,161 +1,276 @@
 <template>
   <div class="app-container organization-index">
     <div class="title-container">
-      <breadcrumb id="breadcrumb-container" class="breadcrumb-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="getOverdueMajor" :page-list="overdueMajor" :page-para="listQuery1">
-            <template slot="left">
-              <el-input v-model="listQuery1.overdueMin" placeholder="最小超期天数" clearable style="width: 150px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery1.overdueMax" placeholder="最大超期天数" clearable style="margin-left: 20px;width: 150px;float: left;">
-              </el-input>
-              <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-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="exportOverdueMajor()">导出
-              </el-button>
-            </template>
-            <el-table
-              size="medium"
-              slot="table"
-              row-key="id"
-              :data="overdueMajor.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 style="color:red;font-weight: bold;">{{ row.overdueDay }}天</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="分单类型" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.allotType }}</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.production}}</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.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.evaluateAmount/10000 }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="订单应收款(元)"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.shouldAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="标准收费(元)"   align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.standardAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="出库时间"  width="160" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.repertoryOutTime }}</span>
-                </template>
-              </el-table-column>
-              
-            </el-table>
-          </y-page-list-layout>
-        </el-tab-pane>
-      </el-tabs>
+    <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="getOverdueMajor" :page-list="overdueMajor" :page-para="listQuery1">
+          <template slot="left">
+            <el-input v-model="listQuery1.overdueMin" placeholder="最小超期天数" clearable style="width: 150px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery1.overdueMax" placeholder="最大超期天数" clearable
+              style="margin-left: 20px;width: 150px;float: left;">
+            </el-input>
+            <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-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="exportOverdueMajor()">导出
+            </el-button>
+          </template>
+          <el-table size="medium" slot="table" row-key="id" :data="overdueMajor.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 style="color:red;font-weight: bold;">{{ row.overdueDay }}天</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分单类型" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.allotType }}</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.production }}</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.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.evaluateAmount / 10000 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单应收款(元)" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.shouldAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标准收费(元)" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.standardAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="出库时间" width="160" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.repertoryOutTime }}</span>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </y-page-list-layout>
+      </el-tab-pane>
+      <el-tab-pane label="资产预警" name="assets">
+        <y-page-list-layout :get-page-list="getOverdueAssets" :page-list="overdueAssets" :page-para="listQuery2">
+          <template slot="left">
+            <el-input v-model="listQuery2.overdueMin" placeholder="最小超期天数" clearable style="width: 150px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery2.overdueMax" placeholder="最大超期天数" clearable
+              style="margin-left: 20px;width: 150px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery2.orderId" placeholder="项目编号" clearable
+              style="margin-left: 20px;width: 200px;float: left;">
+            </el-input>
+            <el-input v-model="listQuery2.productionNo" 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-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="exportOverdueAssets()">导出
+            </el-button>
+          </template>
+          <el-table size="medium" slot="table" row-key="id" :data="overdueAssets.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 style="color:red;font-weight: bold;">{{ row.overdueDay }}天</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分单类型" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.allotType }}</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.productionNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="产品类型" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.productionType }}</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>
+            </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.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.evaluateAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单应收款(元)" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.shouldAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标准收费(元)" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.standardAmount }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="出库时间" width="160" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.repertoryOutTime }}</span>
+              </template>
+            </el-table-column>
+
+          </el-table>
+        </y-page-list-layout>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 <script>
-  import Breadcrumb from '@/components/Breadcrumb'
-  import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import YPageListLayout from '@/components/YPageListLayout'
 
-  export default {
-    name: 'fundWaning',
-    components: {
-      Breadcrumb,
-      YPageListLayout
-    },
+export default {
+  name: 'fundWaning',
+  components: {
+    Breadcrumb,
+    YPageListLayout
+  },
 
-    data() {
-      return {
-        activeName: 'major',
-        listQuery1: {
-          page: 1,
-          size: 10,
-          descs: 'id',
-          overdueMin:90
-        },
-        overdueMajor:{
-          records:[]
-        }
+  data() {
+    return {
+      activeName: 'major',
+      listQuery1: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+        overdueMin: 90
+      },
+      listQuery2: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+        overdueMin: 90
+      },
+      overdueMajor: {
+        records: []
+      },
+      overdueAssets: {
+        records: []
       }
-    },
-    created() {
+    }
+  },
+  created() {
+    this.getOverdueMajor();
+  },
+  methods: {
+
+    handleClick(tab, event) {
+      if (tab.name === 'major') {
         this.getOverdueMajor();
+      }
+      if (tab.name === 'assets') {
+        this.getOverdueAssets();
+      }
     },
-    methods: {
-   
-      handleClick(tab, event) {
-      
-      },
 
-        
+
     resetSearch1() {
       this.$router.push({ query: {} });
       this.listQuery1 = {
         current: 1,
         size: 10,
         descs: 'id',
-        overdueMin:90
+        overdueMin: 90
       }
       this.getOverdueMajor()
     },
-   
+
     searchList1() {
       // 重置分页
       this.listQuery1.page = 1
@@ -163,23 +278,49 @@
       this.getOverdueMajor()
     },
 
-    getOverdueMajor(){
-        this.$api.financeRealFund.overdueMajor(this.listQuery1).then(res=>{
-          if (res.code === 200){
-              this.overdueMajor = res.data;
-          }
-        })
-      },
-      exportOverdueMajor(){
-        this.$utils.exportUtil(
+    getOverdueMajor() {
+      this.$api.financeRealFund.overdueMajor(this.listQuery1).then(res => {
+        if (res.code === 200) {
+          this.overdueMajor = res.data;
+        }
+      })
+    },
+    exportOverdueMajor() {
+      this.$utils.exportUtil(
         "/financeRealFund/overdue/major/export", this.listQuery1,
         "导出"
       );
+    },
+    resetSearch2() {
+      this.$router.push({ query: {} });
+      this.listQuery2 = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+        overdueMin: 90
       }
+      this.getOverdueAssets();
+    },
+    searchList2() {
+      // 重置分页
+      this.listQuery2.page = 1
+      this.listQuery2.size = 10
+      this.getOverdueAssets();
+    },
+    getOverdueAssets() {
+      this.$api.financeRealFund.overdueAssets(this.listQuery2).then(res => {
+        if (res.code === 200) {
+          this.overdueAssets = res.data;
+        }
+      })
+    },
+    exportOverdueAssets() {
+      this.$utils.exportUtil(
+        "/financeRealFund/overdue/assets/export", this.listQuery2,
+        "导出"
+      );
     }
   }
+}
 </script>
-<style scoped lang="scss">
-
-
-</style>
+<style scoped lang="scss"></style>

src/views/finance/settleAssets.vue

@@ -0,0 +1,450 @@
+<template>
+    <div class="app-container organization-index">
+        <div class="title-container">
+            <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+        </div>
+        <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" style="margin-top: 10px;">
+            <el-tab-pane label="评估人员" name="evaluate">
+                <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-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>
+                    </template>
+                    <parentTable :data="evaluatorProd.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.productionNo }}</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.saveFileDate }}</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="委托方" width="200" 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 }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="开票日期" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.invoiceDate }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="开票人" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.invoiceUser }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发票号" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.invoiceNo }}</span>
+                            </template>
+                        </el-table-column>
+                    </parentTable>
+                </y-page-list-layout>
+            </el-tab-pane>
+            <el-tab-pane label="市场人员" name="market">
+                <y-page-list-layout :get-page-list="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-button class="filter-item" style="margin-left:20px;float: left;" type="primary"
+                            @click="searchList2()" round>搜索
+                        </el-button>
+                        <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch2()">重置
+                        </el-button>
+                        <el-button class="filter-item" style="float: left;" round type="info"
+                            @click="exportMarketSettleProd()">导出
+                        </el-button>
+                    </template>
+                    <parentTable :data="marketProd.records" slot="table" style="width: 100%;">
+                        <el-table-column label="项目编号" width="110" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.orderId }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="产品号" width="200" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.productionNo }}</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="委托方" width="100" 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 }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="开票日期" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.invoiceDate }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="开票人" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.invoiceUser }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发票号" align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.invoiceNo }}</span>
+                            </template>
+                        </el-table-column>
+                    </parentTable>
+                </y-page-list-layout>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+<script>
+import Breadcrumb from '@/components/Breadcrumb'
+import YPageListLayout from '@/components/YPageListLayout'
+
+export default {
+    name: 'settleAssets',
+    components: {
+        Breadcrumb,
+        YPageListLayout
+    },
+
+    data() {
+        return {
+            activeName: 'evaluate',
+            listQuery1: {
+                page: 1,
+                size: 10,
+                descs: 'id',
+                startDate: '2024-05-01 00:00:00',
+                endDate: '2024-06-01 00:00:00'
+            },
+            listQuery2: {
+                page: 1,
+                size: 10,
+                descs: 'id',
+                startDate: '2024-05-01 00:00:00',
+                endDate: '2024-06-01 00:00:00'
+            },
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }]
+            },
+            findDate: [],
+            findDate1: [],
+            evaluatorProd: {
+                records: []
+            },
+            marketProd: {
+                records: []
+            }
+        }
+    },
+    created() {
+        this.findDate.push(this.getDefaultStartDate());
+        this.findDate.push(this.getDefaultEndDate());
+        this.findDate1.push(this.getDefaultStartDate());
+        this.findDate1.push(this.getDefaultEndDate());
+        this.assetsEvaluatorSettleProd();
+    },
+    methods: {
+        getDefaultStartDate() {
+            const currentDate = new Date();
+            const currentYear = currentDate.getFullYear();
+            var currentMonth = String(currentDate.getMonth()).padStart(2, "0");
+            return currentYear + '-' + currentMonth + '-' + '23'
+        },
+        getDefaultEndDate() {
+            const currentDate = new Date();
+            const currentYear = currentDate.getFullYear();
+            var currentMonth = String(currentDate.getMonth() + 1).padStart(2, "0");
+            return currentYear + '-' + currentMonth + '-' + '22'
+        },
+        handleClick(tab, event) {
+            if (tab.name === 'market') {
+                this.assetsMarketSettleProd();
+            }
+            if (tab.name === 'evaluate') {
+                this.assetsEvaluatorSettleProd()
+            }
+        },
+        resetSearch1() {
+            this.$router.push({ query: {} });
+            this.findDate = '';
+            this.listQuery1 = {
+                current: 1,
+                size: 10,
+                descs: 'id',
+                startDate: null,
+                endDate: null,
+            }
+            this.assetsEvaluatorSettleProd()
+        },
+        searchList1() {
+            // 重置分页
+            this.listQuery1.page = 1
+            this.listQuery1.size = 10
+            if (this.findDate) {
+                this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
+                this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+            }
+            this.assetsEvaluatorSettleProd()
+        },
+        resetSearch2() {
+            this.$router.push({ query: {} });
+            this.findDate1 = '';
+            this.listQuery2 = {
+                current: 1,
+                size: 10,
+                descs: 'id',
+                startDate: null,
+                endDate: null,
+            }
+            this.assetsMarketSettleProd()
+        },
+        searchList2() {
+            // 重置分页
+            this.listQuery2.page = 1
+            this.listQuery2.size = 10
+            if (this.findDate) {
+                this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
+                this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
+            }
+            this.assetsMarketSettleProd()
+        },
+        assetsEvaluatorSettleProd() {
+            if (this.findDate) {
+                this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
+                this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+            }
+            this.$api.financeRealFund.assetsEvaluatorSettleProd(this.listQuery1).then(res => {
+                if (res.code === 200) {
+                    this.evaluatorProd = res.data;
+                }
+            })
+        },
+        assetsMarketSettleProd() {
+            if (this.findDate1) {
+                this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
+                this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
+            }
+            this.$api.financeRealFund.assetsMarketSettleProd(this.listQuery2).then(res => {
+                if (res.code === 200) {
+                    this.marketProd = res.data;
+                }
+            })
+        },
+        exportMarketSettleProd() {
+            this.$utils.exportUtil(
+                "/financeRealFund/assets/market/settle/export", this.listQuery2,
+                "导出"
+            );
+        },
+        exportEvaluateSettleProd() {
+            this.$utils.exportUtil(
+                "/financeRealFund/assets/evaluator/settle/export", this.listQuery1,
+                "导出"
+            );
+        }
+    }
+}
+</script>
+<style scoped lang="scss"></style>
+