From 2f8ca712c96ad2538f153c4c9e8dc154dee3b729 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 21 Mar 2025 16:03:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B2=AC=EC=A0=81=ED=8A=B9=EC=9D=B4?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C=20PRO?= =?UTF-8?q?D=20=EC=82=AC=EC=9A=A9=EC=9C=A0=EB=AC=B4=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=8C=80=EC=9D=91..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 532d6364..337c0924 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) From c99deaf93f657af8eb539d5a58a1910512b69b5f Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 21 Mar 2025 17:47:41 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B2=AC=EC=A0=81=ED=8A=B9=EC=9D=B4?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=83=81=ED=92=88=20pkgYn=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 337c0924..c4e5e08e 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -474,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 + } + } } }) From b51dacf4219fbc2eeb51b8e1dd9039b2b09e8d65 Mon Sep 17 00:00:00 2001 From: basssy Date: Mon, 24 Mar 2025 09:27:28 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EB=B3=B5?= =?UTF-8?q?=EC=82=AC=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/floorPlan/estimate/useEstimateController.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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,