Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
db81af5e
Commit
db81af5e
authored
Dec 30, 2020
by
FE-安焕焕
👣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改问题
parent
d0a905f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
LogisticsCom.jsx
...erManage/pendingDeliveryOrder/components/LogisticsCom.jsx
+1
-1
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+6
-2
No files found.
src/pages/orderManage/pendingDeliveryOrder/components/LogisticsCom.jsx
View file @
db81af5e
...
@@ -59,7 +59,7 @@ const LogisticsCom = props => {
...
@@ -59,7 +59,7 @@ const LogisticsCom = props => {
return
(
return
(
<
Modal
<
Modal
destroyOnClose
destroyOnClose
title=
"
企业
物流信息"
title=
"物流信息"
visible=
{
modalVisible
}
visible=
{
modalVisible
}
onCancel=
{
()
=>
onCancel
()
}
onCancel=
{
()
=>
onCancel
()
}
onOk=
{
()
=>
onCancel
()
}
onOk=
{
()
=>
onCancel
()
}
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
db81af5e
import
{
Button
}
from
'
antd
'
;
import
{
Button
,
notification
}
from
'
antd
'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'
react
'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'
react
'
;
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
import
ProTable
from
'
@ant-design/pro-table
'
;
import
ProTable
from
'
@ant-design/pro-table
'
;
...
@@ -43,7 +43,7 @@ const TableList = props => {
...
@@ -43,7 +43,7 @@ const TableList = props => {
const
tempObj
=
{};
const
tempObj
=
{};
// eslint-disable-next-line no-unused-expressions
// eslint-disable-next-line no-unused-expressions
record
?.
mchOrderSkuVoList
?.
forEach
(
item
=>
{
record
?.
mchOrderSkuVoList
?.
forEach
(
item
=>
{
if
(
!
(
item
.
deliveryNo
in
tempObj
))
{
if
(
item
.
deliveryNo
&&
!
(
item
.
deliveryNo
in
tempObj
))
{
tempObj
[
item
.
deliveryNo
]
=
{
tempObj
[
item
.
deliveryNo
]
=
{
deliveryNo
:
item
.
deliveryNo
,
deliveryNo
:
item
.
deliveryNo
,
expressCompanyCode
:
item
.
expressCompanyCode
,
expressCompanyCode
:
item
.
expressCompanyCode
,
...
@@ -52,6 +52,10 @@ const TableList = props => {
...
@@ -52,6 +52,10 @@ const TableList = props => {
}
}
});
});
const
keys
=
Object
.
keys
(
tempObj
);
const
keys
=
Object
.
keys
(
tempObj
);
if
(
!
keys
.
length
)
{
notification
.
warning
({
message
:
'
暂无物流信息
'
});
return
;
}
const
firstObj
=
tempObj
[
keys
[
0
]];
const
firstObj
=
tempObj
[
keys
[
0
]];
const
data
=
await
getLogisticsInfo
(
firstObj
?.
expressCompanyCode
,
firstObj
?.
deliveryNo
);
const
data
=
await
getLogisticsInfo
(
firstObj
?.
expressCompanyCode
,
firstObj
?.
deliveryNo
);
tempObj
[
keys
[
0
]].
detailList
=
data
?.
logisticsList
?.[
0
]?.
detailList
||
[];
tempObj
[
keys
[
0
]].
detailList
=
data
?.
logisticsList
?.[
0
]?.
detailList
||
[];
...
...
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