diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx index ae34acf5..9eb50dca 100644 --- a/src/components/management/Stuff.jsx +++ b/src/components/management/Stuff.jsx @@ -51,6 +51,7 @@ export default function Stuff() { //물건번호 복사버튼 옆에 영역 const onDoubleClick = (data) => { + setIsGlobalLoading(true) if (data.tempFlg === '0') { router.push(`${pathname}/detail?objectNo=${data.objectNo.toString()}`, { scroll: false }) } else { @@ -153,6 +154,7 @@ export default function Stuff() { } else { //T 면 임시 R은 진짜 if (event.data.objectNo) { + setIsGlobalLoading(true) if (event.data.tempFlg === '0') { router.push(`${pathname}/detail?objectNo=${event.data.objectNo.toString()}`, { scroll: false }) } else { diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 9de52b54..87f07a8e 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -21,8 +21,9 @@ import { floorPlanObjectState } from '@/store/floorPlanObjectAtom' import { ManagementContext } from '@/app/management/ManagementProvider' import DocDownOptionPop from '../estimate/popup/DocDownOptionPop' import { stuffSearchState } from '@/store/stuffAtom' - +import { QcastContext } from '@/app/QcastProvider' export default function StuffDetail() { + const { setIsGlobalLoading } = useContext(QcastContext) const resetStuffRecoil = useResetRecoilState(stuffSearchState) const stuffSearchParams = useRecoilValue(stuffSearchState) @@ -418,6 +419,8 @@ export default function StuffDetail() { } } }) + + setIsGlobalLoading(false) } }, [objectNo, session]) @@ -590,6 +593,9 @@ export default function StuffDetail() { //메모 form.setValue('remarks', managementState.remarks) }) + + //상세끝 + setIsGlobalLoading(false) } } }, [managementState]) diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index 0cc723a3..2efdee3e 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -83,6 +83,7 @@ export default function StuffSearchCondition() { } setIsGlobalLoading(true) + if (stuffSearch.code === 'S') { if (stuffSearch.pageNo !== 1) { setStuffSearch({ @@ -181,7 +182,8 @@ export default function StuffSearchCondition() { code: 'E', startRow: 1, endRow: 1 * stuffSearch?.pageSize, - schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R', + // schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R', + schSortType: 'R', pageNo: 1, pageSize: stuffSearch?.pageSize, }) @@ -447,8 +449,10 @@ export default function StuffSearchCondition() { //화면에선 지우는데 리코일은 조회누르지 않으면 보존 setSchSelSaleStoreId('') setOtherSaleStoreId('') - stuffSearch.schSelSaleStoreId = '' - stuffSearch.schOtherSelSaleStoreId = '' + if (stuffSearch.code === 'S') { + stuffSearch.schSelSaleStoreId = '' + stuffSearch.schOtherSelSaleStoreId = '' + } //2차점 판매점목록비우기 setOtherSaleStoreList([])