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
linweijiong
jinfa-platform
Commits
c67d5578
Commit
c67d5578
authored
Jan 15, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
3ecd5790
f552279f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
index.tsx
src/pages/logistics/addLogistics/index.tsx
+3
-3
templateForm.tsx
src/pages/logistics/list/components/templateForm.tsx
+0
-0
No files found.
src/pages/logistics/addLogistics/index.tsx
View file @
c67d5578
...
...
@@ -393,21 +393,21 @@ const AddLogistics: React.FC<{}> = () => {
})
break
;
case
4
:
PublicApi
.
getAsReplaceGoodsPageReturnCommodityByLogistics
({
...
params
,
dataId
:
query
.
shipmentOrderId
?
query
.
shipmentOrderId
:
query
.
relevance
OrderId
}).
then
(
res
=>
{
PublicApi
.
getAsReplaceGoodsPageReturnCommodityByLogistics
({
...
params
,
dataId
:
query
.
relevanceOrderId
?
query
.
relevanceOrderId
:
query
.
shipment
OrderId
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
break
;
case
5
:
PublicApi
.
getAsReplaceGoodsPageReplaceCommodityByLogistics
({
...
params
,
dataId
:
query
.
shipmentOrderId
?
query
.
shipmentOrderId
:
query
.
relevance
OrderId
}).
then
(
res
=>
{
PublicApi
.
getAsReplaceGoodsPageReplaceCommodityByLogistics
({
...
params
,
dataId
:
query
.
relevanceOrderId
?
query
.
relevanceOrderId
:
query
.
shipment
OrderId
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
})
break
;
case
6
:
PublicApi
.
getAsReturnGoodsPageCommodityByLogistics
({
...
params
,
dataId
:
query
.
shipmentOrderId
?
query
.
shipmentOrderId
:
query
.
relevance
OrderId
}).
then
(
res
=>
{
PublicApi
.
getAsReturnGoodsPageCommodityByLogistics
({
...
params
,
dataId
:
query
.
relevanceOrderId
?
query
.
relevanceOrderId
:
query
.
shipment
OrderId
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
}
...
...
src/pages/logistics/list/components/templateForm.tsx
View file @
c67d5578
This diff is collapsed.
Click to expand it.
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