test
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { DefaulResponsePagination, DefaultRequestPagination, SuccessResult } from '@/entities/common/model/types';
|
import { DefaulResponsePagination, DefaultRequestPagination, SortTypeKeys, SuccessResult } from '@/entities/common/model/types';
|
||||||
|
|
||||||
export enum CancelTabKeys {
|
export enum CancelTabKeys {
|
||||||
All = 'All',
|
All = 'All',
|
||||||
@@ -225,20 +225,21 @@ export interface AllTransactionListSummaryResponse {
|
|||||||
totalTransactionAmount: number;
|
totalTransactionAmount: number;
|
||||||
};
|
};
|
||||||
export interface AllTransactionListParams {
|
export interface AllTransactionListParams {
|
||||||
moid: string;
|
moid?: string;
|
||||||
tid: string;
|
tid?: string;
|
||||||
fromDate: string;
|
fromDate: string;
|
||||||
toDate: string;
|
toDate: string;
|
||||||
stateCode: string;
|
stateCode?: string;
|
||||||
serviceCode: string;
|
serviceCode?: string;
|
||||||
minAmount?: number;
|
minAmount?: number;
|
||||||
maxAmount?: number;
|
maxAmount?: number;
|
||||||
dateCl: string;
|
dateCl?: string;
|
||||||
goodsName: string;
|
goodsName?: string;
|
||||||
cardCode?: string;
|
cardCode?: string;
|
||||||
bankCode?: string;
|
bankCode?: string;
|
||||||
searchCl?: AllTransactionSearchCl;
|
searchCl?: AllTransactionSearchCl;
|
||||||
searchValue?: string;
|
searchValue?: string;
|
||||||
|
sortType?: SortTypeKeys;
|
||||||
page?: DefaultRequestPagination;
|
page?: DefaultRequestPagination;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ export const FaqListPage = () => {
|
|||||||
{ getFaqList() }
|
{ getFaqList() }
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="apply-row bottom-padding">
|
<div className="apply-row">
|
||||||
<button
|
<button
|
||||||
className="btn-50 btn-blue flex-1"
|
className="btn-50 btn-blue flex-1"
|
||||||
onClick={ () => onClickToNavigation() }
|
onClick={ () => onClickToNavigation() }
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ export const QnaListPage = () => {
|
|||||||
{ getQnaList() }
|
{ getQnaList() }
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="apply-row bottom-padding">
|
<div className="apply-row">
|
||||||
<button
|
<button
|
||||||
className="btn-50 btn-blue flex-1"
|
className="btn-50 btn-blue flex-1"
|
||||||
onClick={ () => onClickToNavigation() }
|
onClick={ () => onClickToNavigation() }
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { IMAGE_ROOT } from '@/shared/constants/common';
|
|||||||
import { PATHS } from '@/shared/constants/paths';
|
import { PATHS } from '@/shared/constants/paths';
|
||||||
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
||||||
import { AllTransactionList } from '@/entities/transaction/ui/all-transaction-list';
|
import { AllTransactionList } from '@/entities/transaction/ui/all-transaction-list';
|
||||||
import { AllTransactionListItem, TransactionCategory, AllTransactionStateCode, AllTransactionServiceCode, AllTransactionSearchCl } from '@/entities/transaction/model/types';
|
import { AllTransactionListItem, TransactionCategory, AllTransactionStateCode, AllTransactionServiceCode, AllTransactionSearchCl, AllTransactionListParams } from '@/entities/transaction/model/types';
|
||||||
import { useAllTransactionListMutation } from '@/entities/transaction/api/use-all-transaction-list-mutation';
|
import { useAllTransactionListMutation } from '@/entities/transaction/api/use-all-transaction-list-mutation';
|
||||||
import { useAllTransactionListSummaryMutation } from '@/entities/transaction/api/use-all-transaction-list-summary-mutation';
|
import { useAllTransactionListSummaryMutation } from '@/entities/transaction/api/use-all-transaction-list-summary-mutation';
|
||||||
import { useDownloadExcelMutation } from '@/entities/transaction/api/use-download-excel-mutation';
|
import { useDownloadExcelMutation } from '@/entities/transaction/api/use-download-excel-mutation';
|
||||||
@@ -35,6 +35,8 @@ export const AllTransactionListPage = () => {
|
|||||||
const [mid, setMid] = useState<string>(userMid);
|
const [mid, setMid] = useState<string>(userMid);
|
||||||
const [moid, setMoid] = useState<string>('');
|
const [moid, setMoid] = useState<string>('');
|
||||||
const [tid, setTid] = useState<string>('');
|
const [tid, setTid] = useState<string>('');
|
||||||
|
const [dateCl, setDateCl] = useState<string>();
|
||||||
|
const [goodsName, setGoodsName] = useState<string>();
|
||||||
// const [fromDate, setFromDate] = useState(moment().subtract(1, 'month').format('YYYYMMDD'));
|
// const [fromDate, setFromDate] = useState(moment().subtract(1, 'month').format('YYYYMMDD'));
|
||||||
const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD'));
|
const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD'));
|
||||||
const [toDate, setToDate] = useState(moment().format('YYYYMMDD'));
|
const [toDate, setToDate] = useState(moment().format('YYYYMMDD'));
|
||||||
@@ -66,7 +68,7 @@ export const AllTransactionListPage = () => {
|
|||||||
sortType?: SortTypeKeys,
|
sortType?: SortTypeKeys,
|
||||||
val?: string
|
val?: string
|
||||||
}) => {
|
}) => {
|
||||||
let listSummaryParams = {
|
let listSummaryParams: AllTransactionListParams = {
|
||||||
moid: moid,
|
moid: moid,
|
||||||
tid: tid,
|
tid: tid,
|
||||||
fromDate: fromDate,
|
fromDate: fromDate,
|
||||||
@@ -75,8 +77,8 @@ export const AllTransactionListPage = () => {
|
|||||||
serviceCode: serviceCode,
|
serviceCode: serviceCode,
|
||||||
minAmount: minAmount,
|
minAmount: minAmount,
|
||||||
maxAmount: maxAmount,
|
maxAmount: maxAmount,
|
||||||
dateCl: 'TRANS',
|
dateCl: dateCl,
|
||||||
goodsName: 'string',
|
goodsName: goodsName,
|
||||||
cardCode: cardCode,
|
cardCode: cardCode,
|
||||||
bankCode: bankCode,
|
bankCode: bankCode,
|
||||||
searchCl: searchCl,
|
searchCl: searchCl,
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ main.home-main{
|
|||||||
width: 85px;
|
width: 85px;
|
||||||
}
|
}
|
||||||
.full-menu-container{
|
.full-menu-container{
|
||||||
padding-top: 234px;
|
padding-top: 50px;
|
||||||
}
|
}
|
||||||
.full-menu-header{
|
.full-menu-header{
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@@ -122,6 +122,7 @@ main.home-main{
|
|||||||
|
|
||||||
.full-menu-list{
|
.full-menu-list{
|
||||||
position: relative;
|
position: relative;
|
||||||
|
padding-top: 184px;
|
||||||
top: calc(env(safe-area-inset-top));
|
top: calc(env(safe-area-inset-top));
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
Reference in New Issue
Block a user