diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 532d6364..c4e5e08e 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -175,7 +175,10 @@ export default function Estimate({}) { row.check = false estimateOption.map((row2) => { if (row.pkgYn === '0') { - if (row2 === row.code) { + // if (row2 === row.code) { + // row.check = true + // } + if (row.code.split('、').includes(row2)) { row.check = true } } else { @@ -217,7 +220,10 @@ export default function Estimate({}) { row.check = false estimateOption.map((row2) => { if (row.pkgYn === '0') { - if (row2 === row.code) { + // if (row2 === row.code) { + // row.check = true + // } + if (row.code.split('、').includes(row2)) { row.check = true } } else { @@ -240,7 +246,6 @@ export default function Estimate({}) { } } }) - setSpecialNoteList(res) setSpecialNoteFirstFlg(true) @@ -469,6 +474,21 @@ export default function Estimate({}) { } else { item.check = false } + } else { + let codes = item.code.split('、') + let flg = '0' + if (codes.length > 1) { + for (let i = 0; i < pushData.length; i++) { + if (codes.indexOf(pushData[i]) > -1) { + flg = '1' + } + } + if (flg === '1') { + item.check = true + } else { + item.check = false + } + } } }) diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index e50572b8..2e0bbe1a 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -136,7 +136,7 @@ export const useEstimateController = (planNo, flag) => { } useEffect(() => { - setEstimateData({ ...estimateContextState, userId: session.userId, sapSalesStoreCd: session.custCd }) + setEstimateData({ ...estimateContextState, userId: session.userId }) }, [estimateContextState]) // 첨부파일 다운로드 @@ -452,8 +452,6 @@ export const useEstimateController = (planNo, flag) => { } const params = { - saleStoreId: session.storeId, - sapSalesStoreCd: session.custCd, objectNo: estimateData.objectNo, planNo: sendPlanNo, copySaleStoreId: otherSaleStoreId ? otherSaleStoreId : saleStoreId,