{currentRoof &&
roofAngleSetArray.map((item) => (
-
+
setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
/>
diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx
index 263158a4..1a39e9e1 100644
--- a/src/components/header/Header.jsx
+++ b/src/components/header/Header.jsx
@@ -19,6 +19,8 @@ import { globalLocaleStore } from '@/store/localeAtom'
import { stuffSearchState } from '@/store/stuffAtom'
import { QcastContext } from '@/app/QcastProvider'
+import { usePopup } from '@/hooks/usePopup'
+
export const ToggleonMouse = (e, act, target) => {
const listWrap = e.target.closest(target)
const ListItem = Array.from(listWrap.childNodes)
@@ -39,6 +41,8 @@ export default function Header(props) {
const [stuffSearch, setStuffSearch] = useRecoilState(stuffSearchState)
+ const { closeAll } = usePopup()
+
const { userSession } = props
const [sessionState, setSessionState] = useRecoilState(sessionStore)
const { getMessage } = useMessage()
@@ -176,6 +180,9 @@ export default function Header(props) {
onClick={() => {
// moveHome()
removeStuffRecoil(menu)
+ if (pathName === '/') {
+ window.location.reload()
+ }
}}
>
{getMessage(menu.name)}
@@ -226,6 +233,9 @@ export default function Header(props) {
...stuffSearch,
code: 'DELETE',
})
+ if (pathName === '/') {
+ window.location.reload()
+ }
}}
>
@@ -239,6 +249,7 @@ export default function Header(props) {
href="#"
onClick={() => {
setUserInfoModal(true)
+ closeAll()
}}
>
diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index cdcf8fe7..66b0974c 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -88,6 +88,8 @@ export const useEstimateController = (planNo) => {
setIsGlobalLoading(false)
} catch (error) {
console.error('견적서 상세조회 Error: ', error)
+
+ swalFire({ text: getMessage('estimate.menu.move.valid1') })
setIsLoading(true)
setIsGlobalLoading(false)
}
diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js
index 3b956843..39487361 100644
--- a/src/hooks/roofcover/useRoofAllocationSetting.js
+++ b/src/hooks/roofcover/useRoofAllocationSetting.js
@@ -156,7 +156,13 @@ export function useRoofAllocationSetting(id) {
}
setCurrentRoofList(selectRoofs)
- setBasicSetting({ ...basicSetting, roofsData: roofsArray })
+ //setBasicSetting({ ...basicSetting, roofsData: roofsArray })
+ setBasicSetting({
+ ...basicSetting,
+ roofSizeSet: res[0].roofSizeSet,
+ roofAngleSet: res[0].roofAngleSet,
+ roofsData: roofsArray,
+ })
})
} catch (error) {
console.error('Data fetching error:', error)
diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js
index f7848be5..db170dc7 100644
--- a/src/hooks/usePlan.js
+++ b/src/hooks/usePlan.js
@@ -14,7 +14,7 @@ import { useCanvas } from '@/hooks/useCanvas'
import { SAVE_KEY } from '@/common/common'
import { readImage, removeImage } from '@/lib/fileAction'
import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
-
+import { useEstimateController } from '@/hooks/floorPlan/estimate/useEstimateController'
export function usePlan(params = {}) {
const { floorPlanState } = useContext(FloorPlanContext)
@@ -31,8 +31,9 @@ export function usePlan(params = {}) {
const { swalFire } = useSwal()
const { getMessage } = useMessage()
- const { get, promisePost, promisePut, promiseDel } = useAxios()
+ const { get, promisePost, promisePut, promiseDel, promiseGet } = useAxios()
+ const { setEstimateContextState } = useEstimateController()
/**
* 마우스 포인터의 가이드라인을 제거합니다.
*/
@@ -203,12 +204,44 @@ export function usePlan(params = {}) {
* 현재 plan의 작업상태를 저장 후 이동
*/
const handleCurrentPlan = async (newCurrentId) => {
- if (pathname === '/floor-plan') {
- if (!currentCanvasPlan || currentCanvasPlan.id !== newCurrentId) {
- await saveCanvas()
- }
- }
- updateCurrentPlan(newCurrentId)
+ const orderingNo = plans?.find((obj) => obj.id === newCurrentId).ordering
+ const objectNo = floorPlanState.objectNo
+ await promiseGet({ url: `/api/estimate/${objectNo}/${orderingNo}/detail` })
+ .then((res) => {
+ if (res.status === 200) {
+ const estimateDetail = res.data
+ if (estimateDetail.docNo) {
+ res.data.resetFlag = 'N'
+
+ if (res.data.itemList.length > 0) {
+ res.data.itemList.map((item) => {
+ item.delFlg = '0'
+ })
+ }
+ if (res.data.pkgAsp === null || res.data.pkgAsp == undefined) {
+ res.data.pkgAsp = '0.00'
+ } else {
+ const number = parseFloat(res.data.pkgAsp)
+ const roundedNumber = isNaN(number) ? '0.00' : number.toFixed(2)
+
+ res.data.pkgAsp = roundedNumber.toString()
+ }
+ setEstimateContextState(res.data)
+
+ if (pathname === '/floor-plan') {
+ if (!currentCanvasPlan || currentCanvasPlan.id !== newCurrentId) {
+ saveCanvas()
+ }
+ }
+ updateCurrentPlan(newCurrentId)
+ } else {
+ swalFire({ text: getMessage('estimate.menu.move.valid1') })
+ }
+ }
+ })
+ .catch((error) => {
+ swalFire({ text: getMessage('estimate.menu.move.valid1') })
+ })
}
const updateCurrentPlan = (newCurrentId) => {