Merge remote-tracking branch 'origin/dev' into dev

2024-11-06 16:57:36 +09:00 · 2024-11-06 16:57:36 +09:00 · 287f7f9c39
commit 287f7f9c39
parent 6bcc81a088 d8a69306f3
2 changed files with 64 additions and 96 deletions
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@ -5,7 +5,7 @@ import { useRouter, usePathname } from 'next/navigation'
 import { useAxios } from '@/hooks/useAxios'
 import { useMessage } from '@/hooks/useMessage'
 import StuffQGrid from './StuffQGrid'
-import { useRecoilValue, useRecoilState, useSetRecoilState } from 'recoil'
+import { useRecoilValue, useRecoilState, useSetRecoilState, useResetRecoilState } from 'recoil'
 import { stuffSearchState } from '@/store/stuffAtom'
 import { queryStringFormatter, isEmptyArray } from '@/util/common-utils'
 import dayjs from 'dayjs'
@ -19,7 +19,7 @@ import { sessionStore } from '@/store/commonAtom'
 import { SessionContext } from '@/app/SessionProvider'

 export default function Stuff() {
-  const sessionState = useRecoilValue(sessionStore)
+  const resetStuffRecoil = useResetRecoilState(stuffSearchState)
  const { session } = useContext(SessionContext)
  const setAppMessageState = useSetRecoilState(appMessageStore)
  const stuffSearchParams = useRecoilValue(stuffSearchState)
@ -34,9 +34,6 @@ export default function Stuff() {
  const { get } = useAxios(globalLocaleState)
  const gridRef = useRef()

-  // const [selectedRowData, setSelectedRowData] = useState([])
-  // const [selectedRowDataCount, setSelectedRowDataCount] = useState(0)
-
  const router = useRouter()
  const pathname = usePathname()

@ -67,10 +64,6 @@ export default function Stuff() {
        field: 'lastEditDatetime',
        minWidth: 200,
        headerName: getMessage('stuff.gridHeader.lastEditDatetime'),
-        // headerCheckboxSelection: true,
-        // headerCheckboxSelectionCurrentPageOnly: true, //페이징시 현재 페이지만 체크되도록
-        // checkboxSelection: true,
-        // showDisabledCheckboxes: true,
        cellStyle: { justifyContent: 'center' },
        valueFormatter: function (params) {
          if (params.value) {
@ -169,77 +162,67 @@ export default function Stuff() {

  // 진입시 그리드 데이터 조회
  useEffect(() => {
-    if (isObjectNotEmpty(session)) {
-      if (stuffSearchParams?.code === 'S') {
-        const params = {
-          // saleStoreId: stuffSearchParams.schSelSaleStoreId,
-          saleStoreId: session.storeId,
-          schObjectNo: stuffSearchParams?.schObjectNo,
-          schAddress: stuffSearchParams?.schAddress,
-          schObjectName: stuffSearchParams?.schObjectName,
-          schSaleStoreName: stuffSearchParams?.schSaleStoreName,
-          schReceiveUser: stuffSearchParams?.schReceiveUser,
-          schDispCompanyName: stuffSearchParams?.schDispCompanyName,
-          schDateType: stuffSearchParams.schDateType,
-          schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
-          schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
-          startRow: (pageNo - 1) * pageSize + 1,
-          endRow: pageNo * pageSize,
-          schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId
-            ? stuffSearchParams.schOtherSelSaleStoreId
-            : stuffSearchParams.schSelSaleStoreId,
-          schSortType: stuffSearchParams.schSortType,
-        }
-        async function fetchData() {
-          const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
-          await get({
-            url: apiUrl,
-          }).then((res) => {
-            if (!isEmptyArray(res)) {
-              setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
-              setTotalCount(res[0].totCnt)
-            }
-          })
-        }
-        if (stuffSearchParams?.schSelSaleStoreId !== '') {
-          fetchData()
-        }
-      } else if (stuffSearchParams?.code === 'M') {
-        //메인화면에서 진입
-        const params = {
-          saleStoreId: session?.storeId,
-          schObjectNo: stuffSearchParams.schObjectNo,
-          schAddress: '',
-          schObjectName: '',
-          schSaleStoreName: '',
-          schReceiveUser: '',
-          schDispCompanyName: '',
-          schDateType: 'U',
-          schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
-          schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
-          startRow: (pageNo - 1) * pageSize + 1,
-          endRow: pageNo * pageSize,
-          schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId
-            ? stuffSearchParams.schOtherSelSaleStoreId
-            : stuffSearchParams.schSelSaleStoreId,
-          schSortType: 'R',
-        }
-        setStuffSearch({
-          ...params,
+    if (stuffSearchParams?.code === 'S') {
+      const params = {
+        saleStoreId: session.storeId,
+        schObjectNo: stuffSearchParams?.schObjectNo,
+        schAddress: stuffSearchParams?.schAddress,
+        schObjectName: stuffSearchParams?.schObjectName,
+        schSaleStoreName: stuffSearchParams?.schSaleStoreName,
+        schReceiveUser: stuffSearchParams?.schReceiveUser,
+        schDispCompanyName: stuffSearchParams?.schDispCompanyName,
+        schDateType: stuffSearchParams.schDateType,
+        schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
+        schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
+        startRow: (pageNo - 1) * pageSize + 1,
+        endRow: pageNo * pageSize,
+        schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : stuffSearchParams.schSelSaleStoreId,
+        schSortType: stuffSearchParams.schSortType,
+      }
+
+      async function fetchData() {
+        const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
+        await get({
+          url: apiUrl,
+        }).then((res) => {
+          if (!isEmptyArray(res)) {
+            setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
+            setTotalCount(res[0].totCnt)
+          }
        })
      }
-    }
-  }, [pageNo, session, stuffSearchParams])

-  useEffect(() => {
-    if (stuffSearchParams?.code === 'E') {
+      fetchData()
+    } else if (stuffSearchParams?.code === 'M') {
+      const params = {
+        saleStoreId: session?.storeId,
+        schObjectNo: stuffSearchParams.schObjectNo,
+        schAddress: '',
+        schObjectName: '',
+        schSaleStoreName: '',
+        schReceiveUser: '',
+        schDispCompanyName: '',
+        schDateType: 'U',
+        schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
+        schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
+        startRow: (pageNo - 1) * pageSize + 1,
+        endRow: pageNo * pageSize,
+        schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : stuffSearchParams.schSelSaleStoreId,
+        schSortType: 'R',
+      }
+      setStuffSearch({
+        ...params,
+      })
+    } else if (stuffSearchParams?.code === 'E') {
      stuffSearchParams.startRow = 1
      stuffSearchParams.endRow = 1 * pageSize
      stuffSearchParams.schSortType = defaultSortType
-
      setPageNo(1)
+      setStuffSearch({
+        ...stuffSearch,
+        code: 'FINISH',
+      })

-      //조회를 눌렀을때
      async function fetchData() {
        const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
        await get({ url: apiUrl }).then((res) => {
@ -252,7 +235,10 @@ export default function Stuff() {
          }
        })
      }
+
      fetchData()
+    } else if (stuffSearchParams?.code === 'C') {
+      resetStuffRecoil()
    }
  }, [stuffSearchParams])

--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@ -94,13 +94,13 @@ export default function StuffSearchCondition() {
      })
    } else {
      setStuffSearch({
-        schObjectNo: objectNo ? objectNo : '',
-        schSaleStoreName: saleStoreName ? saleStoreName : '',
-        schAddress: address ? address : '',
-        schObjectName: objectName ? objectName : '',
-        schDispCompanyName: dispCompanyName ? dispCompanyName : '',
+        schObjectNo: objectNo,
+        schSaleStoreName: saleStoreName,
+        schAddress: address,
+        schObjectName: objectName,
+        schDispCompanyName: dispCompanyName,
        schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : stuffSearch.schSelSaleStoreId,
-        schReceiveUser: receiveUser ? receiveUser : '',
+        schReceiveUser: receiveUser,
        schDateType: dateType,
        schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
        schToDt: dayjs(endDate).format('YYYY-MM-DD'),
@ -131,14 +131,12 @@ export default function StuffSearchCondition() {
    setDateType('U')
    setStartDate(dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
    setEndDate(dayjs(new Date()).format('YYYY-MM-DD'))
-    // if (sessionState?.storeId === 'T01') {
    if (session?.storeId === 'T01') {
      setSchSelSaleStoreId('')
      handleClear1() //판매대리점선택 자동완성 클리어
      resetStuffRecoil()
      setStuffSearch({
        ...stuffSearch,
-        code: 'C',
        schSelSaleStoreId: '',
        schOtherSelSaleStoreId: '',
      })
@ -156,23 +154,17 @@ export default function StuffSearchCondition() {
  }

  useEffect(() => {
-    // if (isObjectNotEmpty(sessionState)) {
    if (isObjectNotEmpty(session)) {
      // storeId가 T01 이거나 storeLvl이 1차점일때만 판매대리점 선택 활성화
      let url
-      // if (sessionState?.storeId === 'T01') {
      if (session?.storeId === 'T01') {
        //T01일떄
-        // url = `/api/object/saleStore/${sessionState?.storeId}/firstList?userId=${sessionState?.userId}`
        url = `/api/object/saleStore/${session?.storeId}/firstList?userId=${session?.userId}`
      } else {
-        // if (sessionState.storeLvl === '1') {
        if (session.storeLvl === '1') {
          //T01아닌 1차점일때
-          // url = `/api/object/saleStore/${sessionState?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
          url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
        } else {
-          // url = `/api/object/saleStore/${sessionState?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
          url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${session?.userId}`
        }
      }
@ -187,7 +179,6 @@ export default function StuffSearchCondition() {
          let allList
          let favList
          let otherList
-          // if (sessionState?.storeId === 'T01') {
          if (session?.storeId === 'T01') {
            allList = res
            allList.sort((a, b) => (a.saleStoreId !== 'T01') - (b.saleStoreId !== 'T01') || a.saleStoreId - b.saleStoreId)
@ -195,17 +186,14 @@ export default function StuffSearchCondition() {
            setSchSelSaleStoreList(allList)
            setFavoriteStoreList(favList)
            setShowSaleStoreList(favList)
-            // setSchSelSaleStoreId(sessionState?.storeId)
            setSchSelSaleStoreId(session?.storeId)
            setStuffSearch({
              ...stuffSearch,
              code: 'S',
-              // schSelSaleStoreId: sessionState?.storeId,
              schSelSaleStoreId: session?.storeId,
            })

            //T01일때 2차 판매점 호출하기 디폴트로 1차점을 본인으로 셋팅해서 세션storeId사용
-            // url = `/api/object/saleStore/${sessionState?.storeId}/list?firstFlg=0&userId=${sessionState?.userId}`
            url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=0&userId=${session?.userId}`

            get({ url: url }).then((res) => {
@ -222,7 +210,6 @@ export default function StuffSearchCondition() {
              }
            })
          } else {
-            // if (sessionState?.storeLvl === '1') {
            if (session?.storeLvl === '1') {
              allList = res
              favList = res.filter((row) => row.priority !== 'B')
@ -250,7 +237,6 @@ export default function StuffSearchCondition() {
              setOtherSaleStoreList(otherList)

              //선택한 2차점 세션으로 자동셋팅
-              // setOtherSaleStoreId(sessionState?.storeId)
              setOtherSaleStoreId(session?.storeId)
              setStuffSearch({
                ...stuffSearch,
@ -262,7 +248,6 @@ export default function StuffSearchCondition() {
        }
      })
    }
-    // }, [sessionState])
  }, [session])

  //초기화 눌렀을 때 1차판매점 자동완성도..
@ -296,7 +281,6 @@ export default function StuffSearchCondition() {
      stuffSearch.schSelSaleStoreId = key.saleStoreId
      //T01아닌 1차점은 본인으로 디폴트셋팅이고 수정할수없어서 여기안옴
      //고른 1차점의 saleStoreId로 2차점 API호출하기
-      // let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${sessionState?.userId}`
      let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
      let otherList
      get({ url: url }).then((res) => {
@ -620,7 +604,6 @@ export default function StuffSearchCondition() {
                          value={'U'}
                          onChange={(e) => {
                            setDateType(e.target.value)
-                            //setStuffSearch({ ...stuffSearch, code: 'S', schDateType: e.target.value })
                          }}
                        />
                        <label htmlFor="radio_u">{getMessage('stuff.search.schDateTypeU')}</label>
@ -634,7 +617,6 @@ export default function StuffSearchCondition() {
                          value={'R'}
                          onChange={(e) => {
                            setDateType(e.target.value)
-                            //setStuffSearch({ ...stuffSearch, code: 'S', schDateType: e.target.value })
                          }}
                        />
                        <label htmlFor="radio_r">{getMessage('stuff.search.schDateTypeR')}</label>