diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx
index 37cda261..8a530bf1 100644
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@@ -188,6 +188,9 @@ export default function Stuff() {
if (!isEmptyArray(res)) {
setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
setTotalCount(res[0].totCnt)
+ } else {
+ setGridProps({ ...gridProps, gridData: [], count: 0 })
+ setTotalCount(0)
}
})
}
@@ -217,12 +220,13 @@ export default function Stuff() {
...params,
})
} else if (stuffSearchParams?.code === 'E') {
- stuffSearchParams.startRow = 1
- stuffSearchParams.endRow = 1 * pageSize
+ stuffSearchParams.startRow = (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1
+ stuffSearchParams.endRow = stuffSearchParams.pageNo * stuffSearchParams.pageSize
stuffSearchParams.schSortType = defaultSortType
- setPageNo(1)
- stuffSearchParams.pageNo = 1
+ //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) => {
@@ -271,8 +275,8 @@ export default function Stuff() {
schDateType: 'U',
schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
- startRow: '1',
- endRow: '100',
+ startRow: 1,
+ endRow: 100,
schSelSaleStoreId: '',
schOtherSelSaleStoreId: '',
schSortType: 'R',
@@ -292,13 +296,11 @@ export default function Stuff() {
let startRow = (1 - 1) * e.target.value + 1
stuffSearchParams.startRow = startRow
stuffSearchParams.endRow = 1 * e.target.value
- stuffSearchParams.schSelSaleStoreId = stuffSearchParams?.schOtherSelSaleStoreId
- ? stuffSearchParams.schOtherSelSaleStoreId
- : stuffSearchParams.schSelSaleStoreId
+ stuffSearchParams.schSelSaleStoreId = stuffSearchParams.schSelSaleStoreId
+ stuffSearchParams.schOtherSelSaleStoreId = stuffSearchParams.schOtherSelSaleStoreId
stuffSearchParams.pageNo = startRow
stuffSearchParams.pageSize = 1 * e.target.value
setPageSize(e.target.value)
-
setStuffSearch({
...stuffSearch,
code: 'S',
@@ -312,20 +314,20 @@ export default function Stuff() {
//최근 등록일 수정일 정렬 이벤트
const onChangeSortType = (e) => {
- let startRow = (1 - 1) * pageSize + 1
+ let startRow = (stuffSearchParams.pageNo - 1) * pageSize + 1
stuffSearchParams.startRow = startRow
- stuffSearchParams.endRow = 1 * pageSize
+ stuffSearchParams.endRow = stuffSearchParams.pageNo * pageSize
stuffSearchParams.schSortType = e.target.value
- stuffSearchParams.schSelSaleStoreId = stuffSearchParams?.schOtherSelSaleStoreId
- ? stuffSearchParams.schOtherSelSaleStoreId
- : stuffSearchParams.schSelSaleStoreId
+ stuffSearchParams.schSelSaleStoreId = stuffSearchParams.schSelSaleStoreId
+ stuffSearchParams.schOtherSelSaleStoreId = stuffSearchParams.schOtherSelSaleStoreId
setDefaultSortType(e.target.value)
+
setStuffSearch({
...stuffSearch,
code: 'S',
startRow: startRow,
- endRow: 1 * pageSize,
+ endRow: stuffSearchParams.pageNo * pageSize,
schSortType: e.target.value,
})
@@ -343,9 +345,8 @@ export default function Stuff() {
// 페이징 현재페이지 변경
const handleChangePage = (page) => {
stuffSearchParams.code = 'S'
- stuffSearchParams.schSelSaleStoreId = stuffSearchParams?.schOtherSelSaleStoreId
- ? stuffSearchParams.schOtherSelSaleStoreId
- : stuffSearchParams.schSelSaleStoreId
+ stuffSearchParams.schSelSaleStoreId = stuffSearchParams.schSelSaleStoreId
+ stuffSearchParams.schOtherSelSaleStoreId = stuffSearchParams.schOtherSelSaleStoreId
setStuffSearch({
...stuffSearch,
code: 'S',
@@ -374,14 +375,13 @@ export default function Stuff() {
-
-
- {/* */}
+
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index 8208947f..2eb5d709 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -77,7 +77,6 @@ export default function StuffSearchCondition() {
if (isNaN(diff)) {
return alert(getMessage('stuff.message.periodError'))
}
-
if (stuffSearch.code === 'S') {
setStuffSearch({
schObjectNo: objectNo ? objectNo : stuffSearch.schObjectNo,
@@ -116,6 +115,26 @@ export default function StuffSearchCondition() {
endRow: 100,
schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
})
+ } else if (stuffSearch.code === 'E') {
+ setStuffSearch({
+ schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo : objectNo,
+ schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName,
+ schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress : address,
+ schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName,
+ schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName,
+ schSelSaleStoreId: schSelSaleStoreId,
+ schOtherSelSaleStoreId: otherSaleStoreId,
+ schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser,
+ schDateType: dateType,
+ 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 : 'R',
+ pageNo: stuffSearch?.pageNo,
+ pageSize: stuffSearch?.pageSize,
+ })
} else {
setStuffSearch({
schObjectNo: objectNo,
@@ -164,9 +183,21 @@ export default function StuffSearchCondition() {
handleClear1() //판매대리점선택 자동완성 클리어
resetStuffRecoil()
setStuffSearch({
+ schObjectNo: '',
+ schAddress: '',
+ schObjectName: '',
+ schSaleStoreName: '',
+ schReceiveUser: '',
+ schDispCompanyName: '',
schSelSaleStoreId: '',
schOtherSelSaleStoreId: '',
schDateType: 'U',
+ startRow: 1,
+ endRow: 100,
+ schSortType: 'R',
+ pageNo: 1,
+ pageSize: 100,
+ code: 'S',
})
} else {
if (otherSaleStoreList.length > 1) {
@@ -342,6 +373,7 @@ export default function StuffSearchCondition() {
stuffSearch.schSelSaleStoreId = schSelSaleStoreId
} else {
//X누르면 검색조건에 1차점으로 셋팅
+
if (session.storeLvl === '1') {
if (stuffSearch.schOtherSelSaleStoreId === '') {
// 화면에선 지우는데 조회누르기 전이면 리코일은 남김
@@ -349,6 +381,9 @@ export default function StuffSearchCondition() {
} else {
// 화면에선 지우는데 조회누르기 전이면 리코일은 남김
setOtherSaleStoreId('')
+ if (stuffSearch.code === 'S') {
+ stuffSearch.schOtherSelSaleStoreId = ''
+ }
}
} else {
setOtherSaleStoreId('')
@@ -360,6 +395,7 @@ export default function StuffSearchCondition() {
}
useEffect(() => {
+ //X42
if (session?.storeId === 'T01') {
if (stuffSearch.code === 'DELETE') {
setObjectNo('')
@@ -383,13 +419,13 @@ export default function StuffSearchCondition() {
stuffSearch.schDateType = 'U'
stuffSearch.schFromDt = dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')
stuffSearch.schToDt = dayjs(new Date()).format('YYYY-MM-DD')
- stuffSearch.startRow = '1'
- stuffSearch.endRow = '100'
+ stuffSearch.startRow = 1
+ stuffSearch.endRow = 100
stuffSearch.schSelSaleStoreId = ''
stuffSearch.schOtherSelSaleStoreId = ''
stuffSearch.schSortType = 'R'
stuffSearch.pageNo = 1
- stuffSearch.pageSize = '100'
+ stuffSearch.pageSize = 100
setSchSelSaleStoreId('')
setOtherSaleStoreId('')
@@ -686,7 +722,7 @@ export default function StuffSearchCondition() {
type="radio"
name="radio_ptype"
id="radio_u"
- checked={dateType === 'U' ? true : false}
+ defaultChecked={stuffSearch.schDateType === 'U' ? true : false}
value={'U'}
onChange={(e) => {
setDateType(e.target.value)
@@ -700,7 +736,7 @@ export default function StuffSearchCondition() {
type="radio"
name="radio_ptype"
id="radio_r"
- checked={dateType === 'R' ? true : false}
+ defaultChecked={stuffSearch.schDateType === 'R' ? true : false}
value={'R'}
onChange={(e) => {
setDateType(e.target.value)