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
e9d4cebb
Commit
e9d4cebb
authored
Dec 11, 2020
by
FE-安焕焕
👣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复导出数据问题
parent
65508d62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
env.config.js
config/env.config.js
+1
-1
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+10
-5
No files found.
config/env.config.js
View file @
e9d4cebb
...
@@ -9,7 +9,7 @@ let envAPi = {
...
@@ -9,7 +9,7 @@ let envAPi = {
let
prodApi
=
{
let
prodApi
=
{
api
:
'
//backstms.q-gp.com
'
,
api
:
'
//backstms.q-gp.com
'
,
kdspApi
:
'
//kdsp-op
eration
.q-gp.com
'
,
kdspApi
:
'
//kdsp-op.q-gp.com
'
,
};
};
let
exportApi
;
let
exportApi
;
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
e9d4cebb
...
@@ -2,6 +2,7 @@ import { Button, Upload, notification } from 'antd';
...
@@ -2,6 +2,7 @@ import { Button, Upload, 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
'
;
import
{
FormInstance
}
from
'
antd/lib/form
'
;
import
LogisticsForm
from
'
./components/LogisticsForm
'
;
import
LogisticsForm
from
'
./components/LogisticsForm
'
;
import
style
from
'
./styles.less
'
;
import
style
from
'
./styles.less
'
;
import
{
import
{
...
@@ -19,10 +20,10 @@ const TableList = props => {
...
@@ -19,10 +20,10 @@ const TableList = props => {
const
[
LogisticsModalVisible
,
handleModalVisible
]
=
useState
(
false
);
const
[
LogisticsModalVisible
,
handleModalVisible
]
=
useState
(
false
);
const
[
skuList
,
setSkuList
]
=
useState
([]);
const
[
skuList
,
setSkuList
]
=
useState
([]);
const
[
LogisticsData
,
setLogisticsData
]
=
useState
([{}]);
const
[
LogisticsData
,
setLogisticsData
]
=
useState
([{}]);
const
[
QueryData
,
setQueryData
]
=
useState
({});
const
[
ShowUpdateBtn
]
=
useState
([
2
,
5
]);
const
[
ShowUpdateBtn
]
=
useState
([
2
,
5
]);
const
actionRef
=
useRef
();
const
actionRef
=
useRef
();
const
ref
=
useRef
(
FormInstance
);
const
renderContent
=
(
record
,
key
)
=>
const
renderContent
=
(
record
,
key
)
=>
record
.
mchOrderSkuVoList
.
map
((
item
,
index
)
=>
(
record
.
mchOrderSkuVoList
.
map
((
item
,
index
)
=>
(
<
p
<
p
...
@@ -180,7 +181,9 @@ const TableList = props => {
...
@@ -180,7 +181,9 @@ const TableList = props => {
const
data
=
await
getLogistics
(
record
?.
orderId
);
const
data
=
await
getLogistics
(
record
?.
orderId
);
logisticsData
=
data
.
map
(
item
=>
({
logisticsData
=
data
.
map
(
item
=>
({
selectedGoods
:
item
?.
skus
?.
map
(
sku
=>
sku
?.
orderSkuId
),
selectedGoods
:
item
?.
skus
?.
map
(
sku
=>
sku
?.
orderSkuId
),
selectedCompany
:
`${item?.expressCompanyCode}-${item?.expressCompanyName}`
,
selectedCompany
:
item
.
expressCompanyCode
?
`${item?.expressCompanyCode}-${item?.expressCompanyName}`
:
null
,
orderNum
:
item
?.
deliveryNo
,
orderNum
:
item
?.
deliveryNo
,
}));
}));
setLogisticsData
(
logisticsData
);
setLogisticsData
(
logisticsData
);
...
@@ -231,7 +234,6 @@ const TableList = props => {
...
@@ -231,7 +234,6 @@ const TableList = props => {
pageNo
:
params
.
current
,
pageNo
:
params
.
current
,
pageSize
:
params
.
pageSize
||
20
,
pageSize
:
params
.
pageSize
||
20
,
};
};
setQueryData
(
transformedParam
);
return
queryToSend
(
transformedParam
);
return
queryToSend
(
transformedParam
);
};
};
const
searchRender
=
({
searchText
,
resetText
},
{
form
})
=>
{
const
searchRender
=
({
searchText
,
resetText
},
{
form
})
=>
{
...
@@ -268,7 +270,6 @@ const TableList = props => {
...
@@ -268,7 +270,6 @@ const TableList = props => {
onClick=
{
()
=>
{
onClick=
{
()
=>
{
// eslint-disable-next-line no-unused-expressions
// eslint-disable-next-line no-unused-expressions
form
?.
resetFields
();
form
?.
resetFields
();
setQueryData
({
logisticsStatus
:
props
.
type
||
1
});
}
}
}
}
>
>
{
resetText
}
{
resetText
}
...
@@ -281,7 +282,10 @@ const TableList = props => {
...
@@ -281,7 +282,10 @@ const TableList = props => {
<
Button
<
Button
type=
"primary"
type=
"primary"
onClick=
{
()
=>
{
onClick=
{
()
=>
{
downOrder
(
QueryData
);
if
(
ref
.
current
)
{
const
obj
=
{
...
ref
.
current
.
getFieldsValue
(),
logisticsStatus
:
props
.
type
||
1
};
downOrder
(
obj
);
}
}
}
}
}
>
>
导出数据
导出数据
...
@@ -295,6 +299,7 @@ const TableList = props => {
...
@@ -295,6 +299,7 @@ const TableList = props => {
request=
{
params
=>
queryToSendFn
({
...
params
})
}
request=
{
params
=>
queryToSendFn
({
...
params
})
}
columns=
{
columns
}
columns=
{
columns
}
rowKey=
{
r
=>
r
.
orderId
}
rowKey=
{
r
=>
r
.
orderId
}
formRef=
{
ref
}
toolBarRender=
{
toolBarRenderFn
}
toolBarRender=
{
toolBarRenderFn
}
search=
{
{
search=
{
{
collapsed
:
false
,
collapsed
:
false
,
...
...
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