diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index b5d8bce0..18fd2343 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -1188,7 +1188,7 @@ export default function Estimate({}) { @@ -1206,7 +1206,7 @@ export default function Estimate({}) { @@ -1297,13 +1297,13 @@ export default function Estimate({}) { //사양시공 let constructSpecificationMulti = estimateContextState?.constructSpecificationMulti?.split('、') return ( -
+
- +
{constructSpecificationMulti ? (
- +
) : null}
@@ -1316,7 +1316,6 @@ export default function Estimate({}) { {getMessage('estimate.detail.remarks')}
- {/* */} { - setIsGlobalLoading(true) get({ url: '/api/pwrGnrSimulation/guideInfo' }).then((res) => { if (res.data) { setContent(res.data.replaceAll('\n', '
')) @@ -184,7 +183,6 @@ export default function Simulator() { setContent(getMessage('common.message.no.data')) } }) - setIsGlobalLoading(false) } // 차트 데이터 변경 시, list type 셋팅 diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 2df04fdc..916e28d7 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -52,7 +52,7 @@ export const useTrestle = () => { let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail if (!rack) { - //25/01/16 기준 랙이 없는 경우는 그냥 안그려준다. + //25/02/06 가대없음의 경우 랙정보가 없음 return } @@ -105,8 +105,6 @@ export const useTrestle = () => { leftExposedHalfTopModules.length > 0 || rightExposedHalfTopPoints.length > 0 - console.log('isChidory', isChidory) - if (plvrYn === 'N' && isChidory) { alert('치조불가공법입니다.') clear() @@ -619,7 +617,21 @@ export const useTrestle = () => { } } }) - const params = { trestles: surfaces.map((surface) => surface.quotationParam), pcses } + + const allModules = surfaces.map((surface) => surface.modules).flat() + // 모듈 파라미터 생성 + const modules = getModulesParam(allModules) + const trestles = [] + //가대 파라미터 생성 + surfaces.forEach((surface) => { + if (surface.quotationParam) { + trestles.push(surface.quotationParam) + } + }) + + // trestles 배열에서 null인 경우 제거 + const params = { trestles, pcses, modules } + //견적서 itemList 조회 const { data: itemList, data2, result } = await getQuotationItem(params) @@ -1883,7 +1895,7 @@ export const useTrestle = () => { cvrYn: moduleSelection.construction.setupCover ? 'Y' : 'N', snowGdYn: moduleSelection.construction.setupSnowCover ? 'Y' : 'N', plvrYn: cvrPlvrYn, - modules: getModules(surface), + // modules: getModules(surface), // 2025-02-06 api 수정 trestleMkrCd, constMthdCd, roofBaseCd, @@ -1895,10 +1907,9 @@ export const useTrestle = () => { } } - const getModules = (surface) => { - const { modules } = surface - - const params = modules.map((module, index) => { + // 전체 모듈 파라미터 생성 + const getModulesParam = (allModules) => { + const params = allModules.map((module, index) => { return { moduleTpCd: module.moduleInfo.itemTp, moduleItemId: module.moduleInfo.itemId,