Merge branch 'dev' into dev-yj

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('')

src/hooks/floorPlan/estimate/useEstimateController.js

@@ -92,6 +92,7 @@ export const useEstimateController = (planNo) => {
           unit: '', //단위
           salePrice: '0', //단가
           saleTotPrice: '0', //금액(부가세별도)
+          itemChangeFlg: '1', //추가시 체인지플래그 1로
         },
       ],
     })