From 7f891b85b17a1cb1aacd05ad184069e858d21f26 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Fri, 24 Oct 2025 13:55:37 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=ED=94=BD=EC=8A=A4=20=20?= =?UTF-8?q?=EB=B0=8F=20=EC=A0=95=EC=82=B0=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/settlement/model/types.ts | 5 + .../ui/info-wrap/amount-info-wrap.tsx | 102 ++++++++---------- src/entities/settlement/ui/list-wrap.tsx | 30 +++--- .../transaction/ui/all-transaction-list.tsx | 2 +- src/entities/transaction/ui/billing-list.tsx | 2 +- .../transaction/ui/cash-receipt-list.tsx | 2 +- src/entities/transaction/ui/escrow-list.tsx | 2 +- .../vat-return/ui/list-date-group.tsx | 2 +- src/entities/vat-return/ui/list-wrap.tsx | 3 +- .../vat-return/ui/section/amount-section.tsx | 2 +- src/pages/vat-return/detail-page.tsx | 2 +- src/shared/ui/assets/css/style-fix.css | 7 ++ src/shared/ui/filter/calendar-month.tsx | 12 +-- 13 files changed, 89 insertions(+), 84 deletions(-) diff --git a/src/entities/settlement/model/types.ts b/src/entities/settlement/model/types.ts index d65c7d2..b7ed715 100644 --- a/src/entities/settlement/model/types.ts +++ b/src/entities/settlement/model/types.ts @@ -93,6 +93,11 @@ export interface AmountInfo { holdAmount?: number; releaseAmount?: number; offsetAmount?: number; + + transactionAmount?: number; + settlementAmount?: number; + preSettlementCancelOffset?: number; + finalSettlementAmount?: number; }; export interface TransactionInfo { orderNumber: string; diff --git a/src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx b/src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx index 73521af..597530a 100644 --- a/src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx +++ b/src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx @@ -19,67 +19,55 @@ export const AmountInfoWrap = ({
  • 거래금액 합계 - - - - - - + + @@ -178,7 +166,7 @@ export const AmountInfoWrap = ({ 거래금액 정산예정금액 정산전 취소상계 정산금액 { - setTransactionIds([ - 'TXN_20250608_001', - 'TXN_20250608_002' - ]); - }, []); - - useEffect(() => { - callList(); - }, [periodType]); const getSettlementDateListDateGroup = () => { let rs = []; @@ -209,7 +199,6 @@ export const ListWrap = ({ date = settlementDate; } if(date !== settlementDate){ - date = settlementDate; if(list.length > 0){ rs.push( ); } + date = settlementDate; list = []; } list.push(listItem); @@ -255,7 +245,6 @@ export const ListWrap = ({ date = settlementDate; } if(date !== settlementDate){ - date = settlementDate; if(list.length > 0){ rs.push( ); } + date = settlementDate; list = []; } list.push(listItem); @@ -304,6 +294,22 @@ export const ListWrap = ({ */ }; + useEffect(() => { + setTransactionIds([ + 'TXN_20250608_001', + 'TXN_20250608_002' + ]); + }, []); + + useEffect(() => { + callList(); + }, [ + mid, periodType, + startDate, endDate, + paymentMethod + ]); + + return ( <>
    diff --git a/src/entities/transaction/ui/all-transaction-list.tsx b/src/entities/transaction/ui/all-transaction-list.tsx index 265a8dc..8564283 100644 --- a/src/entities/transaction/ui/all-transaction-list.tsx +++ b/src/entities/transaction/ui/all-transaction-list.tsx @@ -19,7 +19,6 @@ export const AllTransactionList = ({ date = transactionDate; } if(date !== transactionDate){ - date = transactionDate; if(list.length > 0){ rs.push( ); } + date = transactionDate; list = []; } list.push(item); diff --git a/src/entities/transaction/ui/billing-list.tsx b/src/entities/transaction/ui/billing-list.tsx index f8f0760..6f35f36 100644 --- a/src/entities/transaction/ui/billing-list.tsx +++ b/src/entities/transaction/ui/billing-list.tsx @@ -22,7 +22,6 @@ export const BillingList = ({ date = transactionDate; } if(date !== transactionDate){ - date = transactionDate; if(list.length > 0){ rs.push( ); } + date = transactionDate; list = []; } list.push(item); diff --git a/src/entities/transaction/ui/cash-receipt-list.tsx b/src/entities/transaction/ui/cash-receipt-list.tsx index 6fd60e2..785212f 100644 --- a/src/entities/transaction/ui/cash-receipt-list.tsx +++ b/src/entities/transaction/ui/cash-receipt-list.tsx @@ -22,7 +22,6 @@ export const CashReceiptList = ({ date = transactionDate; } if(date !== transactionDate){ - date = transactionDate; if(list.length > 0){ rs.push( ); } + date = transactionDate; list = []; } list.push(item); diff --git a/src/entities/transaction/ui/escrow-list.tsx b/src/entities/transaction/ui/escrow-list.tsx index 41d2c83..84272c8 100644 --- a/src/entities/transaction/ui/escrow-list.tsx +++ b/src/entities/transaction/ui/escrow-list.tsx @@ -19,7 +19,6 @@ export const EscrowList = ({ date = transactionDate; } if(date !== transactionDate){ - date = transactionDate; if(list.length > 0){ rs.push( ); } + date = transactionDate; list = []; } list.push(item); diff --git a/src/entities/vat-return/ui/list-date-group.tsx b/src/entities/vat-return/ui/list-date-group.tsx index 93f843c..4a83ca4 100644 --- a/src/entities/vat-return/ui/list-date-group.tsx +++ b/src/entities/vat-return/ui/list-date-group.tsx @@ -9,7 +9,7 @@ export const ListDateGroup = ({ }: ListDateGroupProps) => { moment.locale('ko'); const getStateDate = () => { - let stateDate = moment(date).format('YY.MM'); + let stateDate = moment(date).format('YYYY.MM'); return stateDate; }; diff --git a/src/entities/vat-return/ui/list-wrap.tsx b/src/entities/vat-return/ui/list-wrap.tsx index 57fe44f..8db1ecc 100644 --- a/src/entities/vat-return/ui/list-wrap.tsx +++ b/src/entities/vat-return/ui/list-wrap.tsx @@ -1,5 +1,4 @@ import moment from 'moment'; - import { useEffect, useState } from 'react'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { ListFilter } from './filter/list-filter'; @@ -91,7 +90,6 @@ export const ListWrap = () => { date = issueDate; } if(date !== issueDate){ - date = issueDate; if(list.length > 0){ rs.push( { > ); } + date = issueDate; list = []; } list.push(item); diff --git a/src/entities/vat-return/ui/section/amount-section.tsx b/src/entities/vat-return/ui/section/amount-section.tsx index a80abcb..cb1037e 100644 --- a/src/entities/vat-return/ui/section/amount-section.tsx +++ b/src/entities/vat-return/ui/section/amount-section.tsx @@ -27,7 +27,7 @@ export const AmountSection = ({ }; const onClickToOpenDownloadBottomSheet = () => { - + setDownloadBottomSheetOn(true); }; return ( diff --git a/src/pages/vat-return/detail-page.tsx b/src/pages/vat-return/detail-page.tsx index 58b0373..73cbca6 100644 --- a/src/pages/vat-return/detail-page.tsx +++ b/src/pages/vat-return/detail-page.tsx @@ -89,7 +89,7 @@ export const DetailPage = () => { + >세부내역 조회
    diff --git a/src/shared/ui/assets/css/style-fix.css b/src/shared/ui/assets/css/style-fix.css index d5ec029..0553c46 100644 --- a/src/shared/ui/assets/css/style-fix.css +++ b/src/shared/ui/assets/css/style-fix.css @@ -379,3 +379,10 @@ main.home-main{ .scrollbar-hide::-webkit-scrollbar { display: none; /* Chrome, Safari, Opera */ } +.unset-child-span > span { + color: unset !important; + font-size: unset !important; + font-weight: unset !important; + width: unset !important; + text-align: unset !important; +} \ No newline at end of file diff --git a/src/shared/ui/filter/calendar-month.tsx b/src/shared/ui/filter/calendar-month.tsx index c263962..a392d0b 100644 --- a/src/shared/ui/filter/calendar-month.tsx +++ b/src/shared/ui/filter/calendar-month.tsx @@ -28,20 +28,20 @@ export const FilterCalendarMonth = ({ const setFilterMonth = (monthOptions: FilterMonthOptions) => { if(monthOptions === FilterMonthOptions.Month1){ - setStartMonth(moment().format('YYYY.MM')); - setEndMonth(moment().format('YYYY.MM')); + setStartMonth(moment().format('YYYYMM')); + setEndMonth(moment().format('YYYYMM')); setMonthReadyOnly(true); setFilterMonthOptionsBtn(FilterMonthOptions.Month1); } else if(monthOptions === FilterMonthOptions.Month2){ - setStartMonth(moment().subtract(1, 'month').format('YYYY.MM')); - setEndMonth(moment().format('YYYY.MM')); + setStartMonth(moment().subtract(1, 'month').format('YYYYMM')); + setEndMonth(moment().format('YYYYMM')); setMonthReadyOnly(true); setFilterMonthOptionsBtn(FilterMonthOptions.Month2); } else if(monthOptions === FilterMonthOptions.Month3){ - setStartMonth(moment().subtract(2, 'month').format('YYYY.MM')); - setEndMonth(moment().format('YYYY.MM')); + setStartMonth(moment().subtract(2, 'month').format('YYYYMM')); + setEndMonth(moment().format('YYYYMM')); setMonthReadyOnly(true); setFilterMonthOptionsBtn(FilterMonthOptions.Month3); }