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
黄庭坚
jinfa-platform
Commits
670ebc98
Commit
670ebc98
authored
May 31, 2021
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
5a401e27
54ff1045
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
index.tsx
src/pages/logistics/addLogistics/index.tsx
+20
-1
No files found.
src/pages/logistics/addLogistics/index.tsx
View file @
670ebc98
...
...
@@ -376,6 +376,25 @@ const AddLogistics: React.FC<{}> = () => {
return
new
Promise
(
resolve
=>
{
switch
(
Number
(
createType
))
{
case
1
:
if
(
query
.
shipmentOrderId
)
{
PublicApi
.
getWarehouseInvoicesProductList
({
...
params
,
invoicesId
:
query
.
shipmentOrderId
}).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
res
.
data
.
data
.
forEach
(
item
=>
{
item
.
category
=
item
.
categoryName
item
.
brand
=
item
.
brandName
item
.
unit
=
item
.
unitName
})
resolve
(
res
.
data
)
}
})
}
else
{
PublicApi
.
getOrderProcurementOrderProductList
({
...
params
,
id
:
query
.
relevanceOrderId
,
orderNo
:
query
.
relevanceOrderCode
}).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
)
}
})
}
break
;
case
2
:
PublicApi
.
getWarehouseInvoicesProductList
({
...
params
,
invoicesId
:
query
.
shipmentOrderId
?
query
.
shipmentOrderId
:
query
.
relevanceOrderId
}).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -771,7 +790,7 @@ const AddLogistics: React.FC<{}> = () => {
<
div
>
{
query
.
receiverFullAddress
}
</
div
>
</
Form
.
Item
>
<
Form
.
Item
label=
"发货地址"
name=
"shipperAddressId"
rules=
{
[{
required
:
true
,
message
:
'请选择发货地址'
}]
}
>
<
Select
allowClear
onChange=
{
(
value
,
option
)
=>
handleSelectAddress
(
option
)
}
>
<
Select
allowClear
onChange=
{
(
value
,
option
)
=>
handleSelectAddress
(
option
)
}
>
{
listShipperAddress
.
map
((
item
:
any
,
idx
:
number
)
=>
(
<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
shipperName=
{
item
.
shipperName
}
shipperPhone=
{
item
.
phone
}
>
{
item
.
fullAddress
}
</
Option
>
...
...
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