Compare commits
No commits in common. "1b7f6f8a655330bdcc34a50245cb9cc08309b7c1" and "6982eff54c5a512c7eefbb78a3f6e94698e3533c" have entirely different histories.
1b7f6f8a65
...
6982eff54c
@ -1458,7 +1458,7 @@ export default function Estimate({}) {
|
|||||||
<label htmlFor="YJOD">{getMessage('estimate.detail.estimateType.yjod')}</label>
|
<label htmlFor="YJOD">{getMessage('estimate.detail.estimateType.yjod')}</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{session?.storeLvl === '100000' && agencyCustList.length > 0 ? ( //일시적으로 1 => 100000로 정리
|
{session?.storeLvl === '1' && agencyCustList.length > 0 ? (
|
||||||
<div className="form-flex-select ml10">
|
<div className="form-flex-select ml10">
|
||||||
<label htmlFor="">{getMessage('estimate.detail.agency')}</label>
|
<label htmlFor="">{getMessage('estimate.detail.agency')}</label>
|
||||||
<div className="select-wrap" style={{ width: '400px' }}>
|
<div className="select-wrap" style={{ width: '400px' }}>
|
||||||
|
|||||||
@ -109,7 +109,6 @@ export default function StepUp(props) {
|
|||||||
/** 캔버스에 회로 정보 적용 */
|
/** 캔버스에 회로 정보 적용 */
|
||||||
// 병설일때 pcs 있으면 setSubOpsions, 없으면 setMainOptions
|
// 병설일때 pcs 있으면 setSubOpsions, 없으면 setMainOptions
|
||||||
console.log('stepUpListData', stepUpListData)
|
console.log('stepUpListData', stepUpListData)
|
||||||
let mChk = 0;
|
|
||||||
stepUpListData[0].pcsItemList.forEach((pcsItem, index) => {
|
stepUpListData[0].pcsItemList.forEach((pcsItem, index) => {
|
||||||
const optionList = formatOptionCodes(pcsItem.optionList)
|
const optionList = formatOptionCodes(pcsItem.optionList)
|
||||||
if (isMultiOptions()) {
|
if (isMultiOptions()) {
|
||||||
@ -165,8 +164,6 @@ export default function StepUp(props) {
|
|||||||
targetModule.pcsItemId = module.pcsItemId
|
targetModule.pcsItemId = module.pcsItemId
|
||||||
targetModule.circuitNumber = module.circuit
|
targetModule.circuitNumber = module.circuit
|
||||||
canvas.add(moduleCircuitText)
|
canvas.add(moduleCircuitText)
|
||||||
} else {
|
|
||||||
mChk++;
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -175,10 +172,6 @@ export default function StepUp(props) {
|
|||||||
|
|
||||||
canvas.renderAll()
|
canvas.renderAll()
|
||||||
setModuleStatisticsData()
|
setModuleStatisticsData()
|
||||||
|
|
||||||
if (mChk > 0) {
|
|
||||||
swalFire({ text: getMessage('modal.circuit.trestle.setting.step.up.allocation.module.over.count') })
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
swalFire({ text: getMessage('common.message.send.error') })
|
swalFire({ text: getMessage('common.message.send.error') })
|
||||||
}
|
}
|
||||||
|
|||||||
@ -197,7 +197,6 @@
|
|||||||
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "昇圧回路数",
|
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "昇圧回路数",
|
||||||
"modal.circuit.trestle.setting.step.up.allocation.option": "昇圧オプション",
|
"modal.circuit.trestle.setting.step.up.allocation.option": "昇圧オプション",
|
||||||
"modal.circuit.trestle.setting.step.up.allocation.select.monitor": "オプションを選択",
|
"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.module.circuit.setting.plan.orientation": "図面方位の適用",
|
||||||
"plan.menu.estimate": "見積書",
|
"plan.menu.estimate": "見積書",
|
||||||
"plan.menu.estimate.roof.alloc": "屋根面の割り当て",
|
"plan.menu.estimate.roof.alloc": "屋根面の割り当て",
|
||||||
|
|||||||
@ -197,7 +197,6 @@
|
|||||||
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "승압회로수",
|
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "승압회로수",
|
||||||
"modal.circuit.trestle.setting.step.up.allocation.option": "승압옵션",
|
"modal.circuit.trestle.setting.step.up.allocation.option": "승압옵션",
|
||||||
"modal.circuit.trestle.setting.step.up.allocation.select.monitor": "옵션선택",
|
"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.module.circuit.setting.plan.orientation": "도면 방위 적용",
|
||||||
"plan.menu.estimate": "견적서",
|
"plan.menu.estimate": "견적서",
|
||||||
"plan.menu.estimate.roof.alloc": "지붕면 할당",
|
"plan.menu.estimate.roof.alloc": "지붕면 할당",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user