Browse Source

利用履歴 入金と出金の列を分離

develop
sosuke.iwabuchi 1 year ago
parent
commit
e8b5031ddf
1 changed files with 16 additions and 2 deletions
  1. +16
    -2
      src/pages/dashboard/qr-service/利用履歴一覧/TableBox.tsx

+ 16
- 2
src/pages/dashboard/qr-service/利用履歴一覧/TableBox.tsx View File

@@ -15,6 +15,7 @@ import TableHeadCustom, {
import useAuth from "hooks/useAuth"; import useAuth from "hooks/useAuth";
import useSnackbarCustom from "hooks/useSnackbarCustom"; import useSnackbarCustom from "hooks/useSnackbarCustom";
import { UseTableReturn } from "hooks/useTable"; import { UseTableReturn } from "hooks/useTable";
import { useMemo } from "react";
import { formatDateTimeStr } from "utils/datetime"; import { formatDateTimeStr } from "utils/datetime";
import { numberFormat } from "utils/string"; import { numberFormat } from "utils/string";


@@ -25,7 +26,8 @@ export default function TableBox({ table }: CommonProps) {
const TABLE_HEAD: HeadLabelProps[] = [ const TABLE_HEAD: HeadLabelProps[] = [
{ id: "datetime", label: "日時", align: "left", needSort: false }, { id: "datetime", label: "日時", align: "left", needSort: false },
{ id: "name", label: "名称", align: "left", needSort: false }, { id: "name", label: "名称", align: "left", needSort: false },
{ id: "amount", label: "金額", align: "left", needSort: false },
{ id: "out_amount", label: "入金額", align: "left", needSort: false },
{ id: "in_amount", label: "出金額", align: "left", needSort: false },
{ id: "deposit", label: "残高", align: "left", needSort: false }, { id: "deposit", label: "残高", align: "left", needSort: false },
]; ];
const { const {
@@ -87,11 +89,23 @@ type RowProps = {
data: デポジット異動履歴; data: デポジット異動履歴;
}; };
function Row({ data }: RowProps) { function Row({ data }: RowProps) {
const inAmount = useMemo(() => {
return 0 < data.transfer_amount
? numberFormat(data.transfer_amount) + "円"
: "-";
}, [data]);
const outAmount = useMemo(() => {
return data.transfer_amount < 0
? numberFormat(-1 * data.transfer_amount) + "円"
: "-";
}, [data]);

return ( return (
<TableRow> <TableRow>
<TableCell>{formatDateTimeStr(data.transfer_datetime)}</TableCell> <TableCell>{formatDateTimeStr(data.transfer_datetime)}</TableCell>
<TableCell>{data.transfer_reason ?? "-"}</TableCell> <TableCell>{data.transfer_reason ?? "-"}</TableCell>
<TableCell>{numberFormat(data.transfer_amount)}円</TableCell>
<TableCell>{inAmount}</TableCell>
<TableCell>{outAmount}</TableCell>
<TableCell>{numberFormat(data.after_amount)}円</TableCell> <TableCell>{numberFormat(data.after_amount)}円</TableCell>
</TableRow> </TableRow>
); );


Loading…
Cancel
Save