From f2ce1184314858ab948a6dc4c135e43d61eaa8b6 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 28 Nov 2024 12:12:54 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=B2=A8?= =?UTF-8?q?=EB=B6=80=ED=8C=8C=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 14 ++++++++++---- .../floorPlan/estimate/useEstimateController.js | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index aad02cc1..470f2e73 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -197,8 +197,11 @@ export default function Estimate({ params }) { // 추가한 첨부파일 estimateContextState에 넣기 useEffect(() => { if (isNotEmptyArray(files)) { + let fileList = [] files.map((row) => { - setEstimateContextState({ fileList: row.data }) + fileList.push(row.data) + + setEstimateContextState({ fileList: row.data, tempFileList: fileList }) }) } else { setEstimateContextState({ fileList: [] }) @@ -212,8 +215,6 @@ export default function Estimate({ params }) { setFiles([]) setOriginFiles(estimateContextState.fileList) } - - // setFiles([]) }, [estimateContextState?.fileList]) // 기존첨부파일 삭제 @@ -549,7 +550,11 @@ export default function Estimate({ params }) { if (item?.addFlg) { return { ...item, ...updates, saleTotPrice: '' } } else { - return { ...item, ...updates, salePrice: '', saleTotPrice: '' } + if (estimateContextState.estimateType === 'YJSS') { + return { ...item, ...updates, salePrice: '', saleTotPrice: '' } + } else { + return { ...item, ...updates } + } } } else if (item.paDispOrder === dispOrder) { //봄제품을 바꿨을떄 @@ -558,6 +563,7 @@ export default function Estimate({ params }) { return item } }) + //paDispOrder if (bomList) { bomList.map((bomItem, index) => { diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index 65bcad46..93e22b5c 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -202,10 +202,10 @@ export const useEstimateController = (planNo) => { if (flag && fileFlg && itemFlg) { //1. 첨부파일 저장시작 const formData = new FormData() - // estimateData.tempFileList.forEach((file) => { - // formData.append('file', file) - // }) - formData.append('file', estimateData.flieList) + estimateData.tempFileList.forEach((file) => { + formData.append('file', file) + }) + // formData.append('file', estimateData.flieList) formData.append('objectNo', estimateData.objectNo) formData.append('planNo', estimateData.planNo) formData.append('category', '10')