Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

src/components/floor-plan/CanvasMenu.jsx

@@ -215,9 +215,6 @@ export default function CanvasMenu(props) {
             setType('module')
           }
         } else {
-          //menuNumber가 모듈,회로 구성(4) 보다 큰 경우. (견적서:5, 발전시뮬:6)
-          //화면은 이동되는데 MenuDapth01 type이 null로 들어가서 모듈/가대설정, 회로설정 하위뎁스메뉴 안나오는 문제 수정
-          setType('module')
           router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
         }
         await reloadCanvasStatus(objectNo, pid)
@@ -249,6 +246,7 @@ export default function CanvasMenu(props) {
               setMenuNumber(menu.index)
               setCurrentMenu(menu.title)
               router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
+              setIsGlobalLoading(false)
             } else {
               setIsGlobalLoading(false)
               swalFire({ text: getMessage('simulator.menu.move.valid1') })
@@ -498,16 +496,11 @@ export default function CanvasMenu(props) {
               estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0'
               const { createUser, tempFlg, lockFlg } = estimateRecoilState
               if (createUser && tempFlg && lockFlg) {
-                if (createUser === 'T01') {
+                if (createUser === 'T01' && sessionState.storeId !== 'T01') {
-                  if (sessionState.storeId !== 'T01') {
+                  setAllButtonStyles('none')
-                    setAllButtonStyles('none')
-                  } else {
-                    setEstimateContextState({ tempFlg: estimateRecoilState.tempFlg, lockFlg: estimateRecoilState.lockFlg })
-                    handleButtonStyles(estimateRecoilState.tempFlg, estimateRecoilState.lockFlg)
-                  }
                 } else {
                   setEstimateContextState({ tempFlg: estimateRecoilState.tempFlg, lockFlg: estimateRecoilState.lockFlg })
-                  handleButtonStyles(estimateRecoilState.tempFlg, estimateRecoilState.lockFlg)
+                  handleButtonStyles(estimateRecoilState.tempFlg, estimateRecoilState.lockFlg, estimateContextState.docNo)
                 }
               }
             }

src/components/management/StuffSearchCondition.jsx

@@ -761,6 +761,15 @@ export default function StuffSearchCondition() {
         setSchSelSaleStoreId('')
         setOtherSaleStoreId('')
       } else {
+        setObjectNo(stuffSearch.schObjectNo ? stuffSearch.schObjectNo : objectNo)
+        setSaleStoreName(stuffSearch.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName)
+        setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
+        setObjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName)
+        setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
+        setAddress(stuffSearch.schAddress ? stuffSearch.schAddress : address)
+        setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
+        setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
+        setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD'))
         setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg)
       }
     } else {