Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
This commit is contained in:
commit
228a6e7548
@ -116,8 +116,10 @@ export default function StuffSearchCondition() {
|
|||||||
schAddress: address,
|
schAddress: address,
|
||||||
schObjectName: objectName,
|
schObjectName: objectName,
|
||||||
schDispCompanyName: dispCompanyName,
|
schDispCompanyName: dispCompanyName,
|
||||||
schSelSaleStoreId: stuffSearch?.schSelSaleStoreId,
|
// schSelSaleStoreId: stuffSearch?.schSelSaleStoreId,
|
||||||
schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId,
|
// schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId,
|
||||||
|
schSelSaleStoreId: schSelSaleStoreId,
|
||||||
|
schOtherSelSaleStoreId: otherSaleStoreId,
|
||||||
schReceiveUser: receiveUser,
|
schReceiveUser: receiveUser,
|
||||||
schDateType: dateType,
|
schDateType: dateType,
|
||||||
schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
|
schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
|
||||||
@ -157,6 +159,7 @@ export default function StuffSearchCondition() {
|
|||||||
setStuffSearch({
|
setStuffSearch({
|
||||||
schSelSaleStoreId: '',
|
schSelSaleStoreId: '',
|
||||||
schOtherSelSaleStoreId: '',
|
schOtherSelSaleStoreId: '',
|
||||||
|
schDateType: 'U',
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
if (otherSaleStoreList.length > 1) {
|
if (otherSaleStoreList.length > 1) {
|
||||||
@ -356,6 +359,7 @@ export default function StuffSearchCondition() {
|
|||||||
setobjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName)
|
setobjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName)
|
||||||
setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
|
setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
|
||||||
setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
|
setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
|
||||||
|
setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
|
||||||
}, [stuffSearch])
|
}, [stuffSearch])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -637,7 +641,7 @@ export default function StuffSearchCondition() {
|
|||||||
type="radio"
|
type="radio"
|
||||||
name="radio_ptype"
|
name="radio_ptype"
|
||||||
id="radio_u"
|
id="radio_u"
|
||||||
checked={stuffSearch.schDateType === 'U' ? true : false}
|
checked={dateType === 'U' ? true : false}
|
||||||
value={'U'}
|
value={'U'}
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
setDateType(e.target.value)
|
setDateType(e.target.value)
|
||||||
@ -651,7 +655,7 @@ export default function StuffSearchCondition() {
|
|||||||
type="radio"
|
type="radio"
|
||||||
name="radio_ptype"
|
name="radio_ptype"
|
||||||
id="radio_r"
|
id="radio_r"
|
||||||
checked={stuffSearch.schDateType === 'R' ? true : false}
|
checked={dateType === 'R' ? true : false}
|
||||||
value={'R'}
|
value={'R'}
|
||||||
onChange={(e) => {
|
onChange={(e) => {
|
||||||
setDateType(e.target.value)
|
setDateType(e.target.value)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user