This commit is contained in:
focp212@naver.com
2025-10-29 17:59:52 +09:00
parent 8529f501c7
commit 8d67d59d78
4 changed files with 24 additions and 16 deletions

View File

@@ -22,6 +22,7 @@ import {
FilterMotionVariants FilterMotionVariants
} from '@/entities/common/model/constant'; } from '@/entities/common/model/constant';
import { useStore } from '@/shared/model/store'; import { useStore } from '@/shared/model/store';
import { FilterSelectMid } from '@/shared/ui/filter/select-mid';
export const AllTransactionFilter = ({ export const AllTransactionFilter = ({
filterOn, filterOn,
@@ -199,12 +200,11 @@ export const AllTransactionFilter = ({
</div> </div>
<div className="option-list pt-16"> <div className="option-list pt-16">
<FilterSelect <FilterSelectMid
title='가맹점' title='가맹점'
selectValue={ filterMid }
selectSetter={ setMid } selectSetter={ setMid }
selectOptions={ midOptions } showType={ 'GID' }
></FilterSelect> ></FilterSelectMid>
<FilterSelectInput <FilterSelectInput
title='주문번호/TID' title='주문번호/TID'
selectValue={ filterMoidTidType } selectValue={ filterMoidTidType }

View File

@@ -24,6 +24,7 @@ import {
FilterMotionVariants FilterMotionVariants
} from '@/entities/common/model/constant'; } from '@/entities/common/model/constant';
import { useStore } from '@/shared/model/store'; import { useStore } from '@/shared/model/store';
import { FilterSelectMid } from '@/shared/ui/filter/select-mid';
export const CashReceiptFilter = ({ export const CashReceiptFilter = ({
filterOn, filterOn,
@@ -111,12 +112,11 @@ export const CashReceiptFilter = ({
</div> </div>
<div className="option-list pt-16"> <div className="option-list pt-16">
<FilterSelect <FilterSelectMid
title='가맹점' title='가맹점'
selectValue={ filterMid }
selectSetter={ setMid } selectSetter={ setMid }
selectOptions={ midOptions } showType={ 'GID' }
></FilterSelect> ></FilterSelectMid>
<FilterCalendar <FilterCalendar
title='발행일자' title='발행일자'
startDate={ filterStartDate } startDate={ filterStartDate }

View File

@@ -3,13 +3,13 @@ import { ChangeEvent, useEffect, useState } from "react";
export interface FilterSelectMidProps { export interface FilterSelectMidProps {
title: string; title: string;
selectValue: string;
selectSetter: (value: any) => void; selectSetter: (value: any) => void;
showType: 'GID' | 'MID'
}; };
export const FilterSelectMid = ({ export const FilterSelectMid = ({
title, title,
selectValue,
selectSetter, selectSetter,
showType = 'GID'
}: FilterSelectMidProps) => { }: FilterSelectMidProps) => {
const midOptions = useStore.getState().UserStore.selectOptionsMids; const midOptions = useStore.getState().UserStore.selectOptionsMids;
const userMid = useStore.getState().UserStore.mid; const userMid = useStore.getState().UserStore.mid;
@@ -19,6 +19,13 @@ export const FilterSelectMid = ({
const getSelectMidOptions = () => { const getSelectMidOptions = () => {
let rs = []; let rs = [];
for(let i=0;i<midOptions.length;i++){ for(let i=0;i<midOptions.length;i++){
let value = midOptions[i]?.value;
if(value && showType === 'MID'){
let last = value.slice(-1);
if(last.toLowerCase() === 'g'){
continue;
}
}
rs.push( rs.push(
<option <option
key={ `key-filter-select-${i}` } key={ `key-filter-select-${i}` }
@@ -33,7 +40,7 @@ export const FilterSelectMid = ({
}; };
useEffect(() => { useEffect(() => {
selectSetter(filterMid);
}, [filterMid]); }, [filterMid]);
return ( return (

View File

@@ -223,15 +223,16 @@ export const SubLayout = () => {
const handleLogin = useCallback(async () => { const handleLogin = useCallback(async () => {
let userParmas; let userParmas;
if(!isNativeEnvironment){ if(!isNativeEnvironment){
/*
userParmas = { userParmas = {
id: 'nictest00', id: 'nictest00',
password: 'nictest00' password: 'nictest00'
}; };
*/
// userParmas = { userParmas = {
// id: 'medi9332', id: 'woowahan5',
// password: 'medi9332' password: 'nictest00'
// }; };
} }
callLogin(userParmas).then(() => { callLogin(userParmas).then(() => {