From 204a222e133663ca82a7fbcaf1168d6e2c89135e Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Tue, 3 Dec 2024 12:02:31 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/estimate/Estimate.jsx          | 28 ++++++++++---------
 .../estimate/useEstimateController.js         | 11 +++++---
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index 7bedc1c7..bb4dbe27 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -226,25 +226,26 @@ export default function Estimate({ params }) {
     }
   }, [estimateContextState?.fileList])
 
-  // 기존첨부파일 삭제
+  // 기존첨부파일 삭제 (플래그값 추가?) 저장할때 플래그값에 따라 진짜 삭제
   const deleteOriginFile = async (objectNo, no) => {
     const delParams = {
       userId: session.userId,
       objectNo: objectNo,
       no: no,
     }
-    await promisePost({ url: 'api/file/fileDelete', data: delParams }).then((res) => {
-      if (res.status === 204) {
-        setOriginFiles(originFiles.filter((file) => file.objectNo === objectNo && file.no !== no))
-        setEstimateContextState({
-          fileList: originFiles.filter((file) => file.objectNo === objectNo && file.no !== no),
-          originFiles: originFiles.filter((file) => file.objectNo === objectNo && file.no !== no),
-          newFileList: originFiles.filter((file) => file.objectNo === objectNo && file.no !== no),
-        })
+    alert(getMessage('estimate.detail.alert.delFile'))
+    // await promisePost({ url: 'api/file/fileDelete', data: delParams }).then((res) => {
+    //   if (res.status === 204) {
+    //     setOriginFiles(originFiles.filter((file) => file.objectNo === objectNo && file.no !== no))
+    //     setEstimateContextState({
+    //       fileList: originFiles.filter((file) => file.objectNo === objectNo && file.no !== no),
+    //       originFiles: originFiles.filter((file) => file.objectNo === objectNo && file.no !== no),
+    //       newFileList: originFiles.filter((file) => file.objectNo === objectNo && file.no !== no),
+    //     })
 
-        alert(getMessage('plan.message.delete'))
-      }
-    })
+    //     alert(getMessage('plan.message.delete'))
+    //   }
+    // })
   }
 
   //가격표시 option 목록 최초세팅 && 주문분류 변경시
@@ -725,6 +726,8 @@ export default function Estimate({ params }) {
         makeUniqueSpecialNoteCd(itemList)
 
         itemList.forEach((item) => {
+          delete item.showSalePrice
+          delete item.showSaleTotPrice
           if (item.delFlg === '0') {
             let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) || 0
             let price = Number(item.saleTotPrice?.replaceAll(',', '')) || 0
@@ -750,7 +753,6 @@ export default function Estimate({ params }) {
       const calculateYJSSTotals = (itemList) => {
         itemList.sort((a, b) => a.dispOrder - b.dispOrder)
         makeUniqueSpecialNoteCd(itemList)
-
         itemList.forEach((item) => {
           if (item.delFlg === '0') {
             let amount = Number(item.amount?.replace(/[^0-9]/g, '').replaceAll(',', '')) || 0
diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index 016fda78..2c863a15 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -148,6 +148,11 @@ export const useEstimateController = (planNo) => {
 
     //첨부파일을 첨부안했는데
     //아이템 fileUploadFlg가1(첨부파일 필수)이 1개라도 있는데 후일 자료 제출(fileFlg) 체크안했으면(0) alert 저장안돼
+    console.log('새로추가첨부파일:::', estimateData.newFileList)
+    console.log('기존첨부파일:::', estimateData.originFiles)
+
+    // return
+
     if (estimateData?.originFiles?.length > 0) {
       originFileFlg = true
     }
@@ -275,10 +280,8 @@ export const useEstimateController = (planNo) => {
         }
       })
       estimateData.estimateOption = estimateOptions
-      // console.log('새로추가첨부파일:::', estimateData.newFileList)
-      // console.log('기존첨부파일:::', estimateData.originFiles)
-      // console.log('최종아이템:::', estimateData.itemList)
-      // console.log('최종저장::', estimateData)
+      console.log('최종아이템:::', estimateData.itemList)
+      console.log('최종저장::', estimateData)
       //2. 상세데이터 저장
       // return
       try {