This commit is contained in:
basssy 2024-12-06 16:53:31 +09:00
parent a2bf337b75
commit 97c86e2969
3 changed files with 58 additions and 8 deletions

View File

@ -261,6 +261,7 @@ export default function Stuff() {
fetchData()
} else if (stuffSearchParams?.code === 'C') {
resetStuffRecoil()
setIsGlobalLoading(false)
} else if (stuffSearchParams?.code === 'FINISH') {
stuffSearchParams.startRow = 1
stuffSearchParams.endRow = 1 * pageSize
@ -278,6 +279,7 @@ export default function Stuff() {
setTotalCount(0)
}
})
setIsGlobalLoading(false)
}
fetchData()
} else if (stuffSearchParams?.code === 'DELETE') {
@ -305,6 +307,11 @@ export default function Stuff() {
setStuffSearch({
...newParams,
})
setIsGlobalLoading(false)
} else {
stuffSearchParams.code = 'DELETE'
setIsGlobalLoading(false)
}
}, [stuffSearchParams])

View File

@ -7,7 +7,7 @@ import Select, { components } from 'react-select'
import Link from 'next/link'
import { useAxios } from '@/hooks/useAxios'
import { globalLocaleStore } from '@/store/localeAtom'
import { isEmptyArray, isNotEmptyArray, isObjectNotEmpty } from '@/util/common-utils'
import { isEmptyArray, isNotEmptyArray, isObjectNotEmpty, queryStringFormatter } from '@/util/common-utils'
import { useMessage } from '@/hooks/useMessage'
import { useForm } from 'react-hook-form'
import { useRecoilValue, useSetRecoilState, useResetRecoilState, useRecoilState } from 'recoil'
@ -1395,11 +1395,14 @@ export default function StuffDetail() {
//
const onDelete = () => {
const specificationConfirmDate = managementState.specificationConfirmDate
const delParams = {
userId: session.userId,
}
if (specificationConfirmDate != null) {
alert(getMessage('stuff.detail.delete.message1'))
} else {
if (confirm(getMessage('common.message.data.delete'))) {
del({ url: `/api/object/${objectNo}` }).then(() => {
del({ url: `/api/object/${objectNo}?${queryStringFormatter(delParams)}` }).then(() => {
setFloorPlanObjectNo({ floorPlanObjectNo: '' })
if (session.storeId === 'T01') {
stuffSearchParams.code = 'DELETE'
@ -1418,6 +1421,11 @@ export default function StuffDetail() {
input.value = input.value.replace(/[^0-9]/g, '')
}
const handleBlur = (e) => {
let input = e.target
input.value = input.value.replace(/[^0-9]/g, '')
}
// ..
const NoOptionsMessage = (props) => {
return (
@ -1805,7 +1813,8 @@ export default function StuffDetail() {
<input
type="text"
className="input-light"
onKeyUp={handleKeyUp}
onInput={handleKeyUp}
onBlur={handleBlur}
value={form.watch('verticalSnowCover') || ''}
{...register('verticalSnowCover')}
/>
@ -1872,7 +1881,8 @@ export default function StuffDetail() {
<input
type="text"
className="input-light"
onKeyUp={handleKeyUp}
onInput={handleKeyUp}
onBlur={handleBlur}
value={form.watch('installHeight') || ''}
{...register('installHeight')}
/>
@ -2327,7 +2337,8 @@ export default function StuffDetail() {
<input
type="text"
className="input-light"
onKeyUp={handleKeyUp}
onInput={handleKeyUp}
onBlur={handleBlur}
value={form.watch('verticalSnowCover') || ''}
{...register('verticalSnowCover')}
/>
@ -2399,7 +2410,8 @@ export default function StuffDetail() {
<input
type="text"
className="input-light"
onKeyUp={handleKeyUp}
onInput={handleKeyUp}
onBlur={handleBlur}
value={form.watch('installHeight') || ''}
{...register('installHeight')}
/>

View File

@ -83,7 +83,6 @@ export default function StuffSearchCondition() {
}
setIsGlobalLoading(true)
if (stuffSearch.code === 'S') {
if (stuffSearch.pageNo !== 1) {
setStuffSearch({
@ -254,6 +253,7 @@ export default function StuffSearchCondition() {
//
const resetRecoil = () => {
setIsGlobalLoading(false)
//T01
objectNoRef.current.value = ''
saleStoreNameRef.current.value = ''
@ -513,7 +513,6 @@ export default function StuffSearchCondition() {
}
useEffect(() => {
//X42
if (session?.storeId === 'T01') {
if (stuffSearch.code === 'DELETE') {
setObjectNo('')
@ -545,6 +544,38 @@ export default function StuffSearchCondition() {
stuffSearch.pageNo = 1
stuffSearch.pageSize = 100
setSchSelSaleStoreId('')
setOtherSaleStoreId('')
} else {
setObjectNo('')
setSaleStoreName('')
setAddress('')
setobjectName('')
setDispCompanyName('')
setReceiveUser('')
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('')
}