From 565e78cd1e21e0273d39fe212f5c582c8dd9916e Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Mon, 17 Nov 2025 18:30:18 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=ED=95=84=ED=84=B0=20=EB=B1=83=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/filter/all-transaction-filter.tsx | 5 +- .../transaction/all-transaction/list-page.tsx | 72 +++++++++++++++---- src/shared/ui/assets/css/style-fix.css | 14 ++++ 3 files changed, 74 insertions(+), 17 deletions(-) diff --git a/src/entities/transaction/ui/filter/all-transaction-filter.tsx b/src/entities/transaction/ui/filter/all-transaction-filter.tsx index 15c9c3b..11b22d8 100644 --- a/src/entities/transaction/ui/filter/all-transaction-filter.tsx +++ b/src/entities/transaction/ui/filter/all-transaction-filter.tsx @@ -52,7 +52,7 @@ export const AllTransactionFilter = ({ setBankCode, setSearchCl, setSearchValue, - serviceCodeOptions + serviceCodeOptions, }: AllTransactionFilterProps) => { const { t } = useTranslation(); @@ -144,13 +144,12 @@ export const AllTransactionFilter = ({ }; - let setSearchClOptions = (value: string) => { let options = []; setFilterServiceCode(value); if(value === ''){ - + setFilterSearchCl(undefined); } else if(value === '01'){ options.push({name: t('filter.searchOptions.cardNumber'), value: AllTransactionSearchCl.CARD_NO}); diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index 94b60a0..fae40ac 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -40,6 +40,22 @@ import { useTransactionDownloadExcelMutation } from '@/entities/transaction/api/ /* 거래내역조회 31 */ const menuId = 31; +const defaultParams = { + moid: '', + tid: '', + dateCl: '', + goodsName: '', + fromDate: moment().format('YYYYMMDD'), + toDate: moment().format('YYYYMMDD'), + statusCode: '', + serviceCode: '', + minAmount: undefined, + maxAmount: undefined, + cardCode: undefined, + bankCode: undefined, + searchCl: undefined, + searchValue: undefined +}; export const AllTransactionListPage = () => { const { navigate } = useNavigate(); @@ -54,20 +70,20 @@ export const AllTransactionListPage = () => { const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState(userMid); - const [moid, setMoid] = useState(''); - const [tid, setTid] = useState(''); - const [dateCl, setDateCl] = useState(''); - const [goodsName, setGoodsName] = useState(''); - const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD')); - const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); - const [statusCode, setStatusCode] = useState(''); - const [serviceCode, setServiceCode] = useState('01'); - const [minAmount, setMinAmount] = useState(); - const [maxAmount, setMaxAmount] = useState(); - const [cardCode, setCardCode] = useState(); - const [bankCode, setBankCode] = useState(); - const [searchCl, setSearchCl] = useState(); - const [searchValue, setSearchValue] = useState(); + const [moid, setMoid] = useState(defaultParams.moid); + const [tid, setTid] = useState(defaultParams.tid); + const [dateCl, setDateCl] = useState(defaultParams.dateCl); + const [goodsName, setGoodsName] = useState(defaultParams.goodsName); + const [fromDate, setFromDate] = useState(defaultParams.fromDate); + const [toDate, setToDate] = useState(defaultParams.toDate); + const [statusCode, setStatusCode] = useState(defaultParams.statusCode); + const [serviceCode, setServiceCode] = useState(defaultParams.serviceCode); + const [minAmount, setMinAmount] = useState(defaultParams.minAmount); + const [maxAmount, setMaxAmount] = useState(defaultParams.maxAmount); + const [cardCode, setCardCode] = useState(defaultParams.cardCode); + const [bankCode, setBankCode] = useState(defaultParams.bankCode); + const [searchCl, setSearchCl] = useState(defaultParams.searchCl); + const [searchValue, setSearchValue] = useState(defaultParams.searchValue); const [totalCount, setTotalCount] = useState(0); const [totalAmount, setTotalAmount] = useState(0); @@ -77,6 +93,8 @@ export const AllTransactionListPage = () => { const [detailOn, setDetailOn] = useState(false); const [detailTid, setDetailTid] = useState(''); const [detailServiceCode, setDetailServiceCode] = useState(''); + + const [filterUsed, setFilterUsed] = useState(false); useSetHeaderTitle(t('transaction.listTitle')); useSetHeaderType(HeaderType.LeftArrow); @@ -296,8 +314,31 @@ export const AllTransactionListPage = () => { callServiceCodeOptions(); }, []); + const checkUsedFilter = () => { + let rs: boolean = true; + if(moid === defaultParams.moid + && tid === defaultParams.tid + && dateCl === defaultParams.dateCl + && goodsName === defaultParams.goodsName + && fromDate === defaultParams.fromDate + && toDate === defaultParams.toDate + && statusCode === defaultParams.statusCode + && serviceCode === defaultParams.serviceCode + && minAmount === defaultParams.minAmount + && maxAmount === defaultParams.maxAmount + && cardCode === defaultParams.cardCode + && bankCode === defaultParams.bankCode + && searchCl === defaultParams.searchCl + && searchValue === defaultParams.searchValue + ){ + rs = false; + } + setFilterUsed(rs); + }; + useEffect(() => { callList(); + checkUsedFilter(); }, [ mid, moid, tid, sortType, fromDate, toDate, @@ -325,6 +366,9 @@ export const AllTransactionListPage = () => { alt={t('transaction.searchOptions')} onClick={ onClickToOpenFilter } /> + { filterUsed && + + }