From 246bf3ea41ecc037574ffe7be5859faf2fab1ad4 Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 19 Nov 2024 09:45:32 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=83=81?= =?UTF-8?q?=EC=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 25 ++++++++++--------- .../estimate/useEstimateController.js | 3 +++ src/locales/ja.json | 2 +- src/locales/ko.json | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 133cdfa2..27a95c90 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -35,6 +35,7 @@ import { MENU } from '@/common/common' import { useEstimateController } from '@/hooks/floorPlan/estimate/useEstimateController' import { estimateState } from '@/store/floorPlanObjectAtom' import DocDownOptionPop from '../estimate/popup/DocDownOptionPop' +import { button } from '@nextui-org/react' export default function CanvasMenu(props) { const { menuNumber, setMenuNumber } = props @@ -168,7 +169,6 @@ export default function CanvasMenu(props) { */ const handleEstimateCopy = () => { - // console.log('estimateRecoilState::', estimateRecoilState) //objectNo, planNo console.log('복사') console.log('물건정보+도면+견적서를 모두 복사') @@ -279,7 +279,6 @@ export default function CanvasMenu(props) { {getMessage('plan.menu.estimate.save')} - {/* {estimateRecoilState?.docNo != null && ( */} - {/* )} */} - + {estimateRecoilState?.docNo !== null && (sessionState.storeId === 'T01' || sessionState.storeLvl === '1') && ( + + )} )} diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index 0dd30512..88e3efab 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -6,6 +6,7 @@ import { estimateState, floorPlanObjectState } from '@/store/floorPlanObjectAtom import { isObjectNotEmpty } from '@/util/common-utils' import { SessionContext } from '@/app/SessionProvider' import { useMessage } from '@/hooks/useMessage' +import { useRouter } from 'next/navigation' const reducer = (prevState, nextState) => { return { ...prevState, ...nextState } @@ -34,6 +35,7 @@ const updateItemInList = (itemList, dispOrder, updates) => { } export const useEstimateController = (planNo) => { + const router = useRouter() const { session } = useContext(SessionContext) const globalLocaleState = useRecoilValue(globalLocaleStore) const objectRecoil = useRecoilValue(floorPlanObjectState) @@ -185,6 +187,7 @@ export const useEstimateController = (planNo) => { // console.log('최종 남은 아이템정보:::', estimateData.itemList) console.log('최종 정보::;', estimateData) + //drawingFlg null ???? //2. 상세데이터 저장 // return diff --git a/src/locales/ja.json b/src/locales/ja.json index 3918cdba..ce535e61 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -160,7 +160,7 @@ "plan.menu.estimate.docDown": "文書のダウンロード", "plan.menu.estimate.save": "保存", "plan.menu.estimate.reset": "初期化", - "plan.menu.estimate.copy": "コピー", + "plan.menu.estimate.copy": "見積書のコピー", "plan.menu.simulation": "発展シミュレーション", "plan.menu.simulation.excel": "Excel", "plan.menu.simulation.pdf": "PDF", diff --git a/src/locales/ko.json b/src/locales/ko.json index 1549e7e6..918de1a4 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -164,7 +164,7 @@ "plan.menu.estimate.docDown": "문서 다운로드", "plan.menu.estimate.save": "저장", "plan.menu.estimate.reset": "초기화", - "plan.menu.estimate.copy": "복사", + "plan.menu.estimate.copy": "견적서 복사", "plan.menu.simulation": "발전 시뮬레이션", "plan.menu.simulation.excel": "Excel", "plan.menu.simulation.pdf": "PDF",