Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
5893423e
Commit
5893423e
authored
Apr 15, 2022
by
rainbowmorel@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改一些细节bug
parent
d9b780b4
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
72 additions
and
15 deletions
+72
-15
AddressDrawer.tsx
src/components/AddressDrawer/AddressDrawer.tsx
+7
-1
AddressForm.tsx
src/components/AddressDrawer/AddressForm.tsx
+8
-2
index.tsx
src/components/AddressDrawer/index.tsx
+8
-0
DeliveryNoticeOrder.ts
src/pages/order/assets/handles/DeliveryNoticeOrder.ts
+3
-3
HandleFormSubmit.ts
src/pages/order/assets/handles/HandleFormSubmit.ts
+2
-2
DeliveryGoodTableSelect.tsx
...nents/DeliveryGoodTableSelect/DeliveryGoodTableSelect.tsx
+6
-5
DeliveryGoodTableSelectB2B.tsx
...ts/DeliveryGoodTableSelect/DeliveryGoodTableSelectB2B.tsx
+17
-0
DeliveryGoodTableSelectSRM.tsx
...ts/DeliveryGoodTableSelect/DeliveryGoodTableSelectSRM.tsx
+17
-0
add.tsx
src/pages/order/deliveryNotice/manageB2B/add.tsx
+2
-1
add.tsx
src/pages/order/deliveryNotice/manageSRM/add.tsx
+2
-1
No files found.
src/components/AddressDrawer/AddressDrawer.tsx
View file @
5893423e
...
...
@@ -35,6 +35,10 @@ interface AddressDrawerProps {
rows
?:
number
showDefault
?:
boolean
formatValue
?:
(
value
)
=>
string
title
:
{
name
:
string
,
label
:
string
}
}
function
AddressDrawer
(
props
:
AddressDrawerProps
)
{
...
...
@@ -44,7 +48,8 @@ function AddressDrawer(props: AddressDrawerProps) {
showDefault
=
false
,
formatValue
=
(
addr
)
=>
{
return
`
${
addr
?.
fullAddress
??
''
}
$
{
addr
?.
shipperName
?
addr
?.
shipperName
??
''
:
addr
?.
receiverName
??
''
}
$
{
addr
?.
phone
??
''
}
`
}
},
title
} = props;
const [visible, setVisible] = useState<boolean>(false);
...
...
@@ -127,6 +132,7 @@ function AddressDrawer(props: AddressDrawerProps) {
return renderForm ?
renderForm :
<AddressForm
title={title}
form={addrForm} />
}
...
...
src/components/AddressDrawer/AddressForm.tsx
View file @
5893423e
...
...
@@ -7,11 +7,17 @@ import AreaSet from './AreaSet';
const
FormItem
=
Form
.
Item
;
interface
addrFormProps
{
form
?:
FormInstance
form
?:
FormInstance
,
title
:
{
name
:
string
,
label
:
string
}
}
function
AddressForm
(
props
:
addrFormProps
)
{
const
{
title
}
=
props
;
const
[
selfForm
]
=
Form
.
useForm
(
props
.
form
)
const
[
province
,
setProvince
]
=
useState
([]);
const
[
city
,
setCity
]
=
useState
([])
...
...
@@ -106,7 +112,7 @@ function AddressForm(props: addrFormProps) {
<
Input
type=
"hidden"
/>
</
FormItem
>
<
FormItem
label=
"收货人"
name=
"shipperName"
rules=
{
[
<
FormItem
label=
{
title
.
label
}
name=
{
title
.
name
}
rules=
{
[
{
required
:
true
}
]
}
>
<
Input
/>
...
...
src/components/AddressDrawer/index.tsx
View file @
5893423e
...
...
@@ -6,6 +6,10 @@ export { default as AddressDrawer } from './AddressDrawer'
export
const
ReceiverAddress
=
(
props
)
=>
{
return
(
<
AddressDrawer
title=
{
{
label
:
'收货人'
,
name
:
'receiverName'
}
}
{
...
props
}
addressListRequest=
{
(
val
)
=>
{
return
getLogisticsSelectListReceiverAddress
(
val
)
...
...
@@ -28,6 +32,10 @@ export const ReceiverAddress = (props) => {
export
const
ShipperAddress
=
(
props
)
=>
{
return
(
<
AddressDrawer
title=
{
{
label
:
'发货人'
,
name
:
'shipperName'
}
}
{
...
props
}
addressListRequest=
{
(
val
)
=>
{
return
getLogisticsSelectListShipperAddress
(
val
)
...
...
src/pages/order/assets/handles/DeliveryNoticeOrder.ts
View file @
5893423e
...
...
@@ -11,14 +11,14 @@ class DeliveryNoticeOrder {
})
}
getOrderDeliveryPlanOrderProductPage
(
form
:
FormInstance
,
current
:
number
=
1
)
{
getOrderDeliveryPlanOrderProductPage
(
form
:
FormInstance
,
current
:
number
=
1
,
orderType
=
1
)
{
let
fields
=
form
.
getFieldsValue
();
console
.
log
(
fields
)
let
payload
:
any
=
{
memberId
:
fields
.
member
?.
buyerMemberId
,
roleId
:
fields
.
member
?.
buyerRoleId
,
roleType
:
fields
.
member
?.
roleType
,
orderType
:
2
,
orderType
:
orderType
,
current
:
current
,
pageSize
:
10
,
}
...
...
src/pages/order/assets/handles/HandleFormSubmit.ts
View file @
5893423e
...
...
@@ -107,9 +107,9 @@ export class HandleFormSubmit {
},
executorVO: {
...data?.executorVO,
receiverName: data?.executorVO?.consignee,
fullAddress: data?.executorVO?.provinceName ?? '' + data?.executorVO?.cityName ?? '' + data?.executorVO?.districtName ?? '' + data?.executorVO?.streetName ?? ''
},
"executorVO.consignee": data?.executorVO?.consignee,
"executorVO.phone": data?.executorVO?.phone,
sendTime: data?.sendTime ? moment(data?.sendTime) : moment().startOf('day'),
"executorVO.carNumbers": data?.executorVO?.carNumbers,
...
...
@@ -119,10 +119,10 @@ export class HandleFormSubmit {
label: data?.logisticsCompany,
value: data?.logisticsCompanyId
},
deliveryType: data?.deliveryType,
outerHistoryList: data?.outerHistoryList,
deliveryNo: data?.deliveryNo
}
console.log(formField);
return formField
}
...
...
src/pages/order/components/DeliveryGoodTableSelect/DeliveryGoodTableSelect.tsx
View file @
5893423e
...
...
@@ -11,6 +11,7 @@ interface DeliveryGoodTableModalProps {
form
:
FormInstance
onChange
:
(
value
)
=>
void
disabled
?:
boolean
orderType
?:
number
}
/**
...
...
@@ -20,7 +21,7 @@ interface DeliveryGoodTableModalProps {
*/
function
DeliveryGoodTableModal
(
props
:
DeliveryGoodTableModalProps
)
{
const
{
onChange
,
form
,
disabled
}
=
props
;
const
{
onChange
,
form
,
disabled
,
orderType
}
=
props
;
const
[
visible
,
setVisible
]
=
useState
(
false
)
const
service
=
DeliveryNoticeOrderFactory
.
getInstance
()
...
...
@@ -41,7 +42,7 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
},
[
visible
])
useEffect
(()
=>
{
service
.
getOrderDeliveryPlanOrderProductPage
(
form
).
then
(
handleResponseHttp
)
service
.
getOrderDeliveryPlanOrderProductPage
(
form
,
1
,
orderType
).
then
(
handleResponseHttp
)
},
[
visible
])
const
handleResponseHttp
=
res
=>
{
...
...
@@ -75,7 +76,7 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
row=
{
data
.
id
}
dataSource=
{
combination
}
onChange=
{
(
keys
,
index
)
=>
{
console
.
log
(
'keys,index :>> '
,
keys
,
index
);
console
.
log
(
'keys,index :>> '
,
keys
,
index
);
selectedRowKeys
.
set
(
index
,
keys
);
}
}
/>
...
...
@@ -87,7 +88,7 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
{
!
disabled
&&
<
div
className=
'mt-16'
>
<
Button
onClick=
{
handleVisible
}
icon=
{
<
PlusOutlined
/>
}
style=
{
{
width
:
'100%'
}
}
></
Button
>
<
Button
onClick=
{
handleVisible
}
icon=
{
<
PlusOutlined
/>
}
style=
{
{
width
:
'100%'
}
}
></
Button
>
</
div
>
}
...
...
@@ -121,7 +122,7 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
}
<
Pagination
className=
"mt-16"
total=
{
total
}
onChange=
{
(
page
:
number
)
=>
{
service
.
getOrderDeliveryPlanOrderProductPage
(
form
,
page
).
then
(
handleResponseHttp
)
service
.
getOrderDeliveryPlanOrderProductPage
(
form
,
page
,
orderType
).
then
(
handleResponseHttp
)
}
}
/>
</
Drawer
>
...
...
src/pages/order/components/DeliveryGoodTableSelect/DeliveryGoodTableSelectB2B.tsx
0 → 100644
View file @
5893423e
import
{
FormInstance
}
from
"antd"
;
import
DeliveryGoodTableSelect
from
"./DeliveryGoodTableSelect"
;
interface
DeliveryGoodTableModalProps
{
form
:
FormInstance
onChange
:
(
value
)
=>
void
disabled
?:
boolean
}
function
DeliveryGoodTableSelectB2B
(
props
:
DeliveryGoodTableModalProps
)
{
return
(
<
DeliveryGoodTableSelect
{
...
props
}
orderType=
{
1
}
/>
)
}
export
default
DeliveryGoodTableSelectB2B
;
\ No newline at end of file
src/pages/order/components/DeliveryGoodTableSelect/DeliveryGoodTableSelectSRM.tsx
0 → 100644
View file @
5893423e
import
{
FormInstance
}
from
"antd"
;
import
DeliveryGoodTableSelect
from
"./DeliveryGoodTableSelect"
;
interface
DeliveryGoodTableModalProps
{
form
:
FormInstance
onChange
:
(
value
)
=>
void
disabled
?:
boolean
}
function
DeliveryGoodTableSelectSRM
(
props
:
DeliveryGoodTableModalProps
)
{
return
(
<
DeliveryGoodTableSelect
{
...
props
}
orderType=
{
2
}
/>
)
}
export
default
DeliveryGoodTableSelectSRM
;
\ No newline at end of file
src/pages/order/deliveryNotice/manageB2B/add.tsx
View file @
5893423e
...
...
@@ -21,6 +21,7 @@ import LogisticsCompanyMerchantsSelect from '@/components/LogisticsCompanySelect
import
{
DeliveryNumColumn
,
OrderNumColumn
}
from
'../../constants/table-column'
;
import
moment
from
'moment'
;
import
{
addrFormatValue
}
from
'../../assets/format/addrValue'
;
import
DeliveryGoodTableSelectB2B
from
'../../components/DeliveryGoodTableSelect/DeliveryGoodTableSelectB2B'
;
const
DeliveryNoticeManageSRMDetails
:
React
.
FC
=
()
=>
{
...
...
@@ -226,7 +227,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<
ContentBox
title=
{
DeliveryGood
.
name
}
id=
{
DeliveryGood
.
key
}
cols=
{
1
}
>
{
/* 在编辑的时候不需要进行此操作 */
}
<
DeliveryGoodTableSelect
<
DeliveryGoodTableSelect
B2B
form=
{
form
}
onChange=
{
(
value
)
=>
{
if
(
value
.
length
>
0
)
{
...
...
src/pages/order/deliveryNotice/manageSRM/add.tsx
View file @
5893423e
...
...
@@ -24,6 +24,7 @@ import LogisticsCompanyMerchantsSelect from '@/components/LogisticsCompanySelect
import
{
values
}
from
'lodash'
;
import
{
DeliveryNumColumn
,
OrderNumColumn
}
from
'../../constants/table-column'
;
import
{
addrFormatValue
}
from
'../../assets/format/addrValue'
;
import
DeliveryGoodTableSelectSRM
from
'../../components/DeliveryGoodTableSelect/DeliveryGoodTableSelectSRM'
;
const
ContentBoxItem
=
ContentBox
.
BaseInfoItem
;
...
...
@@ -220,7 +221,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<
ContentBox
title=
{
DeliveryGood
.
name
}
id=
{
DeliveryGood
.
key
}
cols=
{
1
}
>
{
/* 在编辑的时候不需要进行此操作 */
}
<
DeliveryGoodTableSelect
<
DeliveryGoodTableSelect
SRM
form=
{
form
}
onChange=
{
(
value
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment