견적서

src/components/estimate/Estimate.jsx

@@ -315,7 +315,7 @@ export default function Estimate({ params }) {
       sapSalesStoreCd: session.custCd,
       docTpCd: estimateContextState.estimateType,
       priceCd: showPriceCd,
-      itemIdList: estimateContextState.itemList.filter((item) => item.delFlg === '0'),
+      itemIdList: estimateContextState.itemList.filter((item) => item.delFlg === '0' && item.paDispOrder === null),
     }
 
     if (param.itemIdList.length > 0) {

src/hooks/floorPlan/estimate/useEstimateController.js

@@ -126,6 +126,8 @@ export const useEstimateController = (planNo) => {
   const handleEstimateSubmit = async () => {
     //0. 필수체크
     let flag = true
+    let fileFlg = true
+    let itemFlg = true
     if (estimateData.charger.trim().length === 0) {
       flag = false
       return alert(getMessage('estimate.detail.save.requiredCharger'))
@@ -143,47 +145,50 @@ export const useEstimateController = (planNo) => {
 
     //첨부파일을 첨부안했는데
     //아이템 fileUploadFlg가1(첨부파일 필수)이 1개라도 있는데 후일 자료 제출(fileFlg) 체크안했으면(0) alert 저장안돼
-    let fileFlg = true
+    if (flag) {
-    if (estimateData.fileList.length < 1) {
+      if (estimateData.fileList.length < 1) {
-      if (estimateData.itemList.length > 1) {
+        if (estimateData.itemList.length > 1) {
-        estimateData.itemList.map((row) => {
+          estimateData.itemList.map((row) => {
-          if (row.fileUploadFlg === '1') {
+            if (row.fileUploadFlg === '1') {
-            if (fileFlg) {
+              if (fileFlg) {
-              if (estimateData.fileFlg === '0') {
+                if (estimateData.fileFlg === '0') {
-                fileFlg = false
+                  fileFlg = false
-                return alert(getMessage('estimate.detail.save.requiredFileUpload'))
+                  return alert(getMessage('estimate.detail.save.requiredFileUpload'))
+                }
               }
             }
-          }
+          })
-        })
-      }
-    }
-    let itemFlg = true
-    estimateData.itemList.map((item) => {
-      item.amount = item.amount?.replaceAll(',', '')
-      item.salePrice = parseFloat(item.salePrice?.replaceAll(',', '')).toFixed(2)
-      item.saleTotPrice = parseFloat(item.saleTotPrice?.replaceAll(',', '')).toFixed(2)
-
-      if (!item.paDispOrder) {
-        if (itemFlg) {
-          if (isNaN(item.amount)) {
-            item.amount = 0
-          } else {
-            Number(item.amount)
-          }
-
-          if (item.amount < 1) {
-            itemFlg = false
-            return alert(getMessage('estimate.detail.save.requiredAmount'))
-          }
-
-          if (Number(item.salePrice) < 1) {
-            itemFlg = false
-            return alert(getMessage('estimate.detail.save.requiredSalePrice'))
-          }
         }
       }
-    })
+    }
+
+    if (fileFlg) {
+      estimateData.itemList.map((item) => {
+        item.amount = item.amount?.replaceAll(',', '')
+        item.salePrice = parseFloat(item.salePrice?.replaceAll(',', '')).toFixed(2)
+        item.saleTotPrice = parseFloat(item.saleTotPrice?.replaceAll(',', '')).toFixed(2)
+
+        if (!item.paDispOrder) {
+          if (itemFlg) {
+            if (isNaN(item.amount)) {
+              item.amount = 0
+            } else {
+              Number(item.amount)
+            }
+
+            if (item.amount < 1) {
+              itemFlg = false
+              return alert(getMessage('estimate.detail.save.requiredAmount'))
+            }
+
+            if (Number(item.salePrice) < 1) {
+              itemFlg = false
+              return alert(getMessage('estimate.detail.save.requiredSalePrice'))
+            }
+          }
+        }
+      })
+    }
 
     if (flag && fileFlg && itemFlg) {
       //1. 첨부파일 저장시작