diff --git a/apps/finance/src/api/statistics/index.ts b/apps/finance/src/api/statistics/index.ts index 0270c8a..b3a1c67 100644 --- a/apps/finance/src/api/statistics/index.ts +++ b/apps/finance/src/api/statistics/index.ts @@ -144,9 +144,33 @@ export const statisticsApi = { * 下载全部月份的收入统计报表 * @returns 全部月份的收入统计报表数据 */ - downloadAllMonthIncomeStatistics: () => { + downloadAllMonthIncomeStatistics: (data?: { year: number | string }) => { return defaultRequestClient.download('common/statistics/getMonthStatistics', { - data: {}, + data: data || {}, + }); + }, + + /** + * 下载年度统计报表 + * @param data 请求参数 + * @param data.year 年份 + * @returns 年度统计报表数据 + */ + downloadYearStatistics: (data: { year: number | string }) => { + return defaultRequestClient.download('common/statistics/getYearStatistics', { + data, + }); + }, + + /** + * 下载年度统计报表(不包含天医币) + * @param data 请求参数 + * @param data.year 年份 + * @returns 年度统计报表数据(不包含天医币) + */ + downloadYearStatisticsNoPoint: (data: { year: number | string }) => { + return defaultRequestClient.download('common/statistics/getYearStatisticsNoPoint', { + data, }); }, }; diff --git a/apps/finance/src/router/routes/modules/statistics.ts b/apps/finance/src/router/routes/modules/statistics.ts index ba94855..cef0fa1 100644 --- a/apps/finance/src/router/routes/modules/statistics.ts +++ b/apps/finance/src/router/routes/modules/statistics.ts @@ -67,7 +67,7 @@ const routes: RouteRecordRaw[] = [ }, { meta: { - title: '下载全部报表', + title: '下载年度报表', keepAlive: true, }, name: 'DownloadReports', diff --git a/apps/finance/src/views/statistics/download/index.vue b/apps/finance/src/views/statistics/download/index.vue index 1b69ce2..60fca8c 100644 --- a/apps/finance/src/views/statistics/download/index.vue +++ b/apps/finance/src/views/statistics/download/index.vue @@ -1,39 +1,86 @@ diff --git a/apps/finance/src/views/statistics/summary-month/report-utils.ts b/apps/finance/src/views/statistics/summary-month/report-utils.ts index 7cb5eeb..8d5bf77 100644 --- a/apps/finance/src/views/statistics/summary-month/report-utils.ts +++ b/apps/finance/src/views/statistics/summary-month/report-utils.ts @@ -21,6 +21,7 @@ export function handleSumAndNoNeedAmortizateMonthData( resultData.push({ type, sumFee: resItem.sumFee || 0, + cashFee: resItem.cashFee || 0, children: childDictArr.map((childType) => ({ title: childType.title, fee: resItem[childType.type] || 0, @@ -86,6 +87,13 @@ export async function handleVipAndCourseMonthData( .reduce((acc: number, cur: IncomeItem) => acc + cur.fee, 0) .toFixed(3), ), + // 现金合计需要去掉天医币后合计 + cashFee: Number.parseFloat( + currentMonthData.incomes + .filter((item: IncomeItem) => item.type !== '天医币') + .reduce((acc: number, cur: IncomeItem) => acc + cur.fee, 0) + .toFixed(3), + ), }; } diff --git a/apps/finance/src/views/statistics/summary-month/report.vue b/apps/finance/src/views/statistics/summary-month/report.vue index 07c2a5c..349208d 100644 --- a/apps/finance/src/views/statistics/summary-month/report.vue +++ b/apps/finance/src/views/statistics/summary-month/report.vue @@ -138,6 +138,7 @@ const vipMonthLoading = ref(loadingText); const vipMonthData = ref({ incomes: [] as IncomeItem[], incomesTotal: 0, + cashFee: 0, notyet: 0, already: 0, now: 0, @@ -168,6 +169,7 @@ const courseMonthLoading = ref(loadingText); const courseMonthData = ref({ incomes: [] as IncomeItem[], incomesTotal: 0, + cashFee: 0, notyet: 0, already: 0, now: 0, @@ -403,6 +405,9 @@ async function downloadMonthStatistics() {
{{ `合计:${item.sumFee}元` }}
+
+ {{ `现金合计:${item.cashFee}元` }} +
@@ -427,6 +432,7 @@ async function downloadMonthStatistics() {
上月剩余摊销 {{ vipMonthData.lastNotyet }}元
收入 合计{{ vipMonthData.incomesTotal }}元
+
现金合计{{ vipMonthData.cashFee }}元
上月剩余摊销 {{ courseMonthData.lastNotyet }}元
收入 合计{{ courseMonthData.incomesTotal }}元
+
现金合计{{ courseMonthData.cashFee }}元