Merge branch 'wyz' into 'test'

优化应收统计2

See merge request !165

src/views/financialCenter/receivables.vue

@@ -484,6 +484,7 @@ const handleConfirmAddReceivables = async () => {
         addReceivablesDialogVisible.value = false
         addReceivablesDialogVisible.value = false
         resetAddReceivablesForm()
         resetAddReceivablesForm()
         receivedFortuneListData()
         receivedFortuneListData()
+        getStatics()
         loadTableData() // 重新加载表格
         loadTableData() // 重新加载表格
       } else {
       } else {
         ElMessage.error(res.msg || '应收款修改失败')
         ElMessage.error(res.msg || '应收款修改失败')
@@ -741,11 +742,13 @@ const handleReset = () => {
   searchFormRef.value.resetForm()
   searchFormRef.value.resetForm()
   searchParams.value = {}
   searchParams.value = {}
   console.log('表单已重置')
   console.log('表单已重置')
+  getStatics()
   loadTableData()
   loadTableData()
 }
 }
 
 
 const handleQuery = () => {
 const handleQuery = () => {
   currentPage.value = 1
   currentPage.value = 1
+  getStatics()
   loadTableData()
   loadTableData()
 }
 }
 const visibleDefaultButtons = ref(['add', 'export', 'reset', 'query'])
 const visibleDefaultButtons = ref(['add', 'export', 'reset', 'query'])
@@ -762,12 +765,14 @@ const operationBtnList = ref([
 const handleSizeChange = val => {
 const handleSizeChange = val => {
   pageSize.value = val
   pageSize.value = val
   const params = searchFormRef.value.getFormData()
   const params = searchFormRef.value.getFormData()
+  getStatics(params)
   loadTableData(params)
   loadTableData(params)
 }
 }
 
 
 const handleCurrentChange = val => {
 const handleCurrentChange = val => {
   currentPage.value = val
   currentPage.value = val
   const params = searchFormRef.value.getFormData()
   const params = searchFormRef.value.getFormData()
+  getStatics(params)
   loadTableData(params)
   loadTableData(params)
 }
 }
 
 
@@ -788,8 +793,7 @@ const loadTableData = async () => {
 
 
     const params = {
     const params = {
       ...searchParams,
       ...searchParams,
-      // commissionDateStart: searchParams?.entryDate?.[0] + '-01' || undefined,
-      // commissionDateEnd: searchParams?.entryDate?.[1] + '-01' || undefined,
+
       commissionDateStart: searchParams.commissionDateStart || undefined,
       commissionDateStart: searchParams.commissionDateStart || undefined,
       commissionDateEnd: searchParams.commissionDateEnd || undefined,
       commissionDateEnd: searchParams.commissionDateEnd || undefined,
 
 
@@ -798,10 +802,50 @@ const loadTableData = async () => {
       pageSize: pageSize.value
       pageSize: pageSize.value
     }
     }
     const response = await receivableReport(params)
     const response = await receivableReport(params)
-    const response2 = await receivableStatistics(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 = {
+    //     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('加载数据失败')
+  } finally {
+    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) {
     if (response2.data && response2.data.statisticsVO) {
       // 统计信息
       // 统计信息
       statisticsData.value = {
       statisticsData.value = {
@@ -813,13 +857,10 @@ const loadTableData = async () => {
       }
       }
     }
     }
   } catch (error) {
   } catch (error) {
-    console.error('加载数据失败:', error)
-    ElMessage.error('加载数据失败')
-  } finally {
-    loading.value = false
+    console.error('加载统计数据失败:', error)
+    ElMessage.error('加载统计数据失败')
   }
   }
 }
 }
-
 // 入账记录查询
 // 入账记录查询
 const loadEntryRecordData = async cbd => {
 const loadEntryRecordData = async cbd => {
   loading.value = true
   loading.value = true
@@ -957,6 +998,7 @@ const handleConfirmSetStatus = () => {
           ElMessage.success('状态修改成功')
           ElMessage.success('状态修改成功')
           setStatusDialogTableVisible.value = false
           setStatusDialogTableVisible.value = false
           receivedFortuneListData()
           receivedFortuneListData()
+          getStatics()
           loadTableData() // 重新加载表格
           loadTableData() // 重新加载表格
         } else {
         } else {
           ElMessage.error(res.msg || '状态修改失败')
           ElMessage.error(res.msg || '状态修改失败')
@@ -974,6 +1016,7 @@ const handleConfirmSetStatus = () => {
 onMounted(async () => {
 onMounted(async () => {
   try {
   try {
     await loadDicts(['csf_expected_commission_status'])
     await loadDicts(['csf_expected_commission_status'])
+    getStatics()
     loadTableData()
     loadTableData()
   } catch (error) {
   } catch (error) {
     console.error('字典加载失败', error)
     console.error('字典加载失败', error)