diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index e4ef732c..bb820b7c 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -347,13 +347,15 @@ export default function StuffDetail() { } promiseGet({ url: `/api/object/${objectNo}/detail` }).then((res) => { if (res.status === 200) { - if (res?.data?.createUser === 'T01' && session?.userId !== 'T01') { - //createUser가 T01인데 로그인사용자가 T01이 아니면 버튼숨기기 + // if (res?.data?.createSaleStoreId === 'T01' && session?.storeId !== 'T01') { + // setShowButton('none') + // } else { + // if (session.storeId !== res?.data?.createSaleStoreId) { + // setShowButton('none') + // } + // } + if (res?.data?.createSaleStoreId !== session?.storeId) { setShowButton('none') - } else { - if (session.userId !== res?.data?.createUser) { - setShowButton('none') - } } if (isObjectNotEmpty(res.data)) { let surfaceTypeValue @@ -362,7 +364,7 @@ export default function StuffDetail() { } else if (res.data.surfaceType === 'Ⅱ') { surfaceTypeValue = '2' } - setManagementState({ ...res.data, surfaceTypeValue: surfaceTypeValue, firstFlag: 'Y' }) + setManagementState({ ...res.data, surfaceTypeValue: surfaceTypeValue }) } else { setManagementState({}) swalFire({ @@ -1420,7 +1422,8 @@ export default function StuffDetail() { text: getMessage('stuff.detail.save'), type: 'alert', confirmFn: () => { - callDetailApi(objectNo) + setManagementState(res?.data) + // callDetailApi(objectNo) }, }) } @@ -1434,13 +1437,18 @@ export default function StuffDetail() { const callDetailApi = async (objectNo) => { await promiseGet({ url: `/api/object/${objectNo}/detail` }).then((res) => { - if (res?.data?.createUser === 'T01' && session?.userId !== 'T01') { + // if (res?.data?.createSaleStoreId === 'T01' && session?.storeId !== 'T01') { + // setShowButton('none') + // } else { + // if (session.storeId !== res?.data?.createSaleStoreId) { + // setShowButton('none') + // } + // } + + if (res?.data?.createSaleStoreId !== session?.storeId) { setShowButton('none') - } else { - if (session.userId !== res?.data?.createUser) { - setShowButton('none') - } } + let surfaceTypeValue if (res.data.surfaceType === 'Ⅲ・Ⅳ') { surfaceTypeValue = '3' @@ -1638,10 +1646,14 @@ export default function StuffDetail() { // 그리드 더블 클릭 해당플랜의 도면작성 화면으로 이동 const getCellDoubleClicked = (params) => { //#474정책 - if (managementState.createUser === 'T01') { - if (session.userId !== 'T01') { - return false - } + // if (managementState.createUser === 'T01') { + // if (session.userId !== 'T01') { + // return false + // } + // } + + if (managementState?.createSaleStoreId !== session?.storeId) { + return false } if (params?.column?.colId !== 'estimateDate') { diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index 19c26521..133eb30e 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -122,8 +122,10 @@ export default function StuffSearchCondition() { schAddress: address ? address.trim() : '', schObjectName: objectName ? objectName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', - schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId, - schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + // schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId, + // schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId, schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, schTempFlg: tempFlg, //임시저장물건 @@ -144,8 +146,10 @@ export default function StuffSearchCondition() { schAddress: address ? address.trim() : '', schObjectName: objectName ? objectName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', - schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', - schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', + // schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId, schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, schTempFlg: tempFlg, //임시저장물건 @@ -183,27 +187,53 @@ export default function StuffSearchCondition() { }) } else if (stuffSearch.code === 'E') { if (session.storeId !== 'T01' && session.storeLvl === '1') { - setStuffSearch({ - schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(), - schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName.trim() : saleStoreName.trim(), - schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress.trim() : address.trim(), - schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName.trim() : objectName.trim(), - schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName.trim() : dispCompanyName.trim(), - schSelSaleStoreId: myDataCheck ? schSelSaleStoreId : otherSaleStoreId ? schSelSaleStoreId : '', - schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId, - schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(), - schDateType: dateType, - schTempFlg: tempFlg, //임시저장물건 - schMyDataCheck: myDataCheck, - schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '', - schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '', - code: 'E', - startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1, - endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100, - schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U', - pageNo: stuffSearch?.pageNo, - pageSize: stuffSearch?.pageSize, - }) + if (stuffSearch.pageNo !== 1) { + setStuffSearch({ + schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(), + schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', + schAddress: address ? address.trim() : '', + schObjectName: objectName ? objectName.trim() : '', + schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', + // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', + // schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId, + schReceiveUser: receiveUser ? receiveUser.trim() : '', + schDateType: dateType, + schTempFlg: tempFlg, //임시저장물건 + schMyDataCheck: myDataCheck, + schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '', + schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '', + code: 'E', + startRow: 1, + endRow: 1 * stuffSearch?.pageSize, + schSortType: 'U', + pageNo: 1, + pageSize: stuffSearch?.pageSize, + }) + } else { + setStuffSearch({ + schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(), + schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName.trim() : saleStoreName.trim(), + schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress.trim() : address.trim(), + schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName.trim() : objectName.trim(), + schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName.trim() : dispCompanyName.trim(), + schSelSaleStoreId: myDataCheck ? schSelSaleStoreId : otherSaleStoreId ? schSelSaleStoreId : '', + schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId, + schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(), + schDateType: dateType, + schTempFlg: tempFlg, //임시저장물건 + schMyDataCheck: myDataCheck, + schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '', + schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '', + code: 'E', + startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1, + endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100, + schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U', + pageNo: stuffSearch?.pageNo, + pageSize: stuffSearch?.pageSize, + }) + } } else if (session.storeId === 'T01') { if (stuffSearch.pageNo !== 1) { setStuffSearch({ @@ -212,8 +242,10 @@ export default function StuffSearchCondition() { schAddress: address ? address.trim() : '', schObjectName: objectName ? objectName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', - schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', - schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', + // schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId, schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, schTempFlg: tempFlg, //임시저장물건 @@ -600,7 +632,7 @@ export default function StuffSearchCondition() { if (isObjectNotEmpty(key)) { setOtherSaleStoreId('') setSchSelSaleStoreId(key.saleStoreId) - stuffSearch.schSelSaleStoreId = key.saleStoreId + // stuffSearch.schSelSaleStoreId = key.saleStoreId //고른 1차점의 saleStoreId로 2차점 API호출하기 let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}` let otherList @@ -645,11 +677,11 @@ export default function StuffSearchCondition() { stuffSearch.schMyDataCheck = false if (isObjectNotEmpty(key)) { setOtherSaleStoreId(key.saleStoreId) - stuffSearch.schOtherSelSaleStoreId = key.saleStoreId + // stuffSearch.schOtherSelSaleStoreId = key.saleStoreId //2차점 골랐을때 1차점 값 if (session.storeId === 'T01') { - stuffSearch.schSelSaleStoreId = schSelSaleStoreId + // stuffSearch.schSelSaleStoreId = schSelSaleStoreId } else { stuffSearch.schSelSaleStoreId = '' } diff --git a/src/components/management/StuffSubHeader.jsx b/src/components/management/StuffSubHeader.jsx index 8e61e259..d6c0f480 100644 --- a/src/components/management/StuffSubHeader.jsx +++ b/src/components/management/StuffSubHeader.jsx @@ -38,11 +38,14 @@ export default function StuffSubHeader({ type }) { useEffect(() => { if (isObjectNotEmpty(managementState)) { - if (managementState.createUser === 'T01') { - if (session.userId !== 'T01') { - //도면 작성은 이동 할 수 있도록 변경 #457 다시 못하도록 변경#474 - setButtonStyle('none') - } + // if (managementState.createUser === 'T01') { + // if (session.userId !== 'T01') { + // //도면 작성은 이동 할 수 있도록 변경 #457 다시 못하도록 변경#474 + // setButtonStyle('none') + // } + // } + if (managementState.createSaleStoreId !== session?.storeId) { + setButtonStyle('none') } } }, [managementState])