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
shenshaokai
jinfa-platform
Commits
5c7ad3c6
Commit
5c7ad3c6
authored
Oct 26, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:收发货状态表更
parent
25a4b51e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
index.tsx
src/pages/transaction/components/orderDeleveRecord/index.tsx
+2
-2
index.tsx
src/pages/transaction/components/orderSaleRecord/index.tsx
+2
-2
No files found.
src/pages/transaction/components/orderDeleveRecord/index.tsx
View file @
5c7ad3c6
...
@@ -219,8 +219,8 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
...
@@ -219,8 +219,8 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
key
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
render
:
(
text
,
record
)
=>
<>
{
/* todo 需根据内部状态判断显示哪个按钮 */
}
{
/* todo 需根据内部状态判断显示哪个按钮 */
}
{
!
isPreview
&&
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
CONFIRM_RECEIPT_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleReturn
(
record
)
}
>
确认回单
</
Button
>
}
{
!
isPreview
&&
!
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
CONFIRM_RECEIPT_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleReturn
(
record
)
}
>
确认回单
</
Button
>
}
{
!
isPreview
&&
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
WAREHOUSE_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleConfirm
(
record
)
}
>
确认收货
</
Button
>
}
{
!
isPreview
&&
!
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
WAREHOUSE_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleConfirm
(
record
)
}
>
确认收货
</
Button
>
}
</>
</>
},
},
]
]
...
...
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @
5c7ad3c6
...
@@ -216,8 +216,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
...
@@ -216,8 +216,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
align
:
'center'
,
align
:
'center'
,
key
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
render
:
(
text
,
record
)
=>
<>
{
!
isPreview
&&
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
CONFIRM_RECEIPT_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleReturn
(
record
)
}
>
确认回单
</
Button
>
}
{
!
isPreview
&&
!
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
CONFIRM_RECEIPT_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleReturn
(
record
)
}
>
确认回单
</
Button
>
}
{
!
isPreview
&&
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
ADD_LOGISTICS_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleConfirm
(
record
)
}
>
确认发货
</
Button
>
}
{
!
isPreview
&&
!
dataRef
.
current
.
includes
(
record
.
id
)
&&
record
.
interiorState
===
DeliverySideState
.
ADD_LOGISTICS_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleConfirm
(
record
)
}
>
确认发货
</
Button
>
}
</>
</>
},
},
]
]
...
...
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