From fd5333e4a2e732beb97e8a2a9c024d02ca3e6a1b Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Mon, 17 Nov 2025 19:10:01 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?= =?UTF-8?q?=EB=B9=8C=EB=A7=81=20=ED=98=84=EA=B8=88=EC=98=81=EC=88=98?= =?UTF-8?q?=EC=A6=9D=20=EC=84=B8=EA=B8=88=EA=B3=84=EC=82=B0=EC=84=9C=20?= =?UTF-8?q?=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 --- src/entities/vat-return/model/contant.ts | 4 +- src/entities/vat-return/model/types.ts | 4 +- src/entities/vat-return/ui/list-wrap.tsx | 34 ++++++++++-- src/pages/transaction/billing/list-page.tsx | 52 +++++++++++++++---- .../transaction/cash-receipt/list-page.tsx | 34 +++++++++++- src/pages/transaction/escrow/list-page.tsx | 41 +++++++++++++-- 6 files changed, 146 insertions(+), 23 deletions(-) diff --git a/src/entities/vat-return/model/contant.ts b/src/entities/vat-return/model/contant.ts index 15cb992..3f1b85a 100644 --- a/src/entities/vat-return/model/contant.ts +++ b/src/entities/vat-return/model/contant.ts @@ -10,8 +10,8 @@ export const getVatReturnReceiptTypeBtnGroup = (t: TFunction) => [ export const getVatReturnTargetTypeBtnGroup = (t: TFunction) => [ {name: t('transaction.constants.all'), value: VatReturnTargetType.ALL }, {name: t('vatReturn.general'), value: VatReturnTargetType.GENERAL }, - {name: t('vatReturn.differenceSettlement'), value: VatReturnTargetType.DIFFERENCE_COLLECTION }, - {name: t('vatReturn.refundSettlement'), value: VatReturnTargetType.REFUND_SETTLEMENT } + {name: t('vatReturn.differenceSettlement'), value: VatReturnTargetType.DIFF_SETTLE }, + {name: t('vatReturn.refundSettlement'), value: VatReturnTargetType.REFUND_SETTLE } ]; export const getVatReturnTaxBtnGroups = (t: TFunction) => [ diff --git a/src/entities/vat-return/model/types.ts b/src/entities/vat-return/model/types.ts index 348328b..212b1fc 100644 --- a/src/entities/vat-return/model/types.ts +++ b/src/entities/vat-return/model/types.ts @@ -20,8 +20,8 @@ export enum VatReturnPayTax { export enum VatReturnTargetType { ALL = 'ALL', GENERAL = 'GENERAL', - DIFFERENCE_COLLECTION = 'DIFFERENCE_COLLECTION', - REFUND_SETTLEMENT = 'REFUND_SETTLEMENT', + DIFF_SETTLE = 'DIFF_SETTLE', + REFUND_SETTLE = 'REFUND_SETTLE', }; export interface VatReturnListParams { diff --git a/src/entities/vat-return/ui/list-wrap.tsx b/src/entities/vat-return/ui/list-wrap.tsx index 4d5ade2..4cdc524 100644 --- a/src/entities/vat-return/ui/list-wrap.tsx +++ b/src/entities/vat-return/ui/list-wrap.tsx @@ -29,6 +29,12 @@ import { snackBar } from '@/shared/lib'; /* 세금계산서 48 */ const menuId = 48; +const defaultParams = { + startMonth: moment().format('YYYYMM'), + endMonth: moment().format('YYYYMM'), + receiptType: VatReturnReceiptType.ALL, + targetType: VatReturnTargetType.ALL, +}; export const ListWrap = () => { const { t } = useTranslation(); const userMid = useStore.getState().UserStore.mid; @@ -39,10 +45,10 @@ export const ListWrap = () => { const [listItems, setListItems] = useState>([]); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState(userMid); - const [startMonth, setStartMonth] = useState(moment().format('YYYYMM')); - const [endMonth, setEndMonth] = useState(moment().format('YYYYMM')); - const [receiptType, setReceiptType] = useState(VatReturnReceiptType.ALL); - const [targetType, setTargetType] = useState(VatReturnTargetType.ALL); + const [startMonth, setStartMonth] = useState(defaultParams.startMonth); + const [endMonth, setEndMonth] = useState(defaultParams.endMonth); + const [receiptType, setReceiptType] = useState(defaultParams.receiptType); + const [targetType, setTargetType] = useState(defaultParams.targetType); const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState(false); @@ -53,6 +59,7 @@ export const ListWrap = () => { const [groupDateOn, setGroupDateOn] = useState(false); const [listHeight, setListHeight] = useState(0); + const [filterUsed, setFilterUsed] = useState(false); const { mutateAsync: vatReturnList } = useVatReturnListMutation(); const { mutateAsync: vatReturnDownloadExcel } = useVatReturnDownloadExcelMutation(); @@ -214,8 +221,21 @@ export const ListWrap = () => { return rs; }; + const checkUsedFilter = () => { + let rs: boolean = true; + if(startMonth === defaultParams.startMonth + && endMonth=== defaultParams.endMonth + && receiptType === defaultParams.receiptType + && targetType === defaultParams.targetType + ){ + rs = false; + } + setFilterUsed(rs); + }; + useEffect(() => { callList(); + checkUsedFilter(); }, [ mid, startMonth, endMonth, receiptType, targetType, sortType @@ -258,6 +278,9 @@ export const ListWrap = () => { src={ IMAGE_ROOT + '/ico_setting.svg' } alt={ t('transaction.searchOptions') } /> + { filterUsed && + + }