Merge remote-tracking branch 'origin/dev' into prod

8d346c7b · zhangxingmin · 7b081961 · 5635b62f · 8d346c7b · 8d346c7b
Commit 8d346c7b authored Jun 08, 2026 by zhangxingmin
Show whitespace changes
Inline Side-by-side

Showing with 65 additions and 11 deletions

src/api/financial/commission.js
+8 -0

src/views/financialCenter/receivables.vue
+57 -11

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

--- a/src/views/financialCenter/receivables.vue
+++ b/src/views/financialCenter/receivables.vue
@@ -316,6 +316,7 @@ import {
  commissionExpectedRecord,
  addReceivedFortune,
  receivableReport,
+  receivableStatistics,
  CommissionExpectedChangeStatus,
  commissionExchangeRateApi
 } from '@/api/financial/commission'
@@ -483,6 +484,7 @@ const handleConfirmAddReceivables = async () => {
        addReceivablesDialogVisible.value = false
        resetAddReceivablesForm()
        receivedFortuneListData()
+        getStatics()
        loadTableData() // 重新加载表格
      } else {
        ElMessage.error(res.msg || '应收款修改失败')
@@ -740,11 +742,13 @@ const handleReset = () => {
  searchFormRef.value.resetForm()
  searchParams.value = {}
  console.log('表单已重置')
+  getStatics()
  loadTableData()
 }
 const handleQuery = () => {
  currentPage.value = 1
+  getStatics()
  loadTableData()
 }
 const visibleDefaultButtons = ref(['add', 'export', 'reset', 'query'])
@@ -761,12 +765,14 @@ const operationBtnList = ref([
 const handleSizeChange = val => {
  pageSize.value = val
  const params = searchFormRef.value.getFormData()
+  getStatics(params)
  loadTableData(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
  const params = searchFormRef.value.getFormData()
+  getStatics(params)
  loadTableData(params)
 }
@@ -787,8 +793,7 @@ const loadTableData = async () => {
    const params = {
      ...searchParams,
-      // commissionDateStart: searchParams?.entryDate?.[0] + '-01' || undefined,
-      // commissionDateEnd: searchParams?.entryDate?.[1] + '-01' || undefined,
      commissionDateStart: searchParams.commissionDateStart || undefined,
      commissionDateEnd: searchParams.commissionDateEnd || undefined,
@@ -797,18 +802,20 @@ const loadTableData = async () => {
      pageSize: pageSize.value
    }
    const response = await receivableReport(params)
+    // const response2 = await receivableStatistics(params)
    tableData.value = response.data.page.records || []
    pageTotal.value = response.data.page.total || 0
    pageSize.value = response.data.page.size || 50
+    // if (response2.data && response2.data.statisticsVO) {
-    // 统计信息
+    //   // 统计信息
-    statisticsData.value = {
+    //   statisticsData.value = {
-      totalAmount: response.data.statisticsVO.totalAmount,
+    //     totalAmount: response2.data.statisticsVO.totalAmount,
-      totalPaidAmount: response.data.statisticsVO.totalPaidAmount,
+    //     totalPaidAmount: response2.data.statisticsVO.totalPaidAmount,
-      pendingPaidAmount: response.data.statisticsVO.pendingPaidAmount,
+    //     pendingPaidAmount: response2.data.statisticsVO.pendingPaidAmount,
-      paidAmountRatio: response.data.statisticsVO.paidAmountRatio,
+    //     paidAmountRatio: response2.data.statisticsVO.paidAmountRatio,
-      totalPolicyCount: response.data.statisticsVO.totalPolicyCount
+    //     totalPolicyCount: response2.data.statisticsVO.totalPolicyCount
-    }
+    //   }
+    // }
  } catch (error) {
    console.error('加载数据失败:', error)
    ElMessage.error('加载数据失败')
@@ -816,7 +823,44 @@ const loadTableData = async () => {
    loading.value = false
  }
 }
+const getStatics = async () => {
+  const searchParams = searchFormRef.value.getFormData() || {}
+  try {
+    if (searchParams.entryDate.length > 0) {
+      searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01`
+      searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01`
+    } else {
+      searchParams.commissionDateStart = ''
+      searchParams.commissionDateEnd = ''
+    }
+    const params = {
+      ...searchParams,
+      commissionDateStart: searchParams.commissionDateStart || undefined,
+      commissionDateEnd: searchParams.commissionDateEnd || undefined,
+      entryDate: undefined,
+      pageNo: currentPage.value,
+      pageSize: pageSize.value
+    }
+    const response2 = await receivableStatistics(params)
+    if (response2.data && response2.data.statisticsVO) {
+      // 统计信息
+      statisticsData.value = {
+        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) {
+    console.error('加载统计数据失败:', error)
+    ElMessage.error('加载统计数据失败')
+  }
+}
 // 入账记录查询
 const loadEntryRecordData = async cbd => {
  loading.value = true
@@ -954,6 +998,7 @@ const handleConfirmSetStatus = () => {
          ElMessage.success('状态修改成功')
          setStatusDialogTableVisible.value = false
          receivedFortuneListData()
+          getStatics()
          loadTableData() // 重新加载表格
        } else {
          ElMessage.error(res.msg || '状态修改失败')
@@ -971,6 +1016,7 @@ const handleConfirmSetStatus = () => {
 onMounted(async () => {
  try {
    await loadDicts(['csf_expected_commission_status'])
+    getStatics()
    loadTableData()
  } catch (error) {
    console.error('字典加载失败', error)