save

config/routes.js

@@ -49,6 +49,11 @@ export default [
  path: '/report/expense-tag',
  component: './reports/ExpenseTag',
  },
+ {
+ name: 'expense.payee',
+ path: '/report/expense-payee',
+ component: './reports/ExpensePayee',
+ },
  {
  name: 'income.category',
  path: '/report/income-category',
@@ -59,6 +64,11 @@ export default [
  path: '/report/income-tag',
  component: './reports/IncomeTag',
  },
+ {
+ name: 'income.payee',
+ path: '/report/income-payee',
+ component: './reports/IncomePayee',
+ },
  ],
  },
  {

src/locales/en-US/menu.ts

@@ -2,9 +2,11 @@ export default {
  'menu.report': 'Report',
  'menu.report.dashboard': 'Dashboard',
  'menu.report.expense.category': 'Expense Category',
- 'menu.report.expense.tag': 'Expense Tag',
+ 'menu.report.expense.tag': 'Expense Payee',
+ 'menu.report.expense.payee': 'Expense Tag',
  'menu.report.income.category': 'Income Category',
  'menu.report.income.tag': 'Income Tag',
+ 'menu.report.income.payee': 'Income Payee',
  'menu.accounts': 'Accounts',
  'menu.statement': 'Flow Statement',
  'menu.books': 'Books',

src/locales/zh-CN/menu.ts

@@ -3,8 +3,10 @@ export default {
  'menu.report.dashboard': '概览',
  'menu.report.expense.category': '支出分类',
  'menu.report.expense.tag': '支出标签',
+ 'menu.report.expense.payee': '支出对象',
  'menu.report.income.category': '收入分类',
  'menu.report.income.tag': '收入标签',
+ 'menu.report.income.payee': '收入对象',
  'menu.accounts': '账户列表',
  'menu.statement': '账单列表',
  'menu.books': '账本管理',

src/pages/reports/ExpensePayee/Chart.jsx

@@ -0,0 +1,11 @@
+import { useModel } from '@umijs/max';
+import CardPie from '@/components/CardPie';
+import t from '@/utils/i18n';
+
+export default () => {
+
+ const { data, loading } = useModel('reports.ExpensePayee.model');
+
+ return <CardPie title={t('menu.report.expense.payee')} data={data} loading={loading} />;
+
+};

src/pages/reports/ExpensePayee/index.jsx

@@ -0,0 +1,19 @@
+import { Space } from 'antd';
+import { PageContainer } from '@ant-design/pro-components';
+import { useModel } from '@umijs/max';
+import { spaceVProp } from '@/utils/prop';
+import FlowFilter from '../components/FlowFilter';
+import Chart from './Chart';
+
+export default () => {
+ const { run } = useModel('reports.ExpensePayee.model');
+
+ return (
+ <PageContainer title={false}>
+ <Space {...spaceVProp}>
+ <FlowFilter type='EXPENSE' run={run} />
+ <Chart />
+ </Space>
+ </PageContainer>
+ );
+};

src/pages/reports/ExpensePayee/model.js

@@ -0,0 +1,14 @@
+import { getExpensePayee } from '@/services/report';
+import { useRequest } from '@umijs/max';
+
+export default () => {
+
+ const { data = [], loading, run } = useRequest(getExpensePayee, { manual: true });
+
+ return {
+ data,
+ loading,
+ run,
+ };
+
+};

src/pages/reports/IncomePayee/Chart.jsx

@@ -0,0 +1,11 @@
+import { useModel } from '@umijs/max';
+import CardPie from '@/components/CardPie';
+import t from '@/utils/i18n';
+
+export default () => {
+
+ const { data, loading } = useModel('reports.IncomePayee.model');
+
+ return <CardPie title={t('menu.report.income.payee')} data={data} loading={loading} />;
+
+};

src/pages/reports/IncomePayee/index.jsx

@@ -0,0 +1,19 @@
+import { Space } from 'antd';
+import { PageContainer } from '@ant-design/pro-components';
+import { useModel } from '@umijs/max';
+import { spaceVProp } from '@/utils/prop';
+import FlowFilter from '../components/FlowFilter';
+import Chart from './Chart';
+
+export default () => {
+ const { run } = useModel('reports.IncomePayee.model');
+
+ return (
+ <PageContainer title={false}>
+ <Space {...spaceVProp}>
+ <FlowFilter type='Income' run={run} />
+ <Chart />
+ </Space>
+ </PageContainer>
+ );
+};

src/pages/reports/IncomePayee/model.js

@@ -0,0 +1,14 @@
+import { getIncomePayee } from '@/services/report';
+import { useRequest } from '@umijs/max';
+
+export default () => {
+
+ const { data = [], loading, run } = useRequest(getIncomePayee, { manual: true });
+
+ return {
+ data,
+ loading,
+ run,
+ };
+
+};

src/pages/reports/components/FlowFilter.jsx

@@ -52,6 +52,7 @@ export default ({ type, run }) => {
  onFinish={(values) => {
  let form = JSON.parse(JSON.stringify(values));
  form.bookId = values.bookId.id;
+ form.book = values.bookId.id;
  if (values.categories) form.categories = values.categories.map((i) => i?.value || i);
  if (values.tags) form.tags = values.tags.map((i) => i?.value || i);
  run(form);

src/services/report.js

@@ -30,6 +30,20 @@ export async function getIncomeTag(params) {
  });
 }
 
+export async function getExpensePayee(params) {
+ return request(`${prefix}/expense-payee`, {
+ method: 'GET',
+ params: params,
+ });
+}
+
+export async function getIncomePayee(params) {
+ return request(`${prefix}/income-payee`, {
+ method: 'GET',
+ params: params,
+ });
+}
+
 export async function balance() {
  return request(`${prefix}/balance`, {
  method: 'GET',