diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx index cc75a4c4..8197efc3 100644 --- a/src/components/management/Stuff.jsx +++ b/src/components/management/Stuff.jsx @@ -218,6 +218,8 @@ export default function Stuff() { pageNo: stuffSearchParams?.pageNo ? stuffSearchParams.pageNo : 1, pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100, } + + // console.log('코드S PA::::::', params) async function fetchData() { const apiUrl = `/api/object/list?${queryStringFormatter(params)}` await get({ @@ -270,6 +272,7 @@ export default function Stuff() { stuffSearchParams.schSortType = defaultSortType stuffSearchParams.pageNo = stuffSearchParams.pageNo + // console.log('코드E PA:::::::::::', stuffSearchParams) async function fetchData() { const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}` await get({ url: apiUrl }).then((res) => { @@ -300,6 +303,7 @@ export default function Stuff() { stuffSearchParams.schSortType = defaultSortType setPageNo(1) + // console.log('코드FINISH PA::::::::::::::::', stuffSearchParams) async function fetchData() { const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}` await get({ url: apiUrl }).then((res) => { diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 602956a5..f8cf0aab 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -432,7 +432,6 @@ export default function StuffDetail() { setOtherSaleStoreList(otherList) } else { - //10X22, 201X112,202X217 firstList = res.filter((row) => row.firstAgentYn === 'Y') setSaleStoreList(firstList) setFavoriteStoreList(firstList) @@ -443,6 +442,7 @@ export default function StuffDetail() { form.setValue('saleStoreLevel', firstList[0].saleStoreLevel) otherList = res.filter((row) => row.firstAgentYn === 'N') + setOtherSaleStoreList(otherList) //2차 판매점명/ID는 본인을 셀렉트 setOtherSelOptions(session?.storeId) @@ -1752,7 +1752,7 @@ export default function StuffDetail() { onChange={onSelectionChange2} getOptionLabel={(x) => x.saleStoreName} getOptionValue={(x) => x.saleStoreId} - isDisabled={otherSaleStoreList != null && otherSaleStoreList.length > 0 ? false : true} + isDisabled={otherSaleStoreList != null && otherSaleStoreList.length === 1 ? true : false} isClearable={true} value={otherSaleStoreList.filter(function (option) { return option.saleStoreId === otherSelOptions diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index 75fa87db..508c06fb 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -84,6 +84,7 @@ export default function StuffSearchCondition() { } setIsGlobalLoading(true) + if (stuffSearch.code === 'S') { if (stuffSearch.pageNo !== 1) { setStuffSearch({ @@ -107,26 +108,51 @@ export default function StuffSearchCondition() { pageSize: stuffSearch?.pageSize, }) } else { - setStuffSearch({ - schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(), - schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', - schAddress: address ? address.trim() : '', - schObjectName: objectName ? objectName.trim() : '', - schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', - schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', - schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', - schReceiveUser: receiveUser ? receiveUser.trim() : '', - schDateType: dateType, - schTempFlg: tempFlg, //임시저장물건 - 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 : 'U', - pageNo: stuffSearch?.pageNo, - pageSize: stuffSearch?.pageSize, - }) + if (session.saleStoreId !== 'T01') { + setStuffSearch({ + schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(), + schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', + schAddress: address ? address.trim() : '', + schObjectName: objectName ? objectName.trim() : '', + schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', + // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', + schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId, + schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + schReceiveUser: receiveUser ? receiveUser.trim() : '', + schDateType: dateType, + schTempFlg: tempFlg, //임시저장물건 + 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 : 'U', + pageNo: stuffSearch?.pageNo, + pageSize: stuffSearch?.pageSize, + }) + } else { + setStuffSearch({ + schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(), + schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', + schAddress: address ? address.trim() : '', + schObjectName: objectName ? objectName.trim() : '', + schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', + schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', + // schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId, + schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', + schReceiveUser: receiveUser ? receiveUser.trim() : '', + schDateType: dateType, + schTempFlg: tempFlg, //임시저장물건 + 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 : 'U', + pageNo: stuffSearch?.pageNo, + pageSize: stuffSearch?.pageSize, + }) + } } } else if (stuffSearch.code === 'FINISH') { setStuffSearch({ @@ -148,6 +174,7 @@ export default function StuffSearchCondition() { schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U', }) } else if (stuffSearch.code === 'E') { + // console.log('E로 바꿈????????????') if (session.storeId !== 'T01' && session.storeLvl === '1') { setStuffSearch({ schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(), @@ -236,6 +263,7 @@ export default function StuffSearchCondition() { }) } } else { + // console.log('최후ELSE:::::::') setStuffSearch({ schObjectNo: objectNo.trim(), schSaleStoreName: saleStoreName.trim(), @@ -304,38 +332,40 @@ export default function StuffSearchCondition() { pageSize: 100, }) } else { - if (otherSaleStoreList.length > 1) { - handleClear2() - setOtherSaleStoreId('') - stuffSearch.schObjectNo = '' - stuffSearch.schAddress = '' - stuffSearch.schObjectName = '' - stuffSearch.schSaleStoreName = '' - stuffSearch.schReceiveUser = '' - stuffSearch.schDispCompanyName = '' - stuffSearch.schDateType = 'U' - stuffSearch.schTempFlg = '' + if (session?.storeLvl === '2') { + if (otherSaleStoreList.length > 1) { + handleClear2() + setOtherSaleStoreId('') + stuffSearch.schObjectNo = '' + stuffSearch.schAddress = '' + stuffSearch.schObjectName = '' + stuffSearch.schSaleStoreName = '' + stuffSearch.schReceiveUser = '' + stuffSearch.schDispCompanyName = '' + stuffSearch.schDateType = 'U' + stuffSearch.schTempFlg = '' - stuffSearch.startRow = 1 - stuffSearch.endRow = 100 - stuffSearch.schSortType = 'U' - stuffSearch.pageNo = 1 - stuffSearch.pageSize = 100 - } else { - stuffSearch.schObjectNo = '' - stuffSearch.schAddress = '' - stuffSearch.schObjectName = '' - stuffSearch.schSaleStoreName = '' - stuffSearch.schReceiveUser = '' - stuffSearch.schDispCompanyName = '' - stuffSearch.schDateType = 'U' - stuffSearch.schTempFlg = '' + stuffSearch.startRow = 1 + stuffSearch.endRow = 100 + stuffSearch.schSortType = 'U' + stuffSearch.pageNo = 1 + stuffSearch.pageSize = 100 + } else { + stuffSearch.schObjectNo = '' + stuffSearch.schAddress = '' + stuffSearch.schObjectName = '' + stuffSearch.schSaleStoreName = '' + stuffSearch.schReceiveUser = '' + stuffSearch.schDispCompanyName = '' + stuffSearch.schDateType = 'U' + stuffSearch.schTempFlg = '' - stuffSearch.startRow = 1 - stuffSearch.endRow = 100 - stuffSearch.schSortType = 'U' - stuffSearch.pageNo = 1 - stuffSearch.pageSize = 100 + stuffSearch.startRow = 1 + stuffSearch.endRow = 100 + stuffSearch.schSortType = 'U' + stuffSearch.pageNo = 1 + stuffSearch.pageSize = 100 + } } } } @@ -644,7 +674,7 @@ export default function StuffSearchCondition() { // 내 물건 보기 const checkMyData = (e) => { - console.log('e:::::::', e.target.checked) + // console.log('e:::::::', e.target.checked) } return (