qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
yoosangwook 2025-02-06 10:26:42 +09:00
commit 6d07abc138
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/floor-plan/CanvasMenu.jsx
View File

@ -373,7 +373,7 @@ export default function CanvasMenu(props) {
useEffect(() => { useEffect(() => {
if (isObjectNotEmpty(estimateRecoilState)) { if (isObjectNotEmpty(estimateRecoilState)) {
if (estimateRecoilState?.createUser === 'T01') { if (estimateRecoilState?.createUser === 'T01') {
if (sessionState.userId !== 'T01') { if (sessionState.storeId !== 'T01') {
setButtonStyle1('none') setButtonStyle1('none')
setButtonStyle2('none') setButtonStyle2('none')
setButtonStyle3('none') setButtonStyle3('none')
@ -404,7 +404,7 @@ export default function CanvasMenu(props) {
} }
} }
} }
}, [estimateRecoilState]) }, [estimateRecoilState.tempFlg, estimateRecoilState.lockFlg])
/** /**
* 견적서 잠금 / 해제 * 견적서 잠금 / 해제
@ -415,7 +415,6 @@ export default function CanvasMenu(props) {
*/ */
const handleEstimateLockController = (estimateRecoilState) => { const handleEstimateLockController = (estimateRecoilState) => {
swalFire({ swalFire({
// text: estimateRecoilState.lockFlg === '0' ? getMessage('estimate.detail.lock.alertMsg') : getMessage('estimate.detail.unlock.alertMsg'),
html: estimateRecoilState.lockFlg === '0' ? getMessage('estimate.detail.lock.alertMsg') : getMessage('estimate.detail.unlock.alertMsg'), html: estimateRecoilState.lockFlg === '0' ? getMessage('estimate.detail.lock.alertMsg') : getMessage('estimate.detail.unlock.alertMsg'),
confirmButtonText: estimateRecoilState.lockFlg === '1' ? getMessage('estimate.detail.unlock.confirmBtnName') : '', confirmButtonText: estimateRecoilState.lockFlg === '1' ? getMessage('estimate.detail.unlock.confirmBtnName') : '',
type: 'confirm', type: 'confirm',
@ -432,7 +431,7 @@ export default function CanvasMenu(props) {
if (res.status === 201) { if (res.status === 201) {
estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0' estimateRecoilState.lockFlg = estimateRecoilState.lockFlg === '0' ? '1' : '0'
if (estimateRecoilState?.createUser === 'T01') { if (estimateRecoilState?.createUser === 'T01') {
if (sessionState.userId !== 'T01') { if (sessionState.storeId !== 'T01') {
setButtonStyle1('none') setButtonStyle1('none')
setButtonStyle2('none') setButtonStyle2('none')
setButtonStyle3('none') setButtonStyle3('none')
@ -572,20 +571,17 @@ export default function CanvasMenu(props) {
{menuNumber === 5 && ( {menuNumber === 5 && (
<> <>
<div className="ico-btn-from"> <div className="ico-btn-from">
{/* <button className="btn-frame gray ico-flx" onClick={() => setEstimatePopupOpen(true)}> */}
<button type="button" style={{ display: buttonStyle1 }} className="btn-frame gray ico-flx" onClick={() => setEstimatePopupOpen(true)}> <button type="button" style={{ display: buttonStyle1 }} className="btn-frame gray ico-flx" onClick={() => setEstimatePopupOpen(true)}>
<span className="ico ico01"></span> <span className="ico ico01"></span>
<span className="name">{getMessage('plan.menu.estimate.docDown')}</span> <span className="name">{getMessage('plan.menu.estimate.docDown')}</span>
</button> </button>
<button type="button" style={{ display: buttonStyle2 }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}> <button type="button" style={{ display: buttonStyle2 }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}>
{/* <button type="button" style={{ display: buttonStyle }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}> */}
<span className="ico ico02"></span> <span className="ico ico02"></span>
<span className="name">{getMessage('plan.menu.estimate.save')}</span> <span className="name">{getMessage('plan.menu.estimate.save')}</span>
</button> </button>
<button <button
type="button" type="button"
style={{ display: buttonStyle3 }} style={{ display: buttonStyle3 }}
// style={{ display: buttonStyle }}
className="btn-frame gray ico-flx" className="btn-frame gray ico-flx"
onClick={() => { onClick={() => {
handleEstimateReset() handleEstimateReset()
@ -599,7 +595,6 @@ export default function CanvasMenu(props) {
<button <button
type="button" type="button"
style={{ display: buttonStyle4 }} style={{ display: buttonStyle4 }}
// style={{ display: buttonStyle }}
className="btn-frame gray ico-flx" className="btn-frame gray ico-flx"
onClick={() => { onClick={() => {
setEstimateCopyPopupOpen(true) setEstimateCopyPopupOpen(true)
@ -612,10 +607,8 @@ export default function CanvasMenu(props) {
<button <button
type="button" type="button"
style={{ display: buttonStyle5 }} style={{ display: buttonStyle5 }}
// style={{ display: buttonStyle }}
className="btn-frame gray ico-flx" className="btn-frame gray ico-flx"
onClick={() => { onClick={() => {
//시연준비
handleEstimateLockController(estimateRecoilState) handleEstimateLockController(estimateRecoilState)
}} }}
> >

6
src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
View File

@ -288,8 +288,12 @@ export default function StepUp(props) {
// 행 선택 핸들러 함수 추가 // 행 선택 핸들러 함수 추가
const handleRowClick = (mainIdx, subIdx) => { const handleRowClick = (mainIdx, subIdx) => {
// 자동 승압 설정인 경우만 실행
if (allocationType !== 'auto') return
let tempStepUpListData = [...stepUpListData] let tempStepUpListData = [...stepUpListData]
let selectedData = {} let selectedData = {}
tempStepUpListData[0].pcsItemList[mainIdx].serQtyList.forEach((item, index) => { tempStepUpListData[0].pcsItemList[mainIdx].serQtyList.forEach((item, index) => {
if (index === subIdx) { if (index === subIdx) {
selectedData = item selectedData = item
@ -449,7 +453,7 @@ export default function StepUp(props) {
key={`row-${serQtyIdx}`} key={`row-${serQtyIdx}`}
className={`${item.selected ? 'on' : ''}`} className={`${item.selected ? 'on' : ''}`}
onClick={() => handleRowClick(idx, serQtyIdx)} onClick={() => handleRowClick(idx, serQtyIdx)}
style={{ cursor: 'pointer' }} style={{ cursor: allocationType === 'auto' ? 'pointer' : 'default' }}
> >
<td className="al-r">{item.serQty}</td> <td className="al-r">{item.serQty}</td>
<td className="al-r">{item.paralQty}</td> <td className="al-r">{item.paralQty}</td>