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