diff --git a/src/components/estimate/popup/DocDownOptionPop.jsx b/src/components/estimate/popup/DocDownOptionPop.jsx index d6f1d5ec..6bbd6632 100644 --- a/src/components/estimate/popup/DocDownOptionPop.jsx +++ b/src/components/estimate/popup/DocDownOptionPop.jsx @@ -85,8 +85,8 @@ export default function DocDownOptionPop({ planNo, setEstimatePopupOpen, docDown link.remove() window.URL.revokeObjectURL(fileUrl) //문서 다운받으면 lockFlg = 1 잠금상태로! - // estimateRecoilState.lockFlg = '1' - // docDownPopLockFlg() + estimateRecoilState.lockFlg = '1' + docDownPopLockFlg() } }) .catch((error) => { diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index a47de33f..9a845eef 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -150,7 +150,7 @@ export default function CanvasMenu(props) { text: getMessage('stuff.detail.move.confirmMsg'), type: 'confirm', confirmFn: () => { - router.push(`/management/stuff/detail?objectNo=${objectNo}`) + router.push(`/management/stuff/detail?objectNo=${objectNo}`, { scroll: false }) }, }) break @@ -331,33 +331,33 @@ export default function CanvasMenu(props) { if (isObjectNotEmpty(estimateRecoilState)) { if (estimateRecoilState?.createUser === 'T01') { if (sessionState.userId !== 'T01') { - setButtonStyle('none') - // setButtonStyle1('none') - // setButtonStyle2('none') - // setButtonStyle3('none') - // setButtonStyle4('none') - // setButtonStyle5('none') + // setButtonStyle('none') + setButtonStyle1('none') + setButtonStyle2('none') + setButtonStyle3('none') + setButtonStyle4('none') + setButtonStyle5('none') } } else { if (estimateRecoilState?.tempFlg === '1') { - // setButtonStyle1('none') - // setButtonStyle2('') - // setButtonStyle3('none') - // setButtonStyle4('none') - // setButtonStyle5('none') + setButtonStyle1('none') + setButtonStyle2('') + setButtonStyle3('none') + setButtonStyle4('none') + setButtonStyle5('none') } else { if (estimateRecoilState?.tempFlg === '0' && estimateRecoilState?.lockFlg === '0') { - // setButtonStyle1('') - // setButtonStyle2('') - // setButtonStyle3('') - // setButtonStyle4('') - // setButtonStyle5('') + setButtonStyle1('') + setButtonStyle2('') + setButtonStyle3('') + setButtonStyle4('') + setButtonStyle5('') } else { - // setButtonStyle1('') - // setButtonStyle2('none') - // setButtonStyle3('none') - // setButtonStyle4('') - // setButtonStyle5('') + setButtonStyle1('') + setButtonStyle2('none') + setButtonStyle3('none') + setButtonStyle4('') + setButtonStyle5('') } } } @@ -524,20 +524,20 @@ export default function CanvasMenu(props) { {menuNumber === 5 && ( <>
- - {/*
{/* 견적서(menuNumber=== 5) 상세화면인경우 문서다운로드 팝업 */} {estimatePopupOpen && ( - // - + + // )} {/* 견적서(menuNumber ===5)복사 팝업 */} {estimateCopyPopupOpen && }