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
916fcbcd
Commit
916fcbcd
authored
May 07, 2022
by
许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20418order' into 'v2-220418'
自定义选择地址默认值修复 与 通知单还有协同过来的 See merge request linkseeks-design/pro-platform!636
parents
4b61bbdb
cf8d8e66
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
9 deletions
+20
-9
AddressDrawer.tsx
src/components/AddressDrawer/AddressDrawer.tsx
+12
-6
add.tsx
src/pages/order/deliveryNotice/create/add.tsx
+4
-2
add.tsx
src/pages/order/deliveryNotice/manageB2B/add.tsx
+1
-0
add.tsx
src/pages/order/deliveryNotice/manageSRM/add.tsx
+1
-0
index.tsx
...liveryNoticeManagement/deliveryNoticeFromCreate/index.tsx
+2
-1
No files found.
src/components/AddressDrawer/AddressDrawer.tsx
View file @
916fcbcd
...
...
@@ -44,19 +44,23 @@ interface AddressDrawerProps {
className
?:
string
renderText
?:
React
.
ReactNode
hiddenBtn
?:
boolean
formProps
?:
FormInstance
,
id
?:
string
}
function
AddressDrawer
(
props
:
AddressDrawerProps
)
{
const
{
onChange
,
formInstance
,
renderForm
,
sumbitRequest
,
addressListRequest
,
value
:
addr
,
disabled
=
false
,
rows
=
1
,
hiddenBtn
=
false
,
addressListRequest
,
value
:
addr
,
disabled
=
false
,
rows
=
1
,
hiddenBtn
=
false
,
showDefault
=
false
,
formatValue
=
(
addr
)
=>
{
return
FormatValue
(
addr
)
},
title
,
className
,
renderText
renderText
,
formProps
,
id
}
=
props
;
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
...
...
@@ -104,8 +108,10 @@ function AddressDrawer(props: AddressDrawerProps) {
}
else
if
(
showDefault
)
{
// 如果没有默认值,且设置了 showDefault
const
target
=
data
.
find
(
v
=>
v
.
isDefault
===
1
)
if
(
target
!=
undefined
)
{
onChange
(
target
)
if
(
target
!=
undefined
&&
formProps
!==
undefined
)
{
formProps
.
setFieldsValue
({
[
id
]:
target
})
}
}
...
...
@@ -180,7 +186,7 @@ function AddressDrawer(props: AddressDrawerProps) {
:
(
<
Row
className=
{
className
}
gutter=
{
10
}
>
<
Col
span=
{
hiddenBtn
?
24
:
20
}
>
<
Col
span=
{
hiddenBtn
?
24
:
20
}
>
<
Input
.
TextArea
rows=
{
rows
}
disabled=
{
disabled
}
value=
{
value
}
onChange=
{
handleInputChange
}
...
...
@@ -193,7 +199,7 @@ function AddressDrawer(props: AddressDrawerProps) {
</
Col
>
)
}
</
Row
>
)
}
...
...
src/pages/order/deliveryNotice/create/add.tsx
View file @
916fcbcd
...
...
@@ -170,6 +170,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
]
}
label=
{
BuyerLabel
}
name=
"member"
>
<
RoleSelect
formProp=
{
form
}
disabled=
{
true
}
formatFeils=
{
(
e
)
=>
{
return
{
...
...
@@ -189,7 +190,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
required
(
`${DeliveryDate}不能为空`
)
]
}
label=
{
DeliveryDate
}
name=
"deliveryTime"
>
<
DatePickerSelect
disabled=
{
true
}
defualtToday=
{
true
}
className=
'w-full'
/>
<
DatePickerSelect
formProp=
{
form
}
disabled=
{
true
}
defualtToday=
{
true
}
className=
'w-full'
/>
</
FormItem
>
<
FormItem
...
...
@@ -245,6 +246,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
]
}
label=
{
DeliverySlefAddrLabel
}
name=
"deliveryVO"
>
<
ShipperAddress
formProp=
{
form
}
showDefault=
{
true
}
onChange=
{
(
val
)
=>
{
form
.
setFieldsValue
({
...
...
@@ -284,7 +286,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</
FormItem
>
<
FormItem
hidden=
{
isLogistics
}
label=
{
LogisticsCompanyLabel
}
name=
"logisticsCompanyInt"
>
<
LogisticsCompanyMerchantsSelect
/>
<
LogisticsCompanyMerchantsSelect
formProp=
{
form
}
/>
</
FormItem
>
<
FormItem
...
...
src/pages/order/deliveryNotice/manageB2B/add.tsx
View file @
916fcbcd
...
...
@@ -215,6 +215,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
label=
{
DeliverySlefAddrLabel
}
name=
"deliveryVO"
>
<
ShipperAddress
formProp=
{
form
}
showDefault=
{
true
}
/>
...
...
src/pages/order/deliveryNotice/manageSRM/add.tsx
View file @
916fcbcd
...
...
@@ -199,6 +199,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
label=
{
DeliverySlefAddrLabel
}
name=
"deliveryVO"
>
<
ShipperAddress
formProp=
{
form
}
showDefault=
{
true
}
/>
...
...
src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx
View file @
916fcbcd
...
...
@@ -159,6 +159,7 @@ function DeliveryNoticeFromCreate() {
]
}
label=
{
BuyerLabel
}
name=
"member"
>
<
RoleSelect
formProp=
{
form
}
disabled=
{
true
}
formatFeils=
{
(
e
)
=>
{
return
{
...
...
@@ -260,7 +261,7 @@ function DeliveryNoticeFromCreate() {
<
Input
/>
</
FormItem
>
<
FormItem
hidden=
{
isLogistics
}
label=
{
LogisticsCompanyLabel
}
name=
"logisticsCompanyInt"
>
<
LogisticsCompanyMerchantsSelect
/>
<
LogisticsCompanyMerchantsSelect
formProp=
{
form
}
/>
</
FormItem
>
<
FormItem
hidden=
{
isLogistics
}
label=
{
LogisticsNoLabel
}
name=
"logisticsNo"
>
<
Input
/>
...
...
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