diff --git a/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx b/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx index 1c41f6c..51e25c9 100644 --- a/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx +++ b/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx @@ -208,7 +208,7 @@ export const LinkPaymentHistoryDetail = ({ diff --git a/src/entities/transaction/ui/detail/cash-receit-detail.tsx b/src/entities/transaction/ui/detail/cash-receit-detail.tsx index d2fcda4..afc44a4 100644 --- a/src/entities/transaction/ui/detail/cash-receit-detail.tsx +++ b/src/entities/transaction/ui/detail/cash-receit-detail.tsx @@ -119,7 +119,7 @@ export const CashReceiptDetail = ({ }; const onClickToPurposeUpdate = () => { - if(checkGrant(menuId, 'W')){ + if(checkGrant(menuId, 'X')){ setBottomSheetOn(true); } else{ diff --git a/src/entities/transaction/ui/filter/cash-receipt-filter.tsx b/src/entities/transaction/ui/filter/cash-receipt-filter.tsx index 4528de9..ae75c20 100644 --- a/src/entities/transaction/ui/filter/cash-receipt-filter.tsx +++ b/src/entities/transaction/ui/filter/cash-receipt-filter.tsx @@ -38,13 +38,15 @@ export const CashReceiptFilter = ({ transactionType, processResult, searchNumberType, + searchNumber, setMid, setStartDate, setEndDate, setPurposeType, setTransactionType, setProcessResult, - setSearchNumberType + setSearchNumberType, + setSearchNumber }: CashReceiptFilterProps) => { const { t } = useTranslation(); @@ -55,12 +57,10 @@ export const CashReceiptFilter = ({ const [filterTransactionType, setFilterTransactionType] = useState(transactionType); const [filterProcessResult, setFilterProcessResult] = useState(processResult); const [filterSearchNumberType, setFilterSearchNumberType] = useState(searchNumberType); - - const [filterIssueType, setFilterIssueType] = useState(''); - const [filterIssueNumber, setFilterIssueNumber] = useState(''); + const [filterSearchNumber, setFilterSearchNumber] = useState(searchNumber) const issueTypeOptionsGroup = [ - {name: t('filter.searchOptions.approvalNumber'), value: 'issue'}, - {name: t('filter.searchOptions.issueNumber'), value: 'issue2'}, + {name: t('filter.searchOptions.approvalNumber'), value: CashReceiptSearchNumberType.APPROVAL_NUMBER}, + {name: t('filter.searchOptions.issueNumber'), value: CashReceiptSearchNumberType.ISSUE_NUMBER}, ]; const midOptions = useStore.getState().UserStore.selectOptionsMids; @@ -84,6 +84,8 @@ export const CashReceiptFilter = ({ setPurposeType(filterPurposeType); setTransactionType(filterTransactionType); setProcessResult(filterProcessResult); + setSearchNumberType(filterSearchNumberType) + setSearchNumber(filterSearchNumber) onClickToClose(); }; @@ -149,8 +151,8 @@ export const CashReceiptFilter = ({ selectValue={ filterSearchNumberType } selectSetter={ setFilterSearchNumberType } selectOptions={ issueTypeOptionsGroup } - inputValue={ filterIssueNumber } - inputSetter={ setFilterIssueNumber } + inputValue={ filterSearchNumber } + inputSetter={ setFilterSearchNumber } >
diff --git a/src/entities/transaction/ui/filter/escrow-filter.tsx b/src/entities/transaction/ui/filter/escrow-filter.tsx index 2e53081..dde9569 100644 --- a/src/entities/transaction/ui/filter/escrow-filter.tsx +++ b/src/entities/transaction/ui/filter/escrow-filter.tsx @@ -125,8 +125,8 @@ export const EscrowFilter = ({ selectValue={ filterSearchType } selectSetter={ setSearchType } selectOptions={ searchTypeOptionsGroup } - inputValue={ searchKeyword } - inputSetter={ setSearchKeyword } + inputValue={ filterSearchKeyword } + inputSetter={ setFilterSearchKeyword } >