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
785b3095
Commit
785b3095
authored
Nov 26, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:销售订单待确认回单按钮添加是否发货完成的判断和继续发货功能
parent
2983dfdd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
5 deletions
+70
-5
index.tsx
...pages/transaction/components/orderDetailSection/index.tsx
+2
-2
index.tsx
src/pages/transaction/components/orderSaleRecord/index.tsx
+68
-3
No files found.
src/pages/transaction/components/orderDetailSection/index.tsx
View file @
785b3095
...
...
@@ -11,7 +11,7 @@ import OrderSaleRecord from '../orderSaleRecord'
export
interface
OrderDetailSectionProps
{
formContext
:
any
,
type
?:
'purchaseOrder'
|
'saleOrder'
type
?:
'purchaseOrder'
|
'saleOrder'
,
}
const
OrderDetailSection
:
React
.
FC
<
OrderDetailSectionProps
>
=
({
formContext
,
type
=
'purchaseOrder'
})
=>
{
...
...
@@ -46,7 +46,7 @@ const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type
<
OrderMergeInfo
/>
{
type
===
'saleOrder'
?
<
OrderSaleRecord
/>
:
<
OrderDeleveRecord
/>
}
{
type
===
'saleOrder'
?
<
OrderSaleRecord
/>
:
<
OrderDeleveRecord
/>
}
<
OrderTransformRecord
type=
{
type
}
/>
</
div
>
...
...
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @
785b3095
import
React
,
{
useC
ontext
,
useRef
}
from
'react'
import
{
Tabs
,
Table
,
Button
}
from
'antd'
import
React
,
{
useC
allback
,
useContext
,
useEffect
,
useRef
,
useState
}
from
'react'
import
{
Tabs
,
Table
,
Button
,
Space
,
Modal
}
from
'antd'
import
StatusColors
from
'@/pages/transaction/components/StatusColors'
import
{
formatTimeString
}
from
'@/utils'
import
{
OrderDetailContext
}
from
'../../_public/order/context'
...
...
@@ -8,8 +8,14 @@ import NestTable from '@/components/NestTable'
import
{
DeliverySideState
}
from
'@/constants'
import
{
PublicApi
}
from
'@/services/api'
import
{
history
}
from
'umi'
import
{
ExclamationCircleOutlined
}
from
'@ant-design/icons'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
export
interface
OrderSaleRecordProps
{}
export
interface
OrderSaleRecordProps
{
}
const
{
confirm
}
=
Modal
;
const
outOrderCols
:
any
[]
=
[
{
...
...
@@ -163,6 +169,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
const
dataRef
=
useRef
<
any
>
([])
const
{
data
,
reloadFormData
}
=
useContext
(
OrderDetailContext
)
const
{
orderReceivingStatisticsResponses
,
orderDeliveryDetailsResponses
}
=
data
const
sideOrderCols
:
any
[]
=
[
{
title
:
'发货批次'
,
...
...
@@ -227,6 +234,21 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
},
]
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postOrderReceiptOrderConfirmedAll
)
// 确认全部回单
const
handleSubmit
=
useCallback
(
async
()
=>
{
const
params
=
{
id
:
Number
(
data
.
id
),
state
:
1
}
const
result
=
await
run
(
params
)
if
(
result
.
code
===
1000
)
{
history
.
goBack
()
}
},
[])
// 确认发货
const
handleConfirm
=
async
(
record
)
=>
{
const
params
=
{
...
...
@@ -254,6 +276,45 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
reloadFormData
&&
reloadFormData
()
}
}
// 确认全部发货单已收到回单
const
handelReciveReturnOrder
=
async
()
=>
{
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
})
const
{
code
}
=
res
let
tip
=
''
if
(
code
===
1000
)
tip
=
'是否确认本单全部发货单已收到回单?'
else
tip
=
'您还有未发货的商品,是否确认全部发货都已完成?'
confirm
({
title
:
'提示'
,
icon
:
<
ExclamationCircleOutlined
/>,
content
:
tip
,
onOk
()
{
handleSubmit
()
},
});
}
// 继续发货
const
handleContinueDeliver
=
async
()
=>
{
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
})
const
{
code
}
=
res
let
tip
=
''
if
(
code
===
1000
)
tip
=
'您商品都已发货.是否确认还需要继续发货?'
else
tip
=
'是否继续发货?'
confirm
({
title
:
'提示'
,
icon
:
<
ExclamationCircleOutlined
/>,
content
:
tip
,
onOk
()
{
PublicApi
.
postOrderReceiptOrderContinueShipping
({
orderId
:
data
.
id
})
},
});
}
return
(
<>
{
...
...
@@ -278,6 +339,10 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
childrenDataKey=
'orderDeliveryProducts'
dataSource=
{
orderDeliveryDetailsResponses
}
/>
<
Space
style=
{
{
marginTop
:
18
,
display
:
"flex"
,
justifyContent
:
"flex-end"
}
}
>
<
Button
onClick=
{
handelReciveReturnOrder
}
>
确认本单全部发货单已收到回单
</
Button
>
<
Button
onClick=
{
handleContinueDeliver
}
>
继续发货
</
Button
>
</
Space
>
</
Tabs
.
TabPane
>
}
</
Tabs
>
...
...
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