Compare commits

..

No commits in common. "ef607afcf389bc2f8a100c9113380d478a963438" and "48759856857b84192c603eca1aebd4b1372baa7d" have entirely different histories.

4 changed files with 3 additions and 12 deletions

View File

@ -1458,7 +1458,7 @@ export default function Estimate({}) {
<label htmlFor="YJOD">{getMessage('estimate.detail.estimateType.yjod')}</label>
</div>
</div>
{session?.storeLvl === '100000' && agencyCustList.length > 0 ? ( // 1 => 100000
{session?.storeLvl === '1' && agencyCustList.length > 0 ? (
<div className="form-flex-select ml10">
<label htmlFor="">{getMessage('estimate.detail.agency')}</label>
<div className="select-wrap" style={{ width: '400px' }}>

View File

@ -109,7 +109,6 @@ export default function StepUp(props) {
/** 캔버스에 회로 정보 적용 */
// pcs setSubOpsions, setMainOptions
console.log('stepUpListData', stepUpListData)
let mChk = 0;
stepUpListData[0].pcsItemList.forEach((pcsItem, index) => {
const optionList = formatOptionCodes(pcsItem.optionList)
if (isMultiOptions()) {
@ -165,8 +164,6 @@ export default function StepUp(props) {
targetModule.pcsItemId = module.pcsItemId
targetModule.circuitNumber = module.circuit
canvas.add(moduleCircuitText)
} else {
mChk++;
}
})
})
@ -175,10 +172,6 @@ export default function StepUp(props) {
canvas.renderAll()
setModuleStatisticsData()
if (mChk > 0) {
swalFire({ text: getMessage('modal.circuit.trestle.setting.step.up.allocation.module.over.count') })
}
} else {
swalFire({ text: getMessage('common.message.send.error') })
}
@ -474,7 +467,7 @@ export default function StepUp(props) {
module.pcsItemId = null
})
/** 선택된 모듈 목록 추가 */
/** 선택된 모듈 목록 추가 */
selectedData.roofSurfaceList.forEach((roofSurface) => {
const targetSurface = canvas.getObjects().filter((obj) => obj.id === roofSurface.roofSurfaceId)[0]
const moduleIds = targetSurface.modules.map((module) => {
@ -523,7 +516,7 @@ export default function StepUp(props) {
canvas.renderAll()
setModuleStatisticsData()
}
}
/**
* 현재 선택된 값들을 가져오는 함수 추가

View File

@ -197,7 +197,6 @@
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "昇圧回路数",
"modal.circuit.trestle.setting.step.up.allocation.option": "昇圧オプション",
"modal.circuit.trestle.setting.step.up.allocation.select.monitor": "オプションを選択",
"modal.circuit.trestle.setting.step.up.allocation.module.over.count": "一部モジュールに回路を構成できません",
"plan.menu.module.circuit.setting.plan.orientation": "図面方位の適用",
"plan.menu.estimate": "見積書",
"plan.menu.estimate.roof.alloc": "屋根面の割り当て",

View File

@ -197,7 +197,6 @@
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "승압회로수",
"modal.circuit.trestle.setting.step.up.allocation.option": "승압옵션",
"modal.circuit.trestle.setting.step.up.allocation.select.monitor": "옵션선택",
"modal.circuit.trestle.setting.step.up.allocation.module.over.count": "일부 모듈에서는 회로를 구성할 수 없습니다.",
"plan.menu.module.circuit.setting.plan.orientation": "도면 방위 적용",
"plan.menu.estimate": "견적서",
"plan.menu.estimate.roof.alloc": "지붕면 할당",