From 0f2d99d2aae8f893101b4b2602f96152c795e2b8 Mon Sep 17 00:00:00 2001 From: basssy Date: Wed, 13 Nov 2024 16:25:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/StuffSearchCondition.jsx | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index f6514667..f82d83f3 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -151,6 +151,7 @@ export default function StuffSearchCondition() { setEndDate(dayjs(new Date()).format('YYYY-MM-DD')) if (session?.storeId === 'T01') { setSchSelSaleStoreId('') + setOtherSaleStoreId('') handleClear1() //판매대리점선택 자동완성 클리어 resetStuffRecoil() setStuffSearch({ @@ -204,10 +205,8 @@ export default function StuffSearchCondition() { setSchSelSaleStoreList(allList) setFavoriteStoreList(favList) setShowSaleStoreList(favList) - // 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)) { @@ -223,30 +222,10 @@ export default function StuffSearchCondition() { setOtherSaleStoreList([]) } }) - // } } - // } - setStuffSearch({ - ...stuffSearch, - code: 'S', - }) - - //T01일때 2차 판매점 호출하기 디폴트로 1차점을 본인으로 셋팅해서 세션storeId사용 - // 디폴트 셋팅 안하기로 - // url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=0&userId=${session?.userId}` - - // get({ url: url }).then((res) => { - // if (!isEmptyArray(res)) { - // res.map((row) => { - // row.value = row.saleStoreId - // row.label = row.saleStoreName - // }) - - // otherList = res - // setOtherSaleStoreList(otherList) - // } else { - // setOtherSaleStoreList([]) - // } + // setStuffSearch({ + // ...stuffSearch, + // code: 'S', // }) } else { if (session?.storeLvl === '1') { @@ -261,11 +240,6 @@ export default function StuffSearchCondition() { setOtherSaleStoreList(otherList) - setStuffSearch({ - ...stuffSearch, - code: 'S', - }) - if (stuffSearch.schOtherSelSaleStoreId != '') { setOtherSaleStoreId(stuffSearch.schOtherSelSaleStoreId) } @@ -369,10 +343,6 @@ export default function StuffSearchCondition() { } else { // 화면에선 지우는데 조회누르기 전이면 리코일은 남김 setOtherSaleStoreId('') - setStuffSearch({ - ...stuffSearch, - // schOtherSelSaleStoreId: '', - }) } } else { setOtherSaleStoreId('') From 822476f5a62ffae393e43ecc0c62cbe023940b01 Mon Sep 17 00:00:00 2001 From: basssy Date: Wed, 13 Nov 2024 18:02:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/floorPlan/estimate/useEstimateController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index d2e067ba..06f3d4b4 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -92,6 +92,7 @@ export const useEstimateController = (planNo) => { unit: '', //단위 salePrice: '0', //단가 saleTotPrice: '0', //금액(부가세별도) + itemChangeFlg: '1', //추가시 체인지플래그 1로 }, ], })