Merge branch 'wyz' into 'test'

优化应收统计查询

See merge request !164

src/api/financial/commission.js

@@ -428,6 +428,14 @@ export function receivableReport(data) {
     data: data
     data: data
   })
   })
 }
 }
+// 应收款报表统计
+export function receivableStatistics(data) {
+  return request({
+    url: '/csf/api/CommissionExpected/receivable_report/statistics',
+    method: 'post',
+    data: data
+  })
+}
 
 
 // 薪资拆分应发信息汇总列表
 // 薪资拆分应发信息汇总列表
 export function salarySummary(data) {
 export function salarySummary(data) {

src/views/financialCenter/receivables.vue

@@ -316,6 +316,7 @@ import {
   commissionExpectedRecord,
   commissionExpectedRecord,
   addReceivedFortune,
   addReceivedFortune,
   receivableReport,
   receivableReport,
+  receivableStatistics,
   CommissionExpectedChangeStatus,
   CommissionExpectedChangeStatus,
   commissionExchangeRateApi
   commissionExchangeRateApi
 } from '@/api/financial/commission'
 } from '@/api/financial/commission'
@@ -797,17 +798,19 @@ const loadTableData = async () => {
       pageSize: pageSize.value
       pageSize: pageSize.value
     }
     }
     const response = await receivableReport(params)
     const response = await receivableReport(params)
+    const response2 = await receivableStatistics(params)
     tableData.value = response.data.page.records || []
     tableData.value = response.data.page.records || []
     pageTotal.value = response.data.page.total || 0
     pageTotal.value = response.data.page.total || 0
     pageSize.value = response.data.page.size || 50
     pageSize.value = response.data.page.size || 50
-
+    if (response2.data && response2.data.statisticsVO) {
       // 统计信息
       // 统计信息
       statisticsData.value = {
       statisticsData.value = {
-      totalAmount: response.data.statisticsVO.totalAmount,
-      totalPaidAmount: response.data.statisticsVO.totalPaidAmount,
-      pendingPaidAmount: response.data.statisticsVO.pendingPaidAmount,
-      paidAmountRatio: response.data.statisticsVO.paidAmountRatio,
-      totalPolicyCount: response.data.statisticsVO.totalPolicyCount
+        totalAmount: response2.data.statisticsVO.totalAmount,
+        totalPaidAmount: response2.data.statisticsVO.totalPaidAmount,
+        pendingPaidAmount: response2.data.statisticsVO.pendingPaidAmount,
+        paidAmountRatio: response2.data.statisticsVO.paidAmountRatio,
+        totalPolicyCount: response2.data.statisticsVO.totalPolicyCount
+      }
     }
     }
   } catch (error) {
   } catch (error) {
     console.error('加载数据失败:', error)
     console.error('加载数据失败:', error)