From 889dba952fe3a675a24c58bbda70d53d1475d441 Mon Sep 17 00:00:00 2001 From: basssy Date: Mon, 11 Nov 2024 23:23:30 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EB=AA=A9=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/Stuff.jsx | 3 +- .../management/StuffSearchCondition.jsx | 69 ++++++++++++++++--- 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx index fb7ecd76..4503591b 100644 --- a/src/components/management/Stuff.jsx +++ b/src/components/management/Stuff.jsx @@ -174,7 +174,8 @@ export default function Stuff() { schToDt: dayjs(new Date()).format('YYYY-MM-DD'), startRow: (pageNo - 1) * pageSize + 1, endRow: pageNo * pageSize, - schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : stuffSearchParams.schSelSaleStoreId, + schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '', + schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '', schSortType: stuffSearchParams.schSortType, } diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index 7828d873..895cd75d 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -80,7 +80,8 @@ export default function StuffSearchCondition() { schAddress: address ? address : '', schObjectName: objectName ? objectName : '', schDispCompanyName: dispCompanyName ? dispCompanyName : '', - schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', + schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', schReceiveUser: receiveUser ? receiveUser : '', schDateType: dateType, schFromDt: dayjs(startDate).format('YYYY-MM-DD'), @@ -97,7 +98,8 @@ export default function StuffSearchCondition() { schAddress: address, schObjectName: objectName, schDispCompanyName: dispCompanyName, - schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schSelSaleStoreId: stuffSearch?.schSelSaleStoreId, + schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId, schReceiveUser: receiveUser, schDateType: dateType, schFromDt: dayjs(startDate).format('YYYY-MM-DD'), @@ -184,11 +186,31 @@ export default function StuffSearchCondition() { setSchSelSaleStoreList(allList) setFavoriteStoreList(favList) setShowSaleStoreList(favList) - // setSchSelSaleStoreId(session?.storeId) + // if (stuffSearch.code === 'FINISH') { + if (stuffSearch.schSelSaleStoreId != '') { + setSchSelSaleStoreId(stuffSearch.schSelSaleStoreId) + // if (stuffSearch.schOtherSelSaleStoreId != '') { + url = `/api/object/saleStore/${stuffSearch.schSelSaleStoreId}/list?firstFlg=1&userId=${session?.userId}` + get({ url: url }).then((res) => { + if (!isEmptyArray(res)) { + res.map((row) => { + row.value = row.saleStoreId + row.label = row.saleStoreName + }) + + otherList = res.filter((row) => row.saleStoreLevel !== '1') + setOtherSaleStoreList(otherList) + setOtherSaleStoreId(stuffSearch.schOtherSelSaleStoreId) + } else { + setOtherSaleStoreList([]) + } + }) + // } + } + // } setStuffSearch({ ...stuffSearch, code: 'S', - // schSelSaleStoreId: session?.storeId, }) //T01일때 2차 판매점 호출하기 디폴트로 1차점을 본인으로 셋팅해서 세션storeId사용 @@ -224,8 +246,11 @@ export default function StuffSearchCondition() { setStuffSearch({ ...stuffSearch, code: 'S', - schSelSaleStoreId: allList[0].saleStoreId, }) + + if (stuffSearch.schOtherSelSaleStoreId != '') { + setOtherSaleStoreId(stuffSearch.schOtherSelSaleStoreId) + } } else { //10X22, 201X112 그냥2차점 //2차점인데 34들고있는애 202X217 @@ -241,7 +266,8 @@ export default function StuffSearchCondition() { setStuffSearch({ ...stuffSearch, code: 'S', - schSelSaleStoreId: otherList[0].saleStoreId, + schSelSaleStoreId: res[0].saleStoreId, + schOtherSelSaleStoreId: otherList[0].saleStoreId, }) } } @@ -311,12 +337,31 @@ export default function StuffSearchCondition() { if (isObjectNotEmpty(key)) { setOtherSaleStoreId(key.saleStoreId) stuffSearch.schOtherSelSaleStoreId = key.saleStoreId + + //2차점 골랐을때 1차점 값 + stuffSearch.schSelSaleStoreId = schSelSaleStoreId } else { //X누르면 검색조건에 1차점으로 셋팅 - setOtherSaleStoreId('') - setSchSelSaleStoreId(schSelSaleStoreId) - stuffSearch.schOtherSelSaleStoreId = '' - stuffSearch.schSelSaleStoreId = schSelSaleStoreId + if (session.storeLvl === '1') { + if (stuffSearch.schOtherSelSaleStoreId === '') { + stuffSearch.schSelSaleStoreId = '' + setSchSelSaleStoreId(session.storeId) + } else { + setStuffSearch({ + ...stuffSearch, + schSelSaleStoreId: '', + schOtherSelSaleStoreId: '', + }) + //1차점 로그인해서 2차점 고르고 초기화 눌렀을때 + //stuffSearch에 schSelSaleStoreId 날리고 + //schOtherSelSaleStoreId 날리고 + } + } else { + setOtherSaleStoreId('') + setSchSelSaleStoreId(schSelSaleStoreId) + stuffSearch.schOtherSelSaleStoreId = '' + stuffSearch.schSelSaleStoreId = schSelSaleStoreId + } } } @@ -533,7 +578,9 @@ export default function StuffSearchCondition() { } else if (stuffSearch?.code === 'E' && schSelSaleStoreId !== '') { return option.saleStoreId === schSelSaleStoreId } else { - if (stuffSearch?.schSelSaleStoreId !== '') { + if (stuffSearch?.code === 'FINISH') { + return option.saleStoreId === schSelSaleStoreId + } else if (stuffSearch?.schSelSaleStoreId !== '') { return option.saleStoreId === stuffSearch.schSelSaleStoreId } else { return false