qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

물건 2차점 로그인시 2차점 셋팅 수정

Browse Source
This commit is contained in:
basssy 2025-01-08 08:50:32 +09:00
parent e6ca59eae6
commit a2d92ba80b
3 changed files with 87 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/management/Stuff.jsx
View File

@ -218,6 +218,8 @@ export default function Stuff() {
pageNo: stuffSearchParams?.pageNo ? stuffSearchParams.pageNo : 1, pageNo: stuffSearchParams?.pageNo ? stuffSearchParams.pageNo : 1,
pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100, pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100,
} }
// console.log('코드S PA::::::', params)
async function fetchData() { async function fetchData() {
const apiUrl = `/api/object/list?${queryStringFormatter(params)}` const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
await get({ await get({
@ -270,6 +272,7 @@ export default function Stuff() {
stuffSearchParams.schSortType = defaultSortType stuffSearchParams.schSortType = defaultSortType
stuffSearchParams.pageNo = stuffSearchParams.pageNo stuffSearchParams.pageNo = stuffSearchParams.pageNo
// console.log('코드E PA:::::::::::', stuffSearchParams)
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) => {
@ -300,6 +303,7 @@ export default function Stuff() {
stuffSearchParams.schSortType = defaultSortType stuffSearchParams.schSortType = defaultSortType
setPageNo(1) setPageNo(1)
// console.log('코드FINISH PA::::::::::::::::', stuffSearchParams)
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) => {

4
src/components/management/StuffDetail.jsx
View File

@ -432,7 +432,6 @@ export default function StuffDetail() {
setOtherSaleStoreList(otherList) setOtherSaleStoreList(otherList)
} else { } else {
//10X22, 201X112,202X217
firstList = res.filter((row) => row.firstAgentYn === 'Y') firstList = res.filter((row) => row.firstAgentYn === 'Y')
setSaleStoreList(firstList) setSaleStoreList(firstList)
setFavoriteStoreList(firstList) setFavoriteStoreList(firstList)
@ -443,6 +442,7 @@ export default function StuffDetail() {
form.setValue('saleStoreLevel', firstList[0].saleStoreLevel) form.setValue('saleStoreLevel', firstList[0].saleStoreLevel)
otherList = res.filter((row) => row.firstAgentYn === 'N') otherList = res.filter((row) => row.firstAgentYn === 'N')
setOtherSaleStoreList(otherList) setOtherSaleStoreList(otherList)
//2차 판매점명/ID는 본인을 셀렉트 //2차 판매점명/ID는 본인을 셀렉트
setOtherSelOptions(session?.storeId) setOtherSelOptions(session?.storeId)
@ -1752,7 +1752,7 @@ export default function StuffDetail() {
onChange={onSelectionChange2} onChange={onSelectionChange2}
getOptionLabel={(x) => x.saleStoreName} getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId} getOptionValue={(x) => x.saleStoreId}
isDisabled={otherSaleStoreList != null && otherSaleStoreList.length > 0 ? false : true} isDisabled={otherSaleStoreList != null && otherSaleStoreList.length === 1 ? true : false}
isClearable={true} isClearable={true}
value={otherSaleStoreList.filter(function (option) { value={otherSaleStoreList.filter(function (option) {
return option.saleStoreId === otherSelOptions return option.saleStoreId === otherSelOptions

132
src/components/management/StuffSearchCondition.jsx
View File

@ -84,6 +84,7 @@ export default function StuffSearchCondition() {
} }
setIsGlobalLoading(true) setIsGlobalLoading(true)
if (stuffSearch.code === 'S') { if (stuffSearch.code === 'S') {
if (stuffSearch.pageNo !== 1) { if (stuffSearch.pageNo !== 1) {
setStuffSearch({ setStuffSearch({
@ -107,26 +108,51 @@ export default function StuffSearchCondition() {
pageSize: stuffSearch?.pageSize, pageSize: stuffSearch?.pageSize,
}) })
} else { } else {
setStuffSearch({ if (session.saleStoreId !== 'T01') {
schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(), setStuffSearch({
schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(),
schAddress: address ? address.trim() : '', schSaleStoreName: saleStoreName ? saleStoreName.trim() : '',
schObjectName: objectName ? objectName.trim() : '', schAddress: address ? address.trim() : '',
schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', schObjectName: objectName ? objectName.trim() : '',
schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '', // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
schReceiveUser: receiveUser ? receiveUser.trim() : '', schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId,
schDateType: dateType, schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
schTempFlg: tempFlg, //임시저장물건 schReceiveUser: receiveUser ? receiveUser.trim() : '',
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '', schDateType: dateType,
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '', schTempFlg: tempFlg, //임시저장물건
code: 'E', schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1, schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100, code: 'E',
schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U', startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1,
pageNo: stuffSearch?.pageNo, endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100,
pageSize: stuffSearch?.pageSize, 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') { } else if (stuffSearch.code === 'FINISH') {
setStuffSearch({ setStuffSearch({
@ -148,6 +174,7 @@ export default function StuffSearchCondition() {
schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U', schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U',
}) })
} else if (stuffSearch.code === 'E') { } else if (stuffSearch.code === 'E') {
// console.log('E로 바꿈????????????')
if (session.storeId !== 'T01' && session.storeLvl === '1') { if (session.storeId !== 'T01' && session.storeLvl === '1') {
setStuffSearch({ setStuffSearch({
schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(), schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(),
@ -236,6 +263,7 @@ export default function StuffSearchCondition() {
}) })
} }
} else { } else {
// console.log('최후ELSE:::::::')
setStuffSearch({ setStuffSearch({
schObjectNo: objectNo.trim(), schObjectNo: objectNo.trim(),
schSaleStoreName: saleStoreName.trim(), schSaleStoreName: saleStoreName.trim(),
@ -304,38 +332,40 @@ export default function StuffSearchCondition() {
pageSize: 100, pageSize: 100,
}) })
} else { } else {
if (otherSaleStoreList.length > 1) { if (session?.storeLvl === '2') {
handleClear2() if (otherSaleStoreList.length > 1) {
setOtherSaleStoreId('') handleClear2()
stuffSearch.schObjectNo = '' setOtherSaleStoreId('')
stuffSearch.schAddress = '' stuffSearch.schObjectNo = ''
stuffSearch.schObjectName = '' stuffSearch.schAddress = ''
stuffSearch.schSaleStoreName = '' stuffSearch.schObjectName = ''
stuffSearch.schReceiveUser = '' stuffSearch.schSaleStoreName = ''
stuffSearch.schDispCompanyName = '' stuffSearch.schReceiveUser = ''
stuffSearch.schDateType = 'U' stuffSearch.schDispCompanyName = ''
stuffSearch.schTempFlg = '' stuffSearch.schDateType = 'U'
stuffSearch.schTempFlg = ''
stuffSearch.startRow = 1 stuffSearch.startRow = 1
stuffSearch.endRow = 100 stuffSearch.endRow = 100
stuffSearch.schSortType = 'U' stuffSearch.schSortType = 'U'
stuffSearch.pageNo = 1 stuffSearch.pageNo = 1
stuffSearch.pageSize = 100 stuffSearch.pageSize = 100
} else { } else {
stuffSearch.schObjectNo = '' stuffSearch.schObjectNo = ''
stuffSearch.schAddress = '' stuffSearch.schAddress = ''
stuffSearch.schObjectName = '' stuffSearch.schObjectName = ''
stuffSearch.schSaleStoreName = '' stuffSearch.schSaleStoreName = ''
stuffSearch.schReceiveUser = '' stuffSearch.schReceiveUser = ''
stuffSearch.schDispCompanyName = '' stuffSearch.schDispCompanyName = ''
stuffSearch.schDateType = 'U' stuffSearch.schDateType = 'U'
stuffSearch.schTempFlg = '' stuffSearch.schTempFlg = ''
stuffSearch.startRow = 1 stuffSearch.startRow = 1
stuffSearch.endRow = 100 stuffSearch.endRow = 100
stuffSearch.schSortType = 'U' stuffSearch.schSortType = 'U'
stuffSearch.pageNo = 1 stuffSearch.pageNo = 1
stuffSearch.pageSize = 100 stuffSearch.pageSize = 100
}
} }
} }
} }
@ -644,7 +674,7 @@ export default function StuffSearchCondition() {
// 내 물건 보기 // 내 물건 보기
const checkMyData = (e) => { const checkMyData = (e) => {
console.log('e:::::::', e.target.checked) // console.log('e:::::::', e.target.checked)
} }
return ( return (