diff --git a/src/entities/additional-service/model/ars/types.ts b/src/entities/additional-service/model/ars/types.ts index 0a48587..9fc5713 100644 --- a/src/entities/additional-service/model/ars/types.ts +++ b/src/entities/additional-service/model/ars/types.ts @@ -32,12 +32,12 @@ export interface ExtensionArsListParams { page: DefaultRequestPagination; }; export interface ArsListContent { - tid: string; - paymentDate: string; - paymentStatus: string; - orderStatus: string; - arsPaymentMethod: string; - amount: number; + tid?: string; + paymentDate?: string; + paymentStatus?: string; + orderStatus?: string; + arsPaymentMethod?: string; + amount?: number; }; export interface ExtensionArsListResponse extends DefaulResponsePagination { content: Array; diff --git a/src/entities/additional-service/model/payout/types.ts b/src/entities/additional-service/model/payout/types.ts index aba4520..082bd45 100644 --- a/src/entities/additional-service/model/payout/types.ts +++ b/src/entities/additional-service/model/payout/types.ts @@ -23,8 +23,8 @@ export interface ExtensionPayoutListParams { fromDate: string; toDate: string; disbursementStatus: PayoutDisbursementStatus; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; page?: DefaultRequestPagination; }; export interface ExtensionPayoutListResponse extends DefaulResponsePagination{ diff --git a/src/entities/additional-service/model/types.ts b/src/entities/additional-service/model/types.ts index c0cb44b..954afb6 100644 --- a/src/entities/additional-service/model/types.ts +++ b/src/entities/additional-service/model/types.ts @@ -2,6 +2,7 @@ import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/c import { PayoutContent } from './payout/types'; import { P } from 'node_modules/framer-motion/dist/types.d-Cjd591yU'; import { FundAccountResultContentItem, FundAccountTransferContentItem } from './fund-account/types'; +import { ArsListContent } from './ars/types'; // ======================================== // 공통 Enums 및 타입들 @@ -134,14 +135,14 @@ export interface KeyInPaymentFilterProps extends FilterProps { startDate: string; endDate: string; transactionStatus: KeyInPaymentTransactionStatus; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; setMid: (mid: string) => void; setStartDate: (startDate: string) => void; setEndDate: (endDate: string) => void; setTransactionStatus: (transactionStatus: KeyInPaymentTransactionStatus) => void; - setMinAmount: (minAmount: string | number) => void; - setMaxAmount: (maxAmount: string | number) => void; + setMinAmount: (minAmount?: number) => void; + setMaxAmount: (maxAmount?: number) => void; } // ======================================== @@ -384,7 +385,8 @@ export interface ListItemProps extends KeyInPaymentListItem, AccountHolderSearchListItem, AccountHolderAuthListItem, LinkPaymentHistoryListItem, LinkPaymentWaitListItem, - PayoutContent, FundAccountTransferContentItem { + PayoutContent, FundAccountTransferContentItem, + ArsListContent { additionalServiceCategory?: AdditionalServiceCategory; mid?: string } @@ -668,8 +670,8 @@ export interface ExtensionKeyinListParams extends ExtensionRequestParams { fromDate: string; toDate: string; paymentStatus: string; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; page?: DefaultRequestPagination; } @@ -688,8 +690,8 @@ export interface ExtensionKeyinDownloadExcelParams extends ExtensionRequestParam fromDate?: string; toDate?: string; paymentStatus?: string; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; } export interface ExtensionKeyinDownloadExcelResponse { diff --git a/src/entities/additional-service/ui/filter/payout-filter.tsx b/src/entities/additional-service/ui/filter/payout-filter.tsx index 97d84d6..4ab35a5 100644 --- a/src/entities/additional-service/ui/filter/payout-filter.tsx +++ b/src/entities/additional-service/ui/filter/payout-filter.tsx @@ -28,15 +28,15 @@ export interface PayoutFilterProps { fromDate: string; toDate: string; disbursementStatus: PayoutDisbursementStatus; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; setMid: (mid: string) => void; setSearchCl: (searchCl: PayoutSearchCl) => void; setFromDate: (fromDate: string) => void; setToDate: (toDate: string) => void; setDisbursementStatus: (disbursementStatus: PayoutDisbursementStatus) => void; - setMinAmount: (minAmount: string | number) => void; - setMaxAmount: (maxAmount: string | number) => void; + setMinAmount: (minAmount?: number) => void; + setMaxAmount: (maxAmount?: number) => void; }; export const PayoutFilter = ({ @@ -63,8 +63,8 @@ export const PayoutFilter = ({ const [filterFromDate, setFilterFromDate] = useState(moment(fromDate).format('YYYY.MM.DD')); const [filterToDate, setFilterToDate] = useState(moment(toDate).format('YYYY.MM.DD')); const [filterDisbursementStatus, setFilterDisbursementStatus] = useState(disbursementStatus); - const [filterMinAmount, setFilterMinAmount] = useState(minAmount || ''); - const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount || ''); + const [filterMinAmount, setFilterMinAmount] = useState(minAmount); + const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); const onClickToClose = () => { setFilterOn(false); diff --git a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx index 13f1171..9b84abd 100644 --- a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx +++ b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx @@ -34,8 +34,8 @@ export const KeyInPaymentFilter = ({ const [filterStartDate, setFilterStartDate] = useState(startDate); const [filterEndDate, setFilterEndDate] = useState(endDate); const [filterTransactionStatus, setFilterTransactionStatus] = useState(transactionStatus); - const [filterMinAmount, setFilterMinAmount] = useState(minAmount || ''); - const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount || ''); + const [filterMinAmount, setFilterMinAmount] = useState(minAmount); + const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); const variants = { hidden: { x: '100%' }, diff --git a/src/entities/additional-service/ui/list-date-group.tsx b/src/entities/additional-service/ui/list-date-group.tsx index 48b4c09..032237b 100644 --- a/src/entities/additional-service/ui/list-date-group.tsx +++ b/src/entities/additional-service/ui/list-date-group.tsx @@ -53,7 +53,10 @@ export const ListDateGroup = ({ receiveAccountNo={ items[i]?.receiveAccountNo } receiveAccountName={ items[i]?.receiveAccountName } status={ items[i]?.status } - processDate={items[i]?.processDate } + processDate={ items[i]?.processDate } + + orderStatus={ items[i]?.orderStatus } + arsPaymentMethod={ items[i]?.arsPaymentMethod } > ) } diff --git a/src/entities/additional-service/ui/list-item.tsx b/src/entities/additional-service/ui/list-item.tsx index 37366eb..59100c7 100644 --- a/src/entities/additional-service/ui/list-item.tsx +++ b/src/entities/additional-service/ui/list-item.tsx @@ -20,7 +20,9 @@ export const ListItem = ({ transferAmount, receiveBankName, receiveAccountNo, receiveAccountName, - status, processDate + status, processDate, + + orderStatus, arsPaymentMethod }: ListItemProps) => { const { navigate } = useNavigate(); const getItemClass = () => { @@ -171,6 +173,15 @@ export const ListItem = ({ } }); } + else if (additionalServiceCategory === AdditionalServiceCategory.Ars){ + navigate(PATHS.additionalService.payout.detail, { + state: { + additionalServiceCategory: additionalServiceCategory, + mid: mid, + tid: tid + } + }); + } else { alert('additionalServiceCategory가 존재하지 않습니다.'); } @@ -196,6 +207,10 @@ export const ListItem = ({ else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) { timeStr = moment(requestDate).format('mm:ss'); } + else if (additionalServiceCategory === AdditionalServiceCategory.Ars){ + let time = paymentDate?.substring(8, 12); + timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4); + } else { return } @@ -208,28 +223,31 @@ export const ListItem = ({ str = `${tid}(${amount})`; } else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) { - str = `${accountName}(${accountNo})` + str = `${accountName}(${accountNo})`; } else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) { - str = `${accountNo}` + str = `${accountNo}`; } else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory || additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending ) { if (sendMethod === "SMS") { - str = `${"buyerName"}(${"휴대폰 번호"})` + str = `${"buyerName"}(${"휴대폰 번호"})`; } else { - str = `${"buyerName"}(${"이메일"})` + str = `${"buyerName"}(${"이메일"})`; } } else if (additionalServiceCategory === AdditionalServiceCategory.Payout) { str = companyName; } else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){ - str = `${receiveAccountName}(${receiveAccountNo})` + str = `${receiveAccountName}(${receiveAccountNo})`; } else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){ - str = `${receiveAccountName}(${receiveAccountNo})` + str = `${receiveAccountName}(${receiveAccountNo})`; + } + else if(additionalServiceCategory === AdditionalServiceCategory.Ars){ + str = '이름(' + tid + ')'; } return str; @@ -321,6 +339,19 @@ export const ListItem = ({ ); } + else if(additionalServiceCategory === AdditionalServiceCategory.Ars){ + rs.push( +
+ { getTime() } + | + { paymentStatus } + | + { orderStatus } + | + { arsPaymentMethod } +
+ ); + } return rs; }; diff --git a/src/entities/common/model/types.ts b/src/entities/common/model/types.ts index 9a88859..ca33b98 100644 --- a/src/entities/common/model/types.ts +++ b/src/entities/common/model/types.ts @@ -44,10 +44,10 @@ export enum AltMsgKeys { }; export interface FilterRangeAmountProps { title?: string; - minAmount?: number | string; - maxAmount?: number | string; - setMinAmount: (minAmount: number | string) => void; - setMaxAmount: (maxAmount: number | string) => void; + minAmount?: number; + maxAmount?: number; + setMinAmount: (minAmount: number) => void; + setMaxAmount: (maxAmount: number) => void; }; export interface FilterButtonGroupsProps { title: string; diff --git a/src/entities/transaction/model/types.ts b/src/entities/transaction/model/types.ts index 142ef29..5fdbe03 100644 --- a/src/entities/transaction/model/types.ts +++ b/src/entities/transaction/model/types.ts @@ -231,8 +231,8 @@ export interface AllTransactionListParams { toDate: string; stateCode: string; serviceCode: string; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; dateCl: string; goodsName: string; cardCode?: string; @@ -260,8 +260,8 @@ export interface EscrowListParams { endDate?: string; deliveryStatus?: string; settlementStatus?: string; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; pagination?: DefaultRequestPagination; }; @@ -274,8 +274,8 @@ export interface BillingListParams { requestStatus?: string; processResult?: string; paymentMethod?: string; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; pagination?: DefaultRequestPagination }; @@ -510,8 +510,8 @@ export interface AllTransactionFilterProps extends FilterProps { toDate: string; stateCode: AllTransactionStateCode; serviceCode: AllTransactionServiceCode; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; cardCode?: string; bankCode?: string; searchCl?: AllTransactionSearchCl; @@ -523,8 +523,8 @@ export interface AllTransactionFilterProps extends FilterProps { setToDate: (endDate: string) => void; setStateCode: (stateCode: AllTransactionStateCode) => void; setServiceCode: (serviceCode: AllTransactionServiceCode) => void; - setMinAmount: (minAmount: string | number) => void; - setMaxAmount: (maxAmount: string | number) => void; + setMinAmount: (minAmount?: number) => void; + setMaxAmount: (maxAmount?: number) => void; setCardCode: (cardCode: string | undefined) => void; setBankCode: (bankCode: string | undefined) => void; setSearchCl: (searchCl: AllTransactionSearchCl | undefined) => void; @@ -553,8 +553,8 @@ export interface EscrowFilterProps extends FilterProps { endDate: string; deliveryStatus: EscrowDeliveryStatus; settlementStatus: EscrowSettlementStatus; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; setMid: (mid: string) => void; setSearchType: (searchType: EscrowSearchType) => void; setSearchKeyword: (searchKeyword: string) => void; @@ -562,8 +562,8 @@ export interface EscrowFilterProps extends FilterProps { setEndDate: (endDate: string) => void; setDeliveryStatus: (deliveryStatus: EscrowDeliveryStatus) => void; setSettlementStatus: (settlementStatus: EscrowSettlementStatus) => void; - setMinAmount: (minAmount: string | number) => void; - setMaxAmount: (maxAmount: string | number) => void; + setMinAmount: (minAmount?: number) => void; + setMaxAmount: (maxAmount?: number) => void; }; export interface BillingFilterProps extends FilterProps { mid: string; @@ -574,8 +574,8 @@ export interface BillingFilterProps extends FilterProps { requestStatus: BillingRequestStatus; processResult: BillingProcessResult; paymentMethod: BillingPaymentMethod; - minAmount?: number | string; - maxAmount?: number | string; + minAmount?: number; + maxAmount?: number; setMid: (mid: string) => void; setSearchType: (searchType: BillingSearchType) => void; setSearchKeyword: (searchKeyword: string) => void; @@ -584,8 +584,8 @@ export interface BillingFilterProps extends FilterProps { setRequestStatus: (requestStatus: BillingRequestStatus) => void; setProcessResult: (processResult: BillingProcessResult) => void; setPaymentMethod: (paymentMethod: BillingPaymentMethod) => void; - setMinAmount: (minAmount: string | number) => void; - setMaxAmount: (maxAmount: string | number) => void; + setMinAmount: (minAmount?: number) => void; + setMaxAmount: (maxAmount?: number) => void; }; export interface CashReceiptPurposeUpdateParams { @@ -620,7 +620,7 @@ export interface CashReceiptManualIssueResponse { export interface BillingChargeParams { billKey: string; productName: string; - productAmount: number | string; + productAmount: number; orderNumber: string; buyerName: string; paymentRequestDate: string; diff --git a/src/entities/transaction/ui/cash-receipt-hand-written-issuance-step2.tsx b/src/entities/transaction/ui/cash-receipt-hand-written-issuance-step2.tsx index 1c00e93..5603a46 100644 --- a/src/entities/transaction/ui/cash-receipt-hand-written-issuance-step2.tsx +++ b/src/entities/transaction/ui/cash-receipt-hand-written-issuance-step2.tsx @@ -4,14 +4,14 @@ import { ProcessStep } from '../model/types'; export interface CashReceiptHandWrittenIssuanceStep2Props { setProcessStep: (processStep: ProcessStep) => void; - supplyAmount: number | string; - vatAmount: number | string; - taxFreeAmount: number | string; - serviceCharge: number | string; - setSupplyAmount: (supplyAmount: number | string) => void; - setVatAmount: (vatAmount: number | string) => void; - setTaxFreeAmount: (taxFreeAmount: number | string) => void; - setServiceCharge: (serviceCharge: number | string) => void; + supplyAmount: number; + vatAmount: number; + taxFreeAmount: number; + serviceCharge: number; + setSupplyAmount: (supplyAmount: number) => void; + setVatAmount: (vatAmount: number) => void; + setTaxFreeAmount: (taxFreeAmount: number) => void; + setServiceCharge: (serviceCharge: number) => void; }; export const CashReceiptHandWrittenIssuanceStep2 = ({ setProcessStep, @@ -63,7 +63,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({ type="text" placeholder="" value={ supplyAmount } - onChange={ (e: ChangeEvent) => setSupplyAmount(e.target.value) } + onChange={ (e: ChangeEvent) => setSupplyAmount(parseInt(e.target.value)) } /> @@ -75,7 +75,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({ type="text" placeholder="" value={ vatAmount } - onChange={ (e: ChangeEvent) => setVatAmount(e.target.value) } + onChange={ (e: ChangeEvent) => setVatAmount(parseInt(e.target.value)) } /> @@ -87,7 +87,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({ type="text" placeholder="" value={ taxFreeAmount } - onChange={ (e: ChangeEvent) => setTaxFreeAmount(e.target.value) } + onChange={ (e: ChangeEvent) => setTaxFreeAmount(parseInt(e.target.value)) } /> @@ -99,7 +99,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({ type="text" placeholder="" value={ serviceCharge } - onChange={ (e: ChangeEvent) => setServiceCharge(e.target.value) } + onChange={ (e: ChangeEvent) => setServiceCharge(parseInt(e.target.value)) } /> diff --git a/src/entities/transaction/ui/filter/all-transaction-filter.tsx b/src/entities/transaction/ui/filter/all-transaction-filter.tsx index af084b8..5577fab 100644 --- a/src/entities/transaction/ui/filter/all-transaction-filter.tsx +++ b/src/entities/transaction/ui/filter/all-transaction-filter.tsx @@ -62,8 +62,8 @@ export const AllTransactionFilter = ({ const [filterToDate, setFilterToDate] = useState(toDate); const [filterStateCode, setFilterStateCode] = useState(stateCode); const [filterServiceCode, setFilterServiceCode] = useState(serviceCode); - const [filterMinAmount, setFilterMinAmount] = useState(minAmount || ''); - const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount || ''); + const [filterMinAmount, setFilterMinAmount] = useState(minAmount); + const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); const [filterCardCode, setFilterCardCode] = useState(cardCode); const [filterBankCode, setFilterBankCode] = useState(bankCode); diff --git a/src/entities/transaction/ui/filter/billing-filter.tsx b/src/entities/transaction/ui/filter/billing-filter.tsx index 97b050d..9bee8f4 100644 --- a/src/entities/transaction/ui/filter/billing-filter.tsx +++ b/src/entities/transaction/ui/filter/billing-filter.tsx @@ -59,8 +59,8 @@ export const BillingFilter = ({ const [filterRequestStatus, setFilterRequestStatus] = useState(requestStatus); const [filterProcessResult, setFilterProcessResult] = useState(processResult); const [filterPaymentMethod, setFilterPaymentMethod] = useState(paymentMethod); - const [filterMinAmount, setFilterMinAmount] = useState(minAmount || ''); - const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount || ''); + const [filterMinAmount, setFilterMinAmount] = useState(minAmount); + const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); const onClickToClose = () => { setFilterOn(false); diff --git a/src/entities/transaction/ui/filter/escrow-filter.tsx b/src/entities/transaction/ui/filter/escrow-filter.tsx index 7a4ca94..188da2a 100644 --- a/src/entities/transaction/ui/filter/escrow-filter.tsx +++ b/src/entities/transaction/ui/filter/escrow-filter.tsx @@ -54,8 +54,8 @@ export const EscrowFilter = ({ const [filterEndDate, setFilterEndDate] = useState(endDate); const [filterDeliveryStatus, setFilterDeliveryStatus] = useState(deliveryStatus); const [filterSettlementStatus, setFilterSettlementStatus] = useState(settlementStatus); - const [filterMinAmount, setFilterMinAmount] = useState(minAmount || ''); - const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount || ''); + const [filterMinAmount, setFilterMinAmount] = useState(minAmount); + const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); const onClickToClose = () => { setFilterOn(false); diff --git a/src/pages/additional-service/ars/list-page.tsx b/src/pages/additional-service/ars/list-page.tsx index 4d5fe32..bf1b010 100644 --- a/src/pages/additional-service/ars/list-page.tsx +++ b/src/pages/additional-service/ars/list-page.tsx @@ -28,8 +28,8 @@ export const ArsListPage = () => { const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState('nictest001m'); const [moid, setMoid] = useState(''); - const [fromDate, setFromDate] = useState(''); - const [toDate, setToDate] = useState(''); + const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD')); + const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); const [paymentStatus, setPaymentStatus] = useState(PaymentStatus.ALL); const [orderStatus, setOrderStatus] = useState(OrderStatus.ALL); const [minAmount, setMinAmount] = useState(0); @@ -201,140 +201,14 @@ export const ArsListPage = () => {
-
-
25.06.08(일)
-
-
-
-
-
-
김*환(7000)
-
- 20:00ㅣ미결제ㅣ결제대기ㅣSMS -
-
-
5,254,000원
-
-
-
-
-
-
-
최*길(7000)
-
- 20:00ㅣ결제완료ㅣ결제성공ㅣ호전환 -
-
-
23,845,000원
-
-
-
-
-
-
-
박*준(7000)
-
- 20:00ㅣ결제완료ㅣ결제성공ㅣ호전환 -
-
-
534,000원
-
-
-
-
-
-
-
이*신(7000)
-
- 20:00ㅣ미결제ㅣ취소완료ㅣSMS -
-
-
4,254,000원
-
-
-
-
-
-
-
김*환(7000)
-
- 20:00ㅣ미결제ㅣ기간만료ㅣSMS -
-
-
948,000원
-
-
- -
-
25.06.08(일)
-
-
-
-
-
-
신용카드(카카오머니, 카카오)
-
- 승인ㅣ20:00ㅣcroquis01m -
-
-
3,583,000원
-
-
-
-
-
-
-
신용카드(현대카드., 토스)
-
- 환불ㅣ20:00ㅣcroquis01m -
-
-
874,000원
-
-
-
-
-
-
-
계좌간편결제(국민은행, PAYU)
-
- 승인ㅣ20:00ㅣcroquis01m -
-
-
23,562,000원
-
-
-
-
-
-
-
휴대폰
-
- 환불ㅣ20:00ㅣcroquis01m -
-
-
783,000원
-
-
-
-
-
-
-
SSG 은행계좌(농협중앙회)
-
- 승인ㅣ20:00ㅣcroquis01m -
-
-
3,923,000원
-
+ { getArsList() } +
+
-
- -
diff --git a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx index ddd9a64..5c5abca 100644 --- a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx +++ b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx @@ -38,8 +38,8 @@ export const KeyInPaymentPage = () => { const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD')); const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD')); const [transactionStatus, setTransactionStatus] = useState(KeyInPaymentTransactionStatus.ALL) - const [minAmount, setMinAmount] = useState(); - const [maxAmount, setMaxAmount] = useState(); + const [minAmount, setMinAmount] = useState(); + const [maxAmount, setMaxAmount] = useState(); useSetHeaderTitle('KEY-IN 결제'); diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index 7af75e8..286ad8b 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -37,11 +37,11 @@ export const PayoutListPage = () => { const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState('nictest001m'); const [searchCl, setSearchCl] = useState(PayoutSearchCl.REQUEST_DATE); - const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD')); - const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); + const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD')); + const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); const [disbursementStatus, setDisbursementStatus] = useState(PayoutDisbursementStatus.ALL); - const [minAmount, setMinAmount] = useState(); - const [maxAmount, setMaxAmount] = useState(); + const [minAmount, setMinAmount] = useState(); + const [maxAmount, setMaxAmount] = useState(); const { mutateAsync: extensionPayoutList } = useExtensionPayoutListMutation(); const { mutateAsync: extensionPayoutExcel } = useExtensionPayoutExcelMutation(); @@ -224,7 +224,7 @@ export const PayoutListPage = () => { sortBy={ sortBy } onClickToSort={ onClickToSort } > -
+
{ PayoutDisbursementStatusBtnGroup.map((value, index) => ( diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index ed5bb9c..a05c8dd 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -40,8 +40,8 @@ export const AllTransactionListPage = () => { const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); const [stateCode, setStateCode] = useState(AllTransactionStateCode.ALL); const [serviceCode, setServiceCode] = useState(AllTransactionServiceCode.ALL); - const [minAmount, setMinAmount] = useState(); - const [maxAmount, setMaxAmount] = useState(); + const [minAmount, setMinAmount] = useState(); + const [maxAmount, setMaxAmount] = useState(); const [cardCode, setCardCode] = useState(); const [bankCode, setBankCode] = useState(); const [searchCl, setSearchCl] = useState(); diff --git a/src/pages/transaction/billing/charge-page.tsx b/src/pages/transaction/billing/charge-page.tsx index 5b33abc..119673a 100644 --- a/src/pages/transaction/billing/charge-page.tsx +++ b/src/pages/transaction/billing/charge-page.tsx @@ -16,7 +16,7 @@ export const BillingChargePage = () => { const [billKey, setBillKey] = useState('BIKYvattest01m'); const [productName, setProductName] = useState('테스트상품123'); - const [productAmount, setProductAmount] = useState(1000000); + const [productAmount, setProductAmount] = useState(1000000); const [orderNumber, setOrderNumber] = useState('P146733723'); const [buyerName, setBuyerName] = useState('김테스트'); const [paymentRequestDate, setPaymentRequestDate] = useState('2025-06-08'); @@ -109,7 +109,7 @@ export const BillingChargePage = () => { ) => setProductAmount(e.target.value) } + onChange={ (e: ChangeEvent) => setProductAmount(parseInt(e.target.value)) } />
diff --git a/src/pages/transaction/billing/list-page.tsx b/src/pages/transaction/billing/list-page.tsx index 277e74d..d520da3 100644 --- a/src/pages/transaction/billing/list-page.tsx +++ b/src/pages/transaction/billing/list-page.tsx @@ -37,8 +37,8 @@ export const BillingListPage = () => { const [requestStatus, setRequestStatus] = useState(BillingRequestStatus.ALL); const [processResult, setProcessResult] = useState(BillingProcessResult.ALL); const [paymentMethod, setPaymentMethod] = useState(BillingPaymentMethod.ALL); - const [minAmount, setMinAmount] = useState(); - const [maxAmount, setMaxAmount] = useState(); + const [minAmount, setMinAmount] = useState(); + const [maxAmount, setMaxAmount] = useState(); useSetHeaderTitle('빌링'); useSetHeaderType(HeaderType.LeftArrow); diff --git a/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx b/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx index 24dfd61..ccfe330 100644 --- a/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx +++ b/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx @@ -20,10 +20,10 @@ export const CashReceitHandWrittenIssuancePage = () => { const [issueNumber, setIssueNumber] = useState('01012341234'); const [email, setEmail] = useState('test123@nicepay.com'); const [phoneNumber, setPhoneNumber] = useState('01012341234'); - const [supplyAmount, setSupplyAmount] = useState(9091); - const [vatAmount, setVatAmount] = useState(909); - const [taxFreeAmount, setTaxFreeAmount] = useState(0); - const [serviceCharge, setServiceCharge] = useState(0); + const [supplyAmount, setSupplyAmount] = useState(9091); + const [vatAmount, setVatAmount] = useState(909); + const [taxFreeAmount, setTaxFreeAmount] = useState(0); + const [serviceCharge, setServiceCharge] = useState(0); useSetHeaderTitle('수기 발행'); useSetHeaderType(HeaderType.RightClose); diff --git a/src/pages/transaction/escrow/list-page.tsx b/src/pages/transaction/escrow/list-page.tsx index fe345bc..6312efa 100644 --- a/src/pages/transaction/escrow/list-page.tsx +++ b/src/pages/transaction/escrow/list-page.tsx @@ -36,8 +36,8 @@ export const EscrowListPage = () => { const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD')); const [deliveryStatus, setDeliveryStatus] = useState(EscrowDeliveryStatus.ALL); const [settlementStatus, setSettlementStatus] = useState(EscrowSettlementStatus.ALL); - const [minAmount, setMinAmount] = useState(); - const [maxAmount, setMaxAmount] = useState(); + const [minAmount, setMinAmount] = useState(); + const [maxAmount, setMaxAmount] = useState(); useSetHeaderTitle('에스크로'); useSetHeaderType(HeaderType.LeftArrow); diff --git a/src/shared/ui/filter/range-amount.tsx b/src/shared/ui/filter/range-amount.tsx index 6304a01..585d09c 100644 --- a/src/shared/ui/filter/range-amount.tsx +++ b/src/shared/ui/filter/range-amount.tsx @@ -25,7 +25,7 @@ export const FilterRangeAmount = ({ type="number" placeholder="" value={ minAmount } - onChange={ (e: ChangeEvent) => setMinAmount(e.target.value) } + onChange={ (e: ChangeEvent) => setMinAmount(parseInt(e.target.value)) } />
~ @@ -34,7 +34,7 @@ export const FilterRangeAmount = ({ type="number" placeholder="" value={ maxAmount } - onChange={ (e: ChangeEvent) => setMaxAmount(e.target.value) } + onChange={ (e: ChangeEvent) => setMaxAmount(parseInt(e.target.value)) } />