diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index cd204c15..109da999 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -157,27 +157,26 @@ export default function CircuitTrestleSetting({ id }) { } const getRoofSurfaceList = () => { - return canvas - .getObjects() - .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) - .map((obj) => { - return { - roofSurfaceId: obj.id, - roofSurface: canvas - .getObjects() - .filter((o) => o.id === obj.parentId)[0] - .directionText.replace(/[0-9]/g, ''), - roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, - moduleList: getModuleList(obj).map((module) => { - return { - itemId: module.moduleInfo.itemId, - circuit: module.circuitNumber ? module.circuitNumber : null, - pcsItemId: module.circuit ? module.circuit?.pcsItemId : null, - uniqueId: module.id ? module.id : null, - } - }), - } - }) + const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) + roofSurfaceList.sort((a, b) => a.left - b.left || b.top - a.top) + return roofSurfaceList.map((obj) => { + return { + roofSurfaceId: obj.id, + roofSurface: canvas + .getObjects() + .filter((o) => o.id === obj.parentId)[0] + .directionText.replace(/[0-9]/g, ''), + roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, + moduleList: getModuleList(obj).map((module) => { + return { + itemId: module.moduleInfo.itemId, + circuit: module.circuitNumber ? module.circuitNumber : null, + pcsItemId: module.circuit ? module.circuit?.pcsItemId : null, + uniqueId: module.id ? module.id : null, + } + }), + } + }) } const getModuleList = (surface) => { @@ -366,6 +365,7 @@ export default function CircuitTrestleSetting({ id }) { }) console.log(canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)) + apply() } const onClickPrev = () => { @@ -443,11 +443,14 @@ export default function CircuitTrestleSetting({ id }) { pcsMkrCd: item.pcsMkrCd, pcsSerCd: item.pcsSerCd, pcsItemId: item.itemId, - pcsOptCd: seletedOption.code, + pscOptCd: seletedOption.code, + // pcsOptCd: 'CLC_RMC', paralQty: serQty.paralQty, - connections: { - connItemId: item.connList[0].itemId, - }, + connections: [ + { + connItemId: item.connList[0].itemId, + }, + ], } })[0] }) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index f92eb3ef..9f558f16 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -65,7 +65,7 @@ export default function StepUp(props) { // PCS 옵션 조회 const formattedOptCodes = formatOptionCodes(res.data.optionList) setOptCodes(formattedOptCodes) - setSeletedOption(formattedOptCodes[0].code) + setSeletedOption(formattedOptCodes[0]) } } catch (error) { console.error('Error fetching step up data:', error) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index 32b15236..77404733 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -206,6 +206,9 @@ export default function PassivityCircuitAllocation(props) { .getObjects() .filter((obj) => targetModules.includes(obj.id)) .forEach((obj) => { + if (obj.circuit) { + canvas.remove(obj.circuit) + } const moduleCircuitText = new fabric.Text(getCircuitNumber(), { left: obj.left + obj.width / 2, top: obj.top + obj.height / 2, diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index bb820b7c..684b464d 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -283,15 +283,19 @@ export default function StuffDetail() { cellStyle: { justifyContent: 'center' }, cellRenderer: (params) => { let buttonStyle + let buttonStyle2 if (params.value == null) { buttonStyle = { display: 'none', } - } - if (managementState?.createUser === 'T01') { - if (session.userId !== 'T01') { - // #474 - buttonStyle = { display: 'none' } + buttonStyle2 = { + display: 'none', + } + } else { + if (managementState?.createSaleStoreId === 'T01') { + if (session?.storeId !== 'T01') { + buttonStyle = { display: 'none' } + } } } return ( @@ -312,7 +316,7 @@ export default function StuffDetail() { {getMessage('stuff.detail.planGrid.btn1')}