From 57bc308dd2239a85800330357ec34ef4249f93fc Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Fri, 22 Nov 2024 23:22:01 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EB=A1=9C=EB=94=A9=ED=99=94=EB=A9=B4=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/management/Stuff.jsx            | 18 ++++++++++++------
 .../management/StuffSearchCondition.jsx        | 11 ++++++++---
 src/locales/ja.json                            |  6 +++---
 src/locales/ko.json                            |  6 +++---
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx
index d3b8f627..ae34acf5 100644
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@@ -16,7 +16,11 @@ import JA from '@/locales/ja.json'
 import QPagination from '../common/pagination/QPagination'
 import { SessionContext } from '@/app/SessionProvider'
 
+import { QcastContext } from '@/app/QcastProvider'
+
 export default function Stuff() {
+  const { setIsGlobalLoading } = useContext(QcastContext)
+
   const resetStuffRecoil = useResetRecoilState(stuffSearchState)
   const { session } = useContext(SessionContext)
   const setAppMessageState = useSetRecoilState(appMessageStore)
@@ -198,9 +202,10 @@ export default function Stuff() {
             stuffSearchParams.startRow = 1
             stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize
           }
+
+          setIsGlobalLoading(false)
         })
       }
-
       fetchData()
     } else if (stuffSearchParams?.code === 'M') {
       const params = {
@@ -229,10 +234,8 @@ export default function Stuff() {
       stuffSearchParams.startRow = (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1
       stuffSearchParams.endRow = stuffSearchParams.pageNo * stuffSearchParams.pageSize
       stuffSearchParams.schSortType = defaultSortType
-      //setPageNo(1)
       stuffSearchParams.pageNo = stuffSearchParams.pageNo
 
-      // return
       async function fetchData() {
         const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
         await get({ url: apiUrl }).then((res) => {
@@ -249,9 +252,10 @@ export default function Stuff() {
             stuffSearchParams.startRow = 1
             stuffSearchParams.endRow = 1 * stuffSearchParams.pageSize
           }
+
+          setIsGlobalLoading(false)
         })
       }
-
       fetchData()
     } else if (stuffSearchParams?.code === 'C') {
       resetStuffRecoil()
@@ -273,7 +277,6 @@ export default function Stuff() {
           }
         })
       }
-
       fetchData()
     } else if (stuffSearchParams?.code === 'DELETE') {
       const newParams = {
@@ -375,6 +378,10 @@ export default function Stuff() {
     setPageNo(page)
   }
 
+  useEffect(() => {
+    setIsGlobalLoading(true)
+  }, [])
+
   return (
     <>
       {/* 퍼블시작 */}
@@ -410,7 +417,6 @@ export default function Stuff() {
           <div className="q-grid">
             <StuffQGrid {...gridProps} getCellDoubleClicked={getCellDoubleClicked} gridRef={gridRef} />
             <div className="pagination-wrap">
-              {/* <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} /> */}
               <QPagination
                 pageNo={stuffSearch.pageNo}
                 pageSize={stuffSearch.pageSize}
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index 8d454b85..0cc723a3 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -17,6 +17,8 @@ import { isObjectNotEmpty } from '@/util/common-utils'
 
 import { SessionContext } from '@/app/SessionProvider'
 
+import { QcastContext } from '@/app/QcastProvider'
+
 export default function StuffSearchCondition() {
   const { session } = useContext(SessionContext)
   const setAppMessageState = useSetRecoilState(appMessageStore)
@@ -66,6 +68,8 @@ export default function StuffSearchCondition() {
   const [otherSaleStoreList, setOtherSaleStoreList] = useState([]) //1차점 이외 판매점목록
   const [otherSaleStoreId, setOtherSaleStoreId] = useState('')
 
+  const { setIsGlobalLoading } = useContext(QcastContext)
+
   // 조회
   const onSubmit = () => {
     let diff = dayjs(endDate).diff(startDate, 'day')
@@ -78,6 +82,7 @@ export default function StuffSearchCondition() {
       return alert(getMessage('stuff.message.periodError'))
     }
 
+    setIsGlobalLoading(true)
     if (stuffSearch.code === 'S') {
       if (stuffSearch.pageNo !== 1) {
         setStuffSearch({
@@ -557,14 +562,14 @@ export default function StuffSearchCondition() {
           <div className="left-unit-box">
             <Link href="/management/stuff/tempdetail" scroll={false}>
               <button type="button" className="btn-origin navy mr5">
-                {getMessage('stuff.search.btn1')}
+                {getMessage('stuff.search.btn.register')}
               </button>
             </Link>
             <button type="button" className="btn-origin navy mr5" onClick={onSubmit}>
-              {getMessage('stuff.search.btn2')}
+              {getMessage('stuff.search.btn.search')}
             </button>
             <button type="button" className="btn-origin grey" onClick={resetRecoil}>
-              {getMessage('stuff.search.btn3')}
+              {getMessage('stuff.search.btn.reset')}
             </button>
           </div>
         </div>
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 40df78f7..9250fe50 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -698,9 +698,9 @@
   "stuff.planReqPopup.error.message1": "設計依頼を選択してください.",
   "stuff.planReqPopup.error.message2": "販売店を選択してください.",
   "stuff.search.title": "物件状況",
-  "stuff.search.btn1": "新規 物件 登録",
-  "stuff.search.btn2": "照会",
-  "stuff.search.btn3": "初期化",
+  "stuff.search.btn.register": "新規 物件 登録",
+  "stuff.search.btn.search": "照会",
+  "stuff.search.btn.reset": "初期化",
   "stuff.search.schObjectNo": "品番",
   "stuff.search.schSaleStoreName": "販売代理店名",
   "stuff.search.schAddress": "商品アドレス",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index a11e6d0a..023ccdc8 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -708,9 +708,9 @@
   "stuff.planReqPopup.error.message1": "설계의뢰를 선택해주세요.",
   "stuff.planReqPopup.error.message2": "판매점을 선택해주세요.",
   "stuff.search.title": "물건현황",
-  "stuff.search.btn1": "신규 물건 등록",
-  "stuff.search.btn2": "조회",
-  "stuff.search.btn3": "초기화",
+  "stuff.search.btn.register": "신규 물건 등록",
+  "stuff.search.btn.search": "조회",
+  "stuff.search.btn.reset": "초기화",
   "stuff.search.schObjectNo": "물건번호",
   "stuff.search.schSaleStoreName": "판매대리점명",
   "stuff.search.schAddress": "물건주소",