Merge branch 'dev' into dev-yj

src/components/management/Stuff.jsx

@@ -214,7 +214,7 @@ export default function Stuff() {
 
   // 진입시 그리드 데이터 조회
   useEffect(() => {
-    if (stuffSearchParams?.code === 'S') {
+    if (stuffSearchParams?.code === 'S' || stuffSearchParams?.code === 'END') {
       const params = {
         saleStoreId: session.storeId,
         schObjectNo: stuffSearchParams?.schObjectNo,
@@ -267,7 +267,11 @@ export default function Stuff() {
           setIsGlobalLoading(false)
         })
       }
-      fetchData()
+      if (stuffSearchParams.code === 'S') {
+        fetchData()
+      } else {
+        stuffSearchParams.code = 'S'
+      }
     } else if (stuffSearchParams?.code === 'M') {
       const params = {
         schObjectNo: stuffSearchParams.schObjectNo,
@@ -328,7 +332,6 @@ export default function Stuff() {
             stuffSearchParams.startRow = 1
             stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize
           }
-
           setIsGlobalLoading(false)
         })
       }
@@ -383,7 +386,7 @@ export default function Stuff() {
         schSelSaleStoreId: '',
         schOtherSelSaleStoreId: '',
         schSortType: 'U',
-        code: 'S',
+        code: 'END',
         pageNo: 1,
         pageSize: 100,
         schMyDataCheck: false,
@@ -392,7 +395,6 @@ export default function Stuff() {
       setStuffSearch({
         ...newParams,
       })
-
       setIsGlobalLoading(false)
     } else {
       stuffSearchParams.code = 'DELETE'

src/components/management/StuffSearchCondition.jsx

@@ -611,14 +611,9 @@ export default function StuffSearchCondition() {
 
   //판매대리점 자동완성 변경
   const onSelectionChange = (key) => {
-    //내 물건보기 체크 풀어주기
-    setMyDataCheck(stuffSearch.schMyDataCheck)
-    // stuffSearch.schMyDataCheck = false
-
     if (isObjectNotEmpty(key)) {
       setOtherSaleStoreId('')
       setSchSelSaleStoreId(key.saleStoreId)
-      // stuffSearch.schSelSaleStoreId = key.saleStoreId
       //고른 1차점의 saleStoreId로 2차점 API호출하기
       let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
       let otherList
@@ -663,7 +658,6 @@ export default function StuffSearchCondition() {
     stuffSearch.schMyDataCheck = false
     if (isObjectNotEmpty(key)) {
       setOtherSaleStoreId(key.saleStoreId)
-      // stuffSearch.schOtherSelSaleStoreId = key.saleStoreId
 
       //2차점 골랐을때 1차점 값
       if (session.storeId === 'T01') {
@@ -767,7 +761,6 @@ export default function StuffSearchCondition() {
         setOtherSaleStoreId('')
       } else {
         setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg)
-        setMyDataCheck(stuffSearch.schMyDataCheck)
       }
     } else {
       if (stuffSearch.code === 'DELETE') {
@@ -820,7 +813,7 @@ export default function StuffSearchCondition() {
         setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
         setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
         setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg)
-        setMyDataCheck(stuffSearch.schMyDataCheck)
+
         if (session.storeLvl !== '1') {
           stuffSearch.schSelSaleStoreId = ''
         }
@@ -836,12 +829,6 @@ export default function StuffSearchCondition() {
     } else if (stuffSearch.schTempFlg === '1') {
       setTempFlg('1')
     }
-
-    if (stuffSearch.schMyDataCheck) {
-      setMyDataCheck(true)
-    } else {
-      setMyDataCheck(false)
-    }
   }, [stuffSearch])
 
   useEffect(() => {
@@ -865,42 +852,35 @@ export default function StuffSearchCondition() {
     //0203 내물건보기 체크시 공통 schSaleStoreId에 storeId담아 전송 schSelSaleStoreId, schOtherSelSaleStoreId 비우기
     if (session?.storeId === 'T01') {
       if (e.target.checked) {
-        stuffSearch.schMyDataCheck = e.target.checked
         setMyDataCheck(true)
         setOtherSaleStoreId('') //2차점 비우기
         setSchSelSaleStoreId('T01')
 
-        stuffSearch.schSaleStoreId = session.storeId
         stuffSearch.schSelSaleStoreId = ''
         stuffSearch.schOtherSelSaleStoreId = ''
         const key = { saleStoreId: session.storeId }
         onSelectionChange(key)
       } else {
         stuffSearch.schSaleStoreId = ''
-        stuffSearch.schMyDataCheck = e.target.checked
         setSchSelSaleStoreId('')
         setMyDataCheck(false)
+        //아래꺼 확인필요
         onSelectionChange(null)
       }
     } else if (session?.storeLvl === '1') {
       if (e.target.checked) {
-        stuffSearch.schMyDataCheck = e.target.checked
         setMyDataCheck(true)
         setOtherSaleStoreId('') //2차점 비우기
         setSchSelSaleStoreId(schSelSaleStoreId)
-        stuffSearch.schSaleStoreId = session.storeId
         stuffSearch.schSelSaleStoreId = ''
         stuffSearch.schOtherSelSaleStoreId = ''
       } else {
-        stuffSearch.schMyDataCheck = e.target.checked
-        stuffSearch.schSaleStoreId = ''
         setMyDataCheck(false)
       }
     } else {
       //2차점인제 3,4가 없으면 상관없음
       //3,4등등이 있는경우 처리필요
       if (e.target.checked) {
-        stuffSearch.schMyDataCheck = e.target.checked
         setMyDataCheck(true)
         if (otherSaleStoreList.length > 1) {
           stuffSearch.schSaleStoreId = session.storeId
@@ -913,7 +893,6 @@ export default function StuffSearchCondition() {
         }
       } else {
         setMyDataCheck(false)
-        stuffSearch.schMyDataCheck = e.target.checked
         stuffSearch.schSaleStoreId = ''
       }
     }
@@ -996,7 +975,6 @@ export default function StuffSearchCondition() {
                       className="input-light"
                       defaultValue={stuffSearch?.schObjectNo ? stuffSearch.schObjectNo : objectNo}
                       onChange={() => {
-                        // stuffSearch.schObjectNo = objectNoRef.current.value
                         setObjectNo(objectNoRef.current.value)
                       }}
                       onKeyUp={handleByOnKeyUp}
@@ -1012,7 +990,6 @@ export default function StuffSearchCondition() {
                       className="input-light"
                       defaultValue={stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName}
                       onChange={() => {
-                        // stuffSearch.schSaleStoreName = saleStoreNameRef.current.value
                         setSaleStoreName(saleStoreNameRef.current.value)
                       }}
                       onKeyUp={handleByOnKeyUp}
@@ -1029,7 +1006,6 @@ export default function StuffSearchCondition() {
                       className="input-light"
                       defaultValue={stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName}
                       onChange={() => {
-                        // stuffSearch.schDispCompanyName = dispCompanyNameRef.current.value
                         setDispCompanyName(dispCompanyNameRef.current.value)
                       }}
                       onKeyUp={handleByOnKeyUp}
@@ -1047,7 +1023,6 @@ export default function StuffSearchCondition() {
                       className="input-light"
                       defaultValue={stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName}
                       onChange={() => {
-                        // stuffSearch.schObjectName = objectNameRef.current.value
                         setObjectName(objectNameRef.current.value)
                       }}
                       onKeyUp={handleByOnKeyUp}
@@ -1063,7 +1038,6 @@ export default function StuffSearchCondition() {
                       ref={receiveUserRef}
                       defaultValue={stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser}
                       onChange={() => {
-                        // stuffSearch.schReceiveUser = receiveUserRef.current.value
                         setReceiveUser(receiveUserRef.current.value)
                       }}
                       onKeyUp={handleByOnKeyUp}
@@ -1079,7 +1053,6 @@ export default function StuffSearchCondition() {
                       className="input-light"
                       defaultValue={stuffSearch?.schAddress ? stuffSearch.schAddress : address}
                       onChange={() => {
-                        // stuffSearch.schAddress = addressRef.current.value
                         setAddress(addressRef.current.value)
                       }}
                       onKeyUp={handleByOnKeyUp}
@@ -1101,7 +1074,6 @@ export default function StuffSearchCondition() {
                           value={'U'}
                           onChange={(e) => {
                             setDateType(e.target.value)
-                            // stuffSearch.schDateType = e.target.value
                           }}
                         />
                         <label htmlFor="radio_u">{getMessage('stuff.search.schDateTypeU')}</label>
@@ -1115,7 +1087,6 @@ export default function StuffSearchCondition() {
                           value={'R'}
                           onChange={(e) => {
                             setDateType(e.target.value)
-                            // stuffSearch.schDateType = e.target.value
                           }}
                         />
                         <label htmlFor="radio_r">{getMessage('stuff.search.schDateTypeR')}</label>
@@ -1140,11 +1111,10 @@ export default function StuffSearchCondition() {
                         type="radio"
                         name="schTempFlg"
                         id="schTempFlg"
-                        checked={stuffSearch.schTempFlg === '' ? true : false}
+                        checked={tempFlg === '' ? true : false}
                         value={''}
                         onChange={(e) => {
                           setTempFlg(e.target.value)
-                          stuffSearch.schTempFlg = e.target.value
                         }}
                       />
                       <label htmlFor="schTempFlg">{getMessage('stuff.search.schTempFlg')}</label>
@@ -1154,11 +1124,10 @@ export default function StuffSearchCondition() {
                         type="radio"
                         name="schTempFlg"
                         id="schTempFlg0"
-                        checked={stuffSearch.schTempFlg === '0' ? true : false}
+                        checked={tempFlg === '0' ? true : false}
                         value={'0'}
                         onChange={(e) => {
                           setTempFlg(e.target.value)
-                          stuffSearch.schTempFlg = e.target.value
                         }}
                       />
                       <label htmlFor="schTempFlg0">{getMessage('stuff.search.schTempFlg0')}</label>
@@ -1168,11 +1137,10 @@ export default function StuffSearchCondition() {
                         type="radio"
                         name="schTempFlg"
                         id="schTempFlg1"
-                        checked={stuffSearch.schTempFlg === '1' ? true : false}
+                        checked={tempFlg === '1' ? true : false}
                         value={'1'}
                         onChange={(e) => {
                           setTempFlg(e.target.value)
-                          stuffSearch.schTempFlg = e.target.value
                         }}
                       />
                       <label htmlFor="schTempFlg1">{getMessage('stuff.search.schTempFlg1')}</label>
@@ -1297,7 +1265,6 @@ export default function StuffSearchCondition() {
                         onChange={onSelectionChange2}
                         getOptionLabel={(x) => x.saleStoreName}
                         getOptionValue={(x) => x.saleStoreId}
-                        // isDisabled={otherSaleStoreList != null && otherSaleStoreList.length === 1 ? true : false}
                         isDisabled={
                           session?.storeLvl === '1' ? (otherSaleStoreList.length > 0 ? false : true) : otherSaleStoreList.length === 1 ? true : false
                         }
@@ -1312,10 +1279,9 @@ export default function StuffSearchCondition() {
                       <input
                         type="checkbox"
                         id="schMine"
-                        checked={stuffSearch.schMyDataCheck ? true : false}
+                        checked={myDataCheck ? true : false}
                         onChange={(e) => {
                           checkMyData(e)
-                          stuffSearch.schMyDataCheck = e.target.checked
                         }}
                       />
                       <label htmlFor="schMine">{getMessage('stuff.search.schMine')}</label>

src/hooks/common/useCanvasPopupStatusController.js

@@ -17,7 +17,7 @@ export function useCanvasPopupStatusController(param = 1) {
   const [compasDeg, setCompasDeg] = useRecoilState(compasDegAtom)
   const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState)
   const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState)
-  const { get, getFetcher, postFetcher } = useAxios()
+  const { get, promiseGet, getFetcher, postFetcher } = useAxios()
   const canvas = useRecoilValue(canvasState)
   const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
   // console.log('🚀 ~ Orientation ~ currentCanvasPlan:', currentCanvasPlan)
@@ -37,11 +37,18 @@ export function useCanvasPopupStatusController(param = 1) {
     //   getFetcher,
     // )
 
-    const res = await get({
+    const result = await promiseGet({
       url: `/api/v1/canvas-popup-status?objectNo=${currentCanvasPlan.objectNo}&planNo=${currentCanvasPlan.planNo}&popupType=${popupTypeParam}`,
     })
+      .then((res) => {
+        return res
+      })
+      .catch((err) => {
+        console.log('🚀 ~ getModuleSelection ~ err:', err)
+        return null
+      })
 
-    return res
+    return result.data
   }
 
   /**
@@ -51,8 +58,9 @@ export function useCanvasPopupStatusController(param = 1) {
   const handleModuleSelectionTotal = async () => {
     for (let i = 1; i < 3; i++) {
       const result = await getModuleSelection(i)
+      console.log('🚀 ~ handleModuleSelectionTotal ~ result:', result)
       // setModuleSelectionTotal((prev) => ({ ...prev, [i]: JSON.parse(unescapeString(result.popupStatus)) }))
-      if (!result) return
+      if (!result.objectNo) return
       if (i === 1) {
         setCompasDeg(result.popupStatus)
       } else if (i === 2) {