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
55de114a
Commit
55de114a
authored
Nov 26, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
c711bfef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
index.tsx
src/pages/transaction/components/orderSaleRecord/index.tsx
+2
-2
index.tsx
...action/saleOrder/readyConfirmReturnOrder/detail/index.tsx
+9
-5
No files found.
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @
55de114a
...
...
@@ -340,8 +340,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
dataSource=
{
orderDeliveryDetailsResponses
}
/>
<
Space
style=
{
{
marginTop
:
18
,
display
:
"flex"
,
justifyContent
:
"flex-end"
}
}
>
<
Button
onClick=
{
handelReciveReturnOrder
}
>
确认本单全部发货单已收到回单
</
Button
>
<
Button
onClick=
{
handleContinueDeliver
}
>
继续发货
</
Button
>
<
Button
type=
"primary"
onClick=
{
handelReciveReturnOrder
}
>
确认本单全部发货单已收到回单
</
Button
>
<
Button
type=
"primary"
onClick=
{
handleContinueDeliver
}
>
继续发货
</
Button
>
</
Space
>
</
Tabs
.
TabPane
>
}
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/detail/index.tsx
View file @
55de114a
...
...
@@ -31,11 +31,15 @@ const ReadyConfirmReturnOrderDetail: React.FC = () => {
return
(
<
div
>
<
OrderDetailContext
.
Provider
value=
{
formContext
}
>
<
OrderDetailHeader
detailList=
{
detailList
}
detailData=
{
formContext
.
data
}
extraRight=
{
<
Button
type=
'primary'
onClick=
{
handleSubmit
}
loading=
{
loading
}
>
确认全部已回单
</
Button
>
}
/>
<
OrderDetailHeader
detailList=
{
detailList
}
detailData=
{
formContext
.
data
}
// extraRight={
// <Button type='primary' onClick={handleSubmit} loading={loading}>
// 确认全部已回单
// </Button>
// }
/>
<
OrderDetailWrapper
>
<
PreLoading
loading=
{
!
formContext
.
data
}
active
paragraph=
{
{
rows
:
6
}
}
>
...
...
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