물건목록 로딩화면처리

This commit is contained in:
basssy 2024-11-22 23:22:01 +09:00
parent bc6fdd1b12
commit 57bc308dd2
4 changed files with 26 additions and 15 deletions

View File

@ -16,7 +16,11 @@ import JA from '@/locales/ja.json'
import QPagination from '../common/pagination/QPagination' import QPagination from '../common/pagination/QPagination'
import { SessionContext } from '@/app/SessionProvider' import { SessionContext } from '@/app/SessionProvider'
import { QcastContext } from '@/app/QcastProvider'
export default function Stuff() { export default function Stuff() {
const { setIsGlobalLoading } = useContext(QcastContext)
const resetStuffRecoil = useResetRecoilState(stuffSearchState) const resetStuffRecoil = useResetRecoilState(stuffSearchState)
const { session } = useContext(SessionContext) const { session } = useContext(SessionContext)
const setAppMessageState = useSetRecoilState(appMessageStore) const setAppMessageState = useSetRecoilState(appMessageStore)
@ -198,9 +202,10 @@ export default function Stuff() {
stuffSearchParams.startRow = 1 stuffSearchParams.startRow = 1
stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize
} }
setIsGlobalLoading(false)
}) })
} }
fetchData() fetchData()
} else if (stuffSearchParams?.code === 'M') { } else if (stuffSearchParams?.code === 'M') {
const params = { const params = {
@ -229,10 +234,8 @@ export default function Stuff() {
stuffSearchParams.startRow = (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1 stuffSearchParams.startRow = (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1
stuffSearchParams.endRow = stuffSearchParams.pageNo * stuffSearchParams.pageSize stuffSearchParams.endRow = stuffSearchParams.pageNo * stuffSearchParams.pageSize
stuffSearchParams.schSortType = defaultSortType stuffSearchParams.schSortType = defaultSortType
//setPageNo(1)
stuffSearchParams.pageNo = stuffSearchParams.pageNo stuffSearchParams.pageNo = stuffSearchParams.pageNo
// return
async function fetchData() { async function fetchData() {
const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}` const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
await get({ url: apiUrl }).then((res) => { await get({ url: apiUrl }).then((res) => {
@ -249,9 +252,10 @@ export default function Stuff() {
stuffSearchParams.startRow = 1 stuffSearchParams.startRow = 1
stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize
} }
setIsGlobalLoading(false)
}) })
} }
fetchData() fetchData()
} else if (stuffSearchParams?.code === 'C') { } else if (stuffSearchParams?.code === 'C') {
resetStuffRecoil() resetStuffRecoil()
@ -273,7 +277,6 @@ export default function Stuff() {
} }
}) })
} }
fetchData() fetchData()
} else if (stuffSearchParams?.code === 'DELETE') { } else if (stuffSearchParams?.code === 'DELETE') {
const newParams = { const newParams = {
@ -375,6 +378,10 @@ export default function Stuff() {
setPageNo(page) setPageNo(page)
} }
useEffect(() => {
setIsGlobalLoading(true)
}, [])
return ( return (
<> <>
{/* 퍼블시작 */} {/* 퍼블시작 */}
@ -410,7 +417,6 @@ export default function Stuff() {
<div className="q-grid"> <div className="q-grid">
<StuffQGrid {...gridProps} getCellDoubleClicked={getCellDoubleClicked} gridRef={gridRef} /> <StuffQGrid {...gridProps} getCellDoubleClicked={getCellDoubleClicked} gridRef={gridRef} />
<div className="pagination-wrap"> <div className="pagination-wrap">
{/* <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} /> */}
<QPagination <QPagination
pageNo={stuffSearch.pageNo} pageNo={stuffSearch.pageNo}
pageSize={stuffSearch.pageSize} pageSize={stuffSearch.pageSize}

View File

@ -17,6 +17,8 @@ import { isObjectNotEmpty } from '@/util/common-utils'
import { SessionContext } from '@/app/SessionProvider' import { SessionContext } from '@/app/SessionProvider'
import { QcastContext } from '@/app/QcastProvider'
export default function StuffSearchCondition() { export default function StuffSearchCondition() {
const { session } = useContext(SessionContext) const { session } = useContext(SessionContext)
const setAppMessageState = useSetRecoilState(appMessageStore) const setAppMessageState = useSetRecoilState(appMessageStore)
@ -66,6 +68,8 @@ export default function StuffSearchCondition() {
const [otherSaleStoreList, setOtherSaleStoreList] = useState([]) //1 const [otherSaleStoreList, setOtherSaleStoreList] = useState([]) //1
const [otherSaleStoreId, setOtherSaleStoreId] = useState('') const [otherSaleStoreId, setOtherSaleStoreId] = useState('')
const { setIsGlobalLoading } = useContext(QcastContext)
// //
const onSubmit = () => { const onSubmit = () => {
let diff = dayjs(endDate).diff(startDate, 'day') let diff = dayjs(endDate).diff(startDate, 'day')
@ -78,6 +82,7 @@ export default function StuffSearchCondition() {
return alert(getMessage('stuff.message.periodError')) return alert(getMessage('stuff.message.periodError'))
} }
setIsGlobalLoading(true)
if (stuffSearch.code === 'S') { if (stuffSearch.code === 'S') {
if (stuffSearch.pageNo !== 1) { if (stuffSearch.pageNo !== 1) {
setStuffSearch({ setStuffSearch({
@ -557,14 +562,14 @@ export default function StuffSearchCondition() {
<div className="left-unit-box"> <div className="left-unit-box">
<Link href="/management/stuff/tempdetail" scroll={false}> <Link href="/management/stuff/tempdetail" scroll={false}>
<button type="button" className="btn-origin navy mr5"> <button type="button" className="btn-origin navy mr5">
{getMessage('stuff.search.btn1')} {getMessage('stuff.search.btn.register')}
</button> </button>
</Link> </Link>
<button type="button" className="btn-origin navy mr5" onClick={onSubmit}> <button type="button" className="btn-origin navy mr5" onClick={onSubmit}>
{getMessage('stuff.search.btn2')} {getMessage('stuff.search.btn.search')}
</button> </button>
<button type="button" className="btn-origin grey" onClick={resetRecoil}> <button type="button" className="btn-origin grey" onClick={resetRecoil}>
{getMessage('stuff.search.btn3')} {getMessage('stuff.search.btn.reset')}
</button> </button>
</div> </div>
</div> </div>

View File

@ -698,9 +698,9 @@
"stuff.planReqPopup.error.message1": "設計依頼を選択してください.", "stuff.planReqPopup.error.message1": "設計依頼を選択してください.",
"stuff.planReqPopup.error.message2": "販売店を選択してください.", "stuff.planReqPopup.error.message2": "販売店を選択してください.",
"stuff.search.title": "物件状況", "stuff.search.title": "物件状況",
"stuff.search.btn1": "新規 物件 登録", "stuff.search.btn.register": "新規 物件 登録",
"stuff.search.btn2": "照会", "stuff.search.btn.search": "照会",
"stuff.search.btn3": "初期化", "stuff.search.btn.reset": "初期化",
"stuff.search.schObjectNo": "品番", "stuff.search.schObjectNo": "品番",
"stuff.search.schSaleStoreName": "販売代理店名", "stuff.search.schSaleStoreName": "販売代理店名",
"stuff.search.schAddress": "商品アドレス", "stuff.search.schAddress": "商品アドレス",

View File

@ -708,9 +708,9 @@
"stuff.planReqPopup.error.message1": "설계의뢰를 선택해주세요.", "stuff.planReqPopup.error.message1": "설계의뢰를 선택해주세요.",
"stuff.planReqPopup.error.message2": "판매점을 선택해주세요.", "stuff.planReqPopup.error.message2": "판매점을 선택해주세요.",
"stuff.search.title": "물건현황", "stuff.search.title": "물건현황",
"stuff.search.btn1": "신규 물건 등록", "stuff.search.btn.register": "신규 물건 등록",
"stuff.search.btn2": "조회", "stuff.search.btn.search": "조회",
"stuff.search.btn3": "초기화", "stuff.search.btn.reset": "초기화",
"stuff.search.schObjectNo": "물건번호", "stuff.search.schObjectNo": "물건번호",
"stuff.search.schSaleStoreName": "판매대리점명", "stuff.search.schSaleStoreName": "판매대리점명",
"stuff.search.schAddress": "물건주소", "stuff.search.schAddress": "물건주소",