물건 목록 && 물건 상세에서 견적서 작성 이동시 url에 objectNo추가

This commit is contained in:
basssy 2024-11-21 17:43:09 +09:00
parent c213cc3f1a
commit eb5f329922
4 changed files with 87 additions and 41 deletions

View File

@ -177,8 +177,9 @@ export default function Stuff() {
schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '', schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '',
schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '', schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '',
schSortType: stuffSearchParams.schSortType, schSortType: stuffSearchParams.schSortType,
pageNo: stuffSearchParams?.pageNo ? stuffSearchParams.pageNo : 1,
pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100,
} }
async function fetchData() { async function fetchData() {
const apiUrl = `/api/object/list?${queryStringFormatter(params)}` const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
await get({ await get({
@ -209,6 +210,8 @@ export default function Stuff() {
schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : stuffSearchParams.schSelSaleStoreId, schSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : stuffSearchParams.schSelSaleStoreId,
schSortType: 'R', schSortType: 'R',
code: 'S', code: 'S',
pageNo: 1,
pageSize: 100,
} }
setStuffSearch({ setStuffSearch({
...params, ...params,
@ -256,6 +259,31 @@ export default function Stuff() {
} }
fetchData() fetchData()
} else if (stuffSearchParams?.code === 'DELETE') {
const newParams = {
saleStoreId: session.storeId,
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: '1',
endRow: '100',
schSelSaleStoreId: '',
schOtherSelSaleStoreId: '',
schSortType: 'R',
code: 'S',
pageNo: 1,
pageSize: 100,
}
setStuffSearch({
...newParams,
})
} }
}, [stuffSearchParams]) }, [stuffSearchParams])
@ -263,31 +291,23 @@ export default function Stuff() {
const onChangePerPage = (e) => { const onChangePerPage = (e) => {
let startRow = (1 - 1) * e.target.value + 1 let startRow = (1 - 1) * e.target.value + 1
stuffSearchParams.startRow = startRow stuffSearchParams.startRow = startRow
stuffSearchParams.endRow = stuffSearchParams.pageNo * e.target.value stuffSearchParams.endRow = 1 * e.target.value
stuffSearchParams.schSelSaleStoreId = stuffSearchParams?.schOtherSelSaleStoreId stuffSearchParams.schSelSaleStoreId = stuffSearchParams?.schOtherSelSaleStoreId
? stuffSearchParams.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId
: stuffSearchParams.schSelSaleStoreId : stuffSearchParams.schSelSaleStoreId
stuffSearchParams.pageNo = startRow
stuffSearchParams.pageSize = 1 * e.target.value
setPageSize(e.target.value) setPageSize(e.target.value)
setStuffSearch({ setStuffSearch({
...stuffSearch, ...stuffSearch,
code: 'S', code: 'S',
startRow: startRow, startRow: startRow,
endRow: stuffSearchParams.pageNo * e.target.value, endRow: 1 * e.target.value,
pageSize: e.target.value, pageSize: e.target.value,
}) })
setPageNo(1) setPageNo(1)
// const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
// get({ url: apiUrl }).then((res) => {
// if (!isEmptyArray(res)) {
// setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
// setTotalCount(res[0].totCnt)
// } else {
// setGridProps({ ...gridProps, gridData: [], count: 0 })
// setTotalCount(0)
// }
// })
} }
// //
@ -310,16 +330,6 @@ export default function Stuff() {
}) })
setPageNo(1) setPageNo(1)
// const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
// get({ url: apiUrl }).then((res) => {
// if (!isEmptyArray(res)) {
// setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
// setTotalCount(res[0].totCnt)
// } else {
// setGridProps({ ...gridProps, gridData: [], count: 0 })
// setTotalCount(0)
// }
// })
} }
useEffect(() => { useEffect(() => {

View File

@ -1337,7 +1337,7 @@ export default function StuffDetail() {
} else { } else {
await promisePost({ url: apiUrl, data: params }).then((res) => { await promisePost({ url: apiUrl, data: params }).then((res) => {
if (res.status === 201) { if (res.status === 201) {
alert(getMessage('stuff.detail.save')) alert(getMessage('stuff.detail.tempSave.message1'))
router.push(`/management/stuff/tempdetail?objectNo=${res.data.objectNo.toString()}`, { scroll: false }) router.push(`/management/stuff/tempdetail?objectNo=${res.data.objectNo.toString()}`, { scroll: false })
} }
}) })
@ -1346,7 +1346,6 @@ export default function StuffDetail() {
// //
const onDelete = () => { const onDelete = () => {
// console.log(':::::', stuffSearchParams)
const specificationConfirmDate = managementState.specificationConfirmDate const specificationConfirmDate = managementState.specificationConfirmDate
if (specificationConfirmDate != null) { if (specificationConfirmDate != null) {
alert(getMessage('stuff.detail.delete.message1')) alert(getMessage('stuff.detail.delete.message1'))
@ -1354,12 +1353,11 @@ export default function StuffDetail() {
if (confirm(getMessage('common.message.data.delete'))) { if (confirm(getMessage('common.message.data.delete'))) {
del({ url: `/api/object/${objectNo}` }).then(() => { del({ url: `/api/object/${objectNo}` }).then(() => {
setFloorPlanObjectNo({ floorPlanObjectNo: '' }) setFloorPlanObjectNo({ floorPlanObjectNo: '' })
// console.log('::::::::::') if (session.storeId === 'T01') {
// resetStuffRecoil() stuffSearchParams.code = 'DELETE'
// stuffSearchParams.code = 'DELETE' } else {
// stuffSearchParams.schSelSaleStoreId = '' resetStuffRecoil()
// stuffSearchParams.schOtherSelSaleStoreId = '' }
// console.log(' ')
router.push('/management/stuff') router.push('/management/stuff')
}) })
} }

View File

@ -360,15 +360,51 @@ export default function StuffSearchCondition() {
} }
useEffect(() => { useEffect(() => {
setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')) if (session?.storeId === 'T01') {
setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD')) if (stuffSearch.code === 'DELETE') {
setObjectNo(stuffSearch.schObjectNo ? stuffSearch.schObjectNo : objectNo) setObjectNo('')
setSaleStoreName(stuffSearch.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName) setSaleStoreName('')
setAddress(stuffSearch.schAddress ? stuffSearch.schAddress : address) setAddress('')
setobjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName) setobjectName('')
setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName) setDispCompanyName('')
setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser) setReceiveUser('')
setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType) objectNoRef.current.value = ''
saleStoreNameRef.current.value = ''
addressRef.current.value = ''
objectNameRef.current.value = ''
dispCompanyNameRef.current.value = ''
receiveUserRef.current.value = ''
stuffSearch.schObjectNo = ''
stuffSearch.schAddress = ''
stuffSearch.schObjectName = ''
stuffSearch.schSaleStoreName = ''
stuffSearch.schReceiveUser = ''
stuffSearch.schDispCompanyName = ''
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.schSelSaleStoreId = ''
stuffSearch.schOtherSelSaleStoreId = ''
stuffSearch.schSortType = 'R'
stuffSearch.pageNo = 1
stuffSearch.pageSize = '100'
setSchSelSaleStoreId('')
setOtherSaleStoreId('')
}
} else {
setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD'))
setObjectNo(stuffSearch.schObjectNo ? stuffSearch.schObjectNo : objectNo)
setSaleStoreName(stuffSearch.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName)
setAddress(stuffSearch.schAddress ? stuffSearch.schAddress : address)
setobjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName)
setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
}
}, [stuffSearch]) }, [stuffSearch])
useEffect(() => { useEffect(() => {

View File

@ -27,8 +27,10 @@ export default function StuffSubHeader({ type }) {
const param = { const param = {
pid: '1', pid: '1',
objectNo: objectNo,
} }
const url = `/floor-plan?${queryStringFormatter(param)}` const url = `/floor-plan?${queryStringFormatter(param)}`
router.push(url) router.push(url)
} }