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
426be222
Commit
426be222
authored
Dec 24, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理销售待审核订单修改价格总价显示异常,处理待确认回单发货是否完成不需要提示,处理线下支付线上确认凭证上传完毕才能提交支付
parent
ac4310b1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
24 deletions
+27
-24
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+1
-1
index.tsx
src/pages/transaction/components/orderSaleRecord/index.tsx
+4
-6
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+3
-3
index.tsx
...action/saleOrder/readyConfirmReturnOrder/detail/index.tsx
+19
-14
No files found.
src/pages/transaction/components/orderPayModal/index.tsx
View file @
426be222
...
@@ -246,7 +246,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
...
@@ -246,7 +246,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
if
(
current
===
1
)
{
if
(
current
===
1
)
{
const
payOrderUrls
=
formRef
.
current
.
urlList
const
payOrderUrls
=
formRef
.
current
.
urlList
const
checkedId
=
checked
.
id
const
checkedId
=
checked
.
id
if
(
!
payOrderUrls
||
payOrderUrls
.
length
===
0
)
{
if
(
!
payOrderUrls
||
payOrderUrls
.
length
===
0
||
payOrderUrls
.
includes
(
''
)
)
{
message
.
error
(
'请先上传凭证'
)
message
.
error
(
'请先上传凭证'
)
return
;
return
;
}
}
...
...
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @
426be222
...
@@ -287,10 +287,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
...
@@ -287,10 +287,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
// 确认全部发货单已收到回单
// 确认全部发货单已收到回单
const
handelReciveReturnOrder
=
async
()
=>
{
const
handelReciveReturnOrder
=
async
()
=>
{
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
})
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
},
{
ctlType
:
"none"
})
const
{
code
}
=
res
let
tip
=
''
let
tip
=
''
if
(
code
===
1000
)
if
(
res
.
data
)
tip
=
'是否确认本单全部发货单已收到回单?'
tip
=
'是否确认本单全部发货单已收到回单?'
else
else
tip
=
'您还有未发货的商品,是否确认全部发货都已完成?'
tip
=
'您还有未发货的商品,是否确认全部发货都已完成?'
...
@@ -306,10 +305,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
...
@@ -306,10 +305,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
// 继续发货
// 继续发货
const
handleContinueDeliver
=
async
()
=>
{
const
handleContinueDeliver
=
async
()
=>
{
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
})
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
},
{
ctlType
:
'none'
})
const
{
code
}
=
res
let
tip
=
''
let
tip
=
''
if
(
code
===
1000
)
if
(
res
.
data
)
tip
=
'您商品都已发货.是否确认还需要继续发货?'
tip
=
'您商品都已发货.是否确认还需要继续发货?'
else
else
tip
=
'是否继续发货?'
tip
=
'是否继续发货?'
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
426be222
...
@@ -97,12 +97,12 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
...
@@ -97,12 +97,12 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
modelRef
.
current
.
setVisible
(
true
)
modelRef
.
current
.
setVisible
(
true
)
}
}
const
[
amountMoney
,
setAmountMoney
]
=
useState
<
number
>
(
sumPrice
||
sum
+
freePrice
)
const
[
amountMoney
,
setAmountMoney
]
=
useState
<
number
>
(
(
sumPrice
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
// 总计金额
// 总计金额
useEffect
(()
=>
{
useEffect
(()
=>
{
console
.
log
(
sumPrice
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
,
'iiiiii'
)
console
.
log
(
(
sumPrice
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
,
'iiiiii'
)
setAmountMoney
(()
=>
sumPrice
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
setAmountMoney
(()
=>
(
sumPrice
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
},
[
sum
,
freePrice
,
sumPrice
])
},
[
sum
,
freePrice
,
sumPrice
])
const
handleConfirm
=
()
=>
{
const
handleConfirm
=
()
=>
{
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/detail/index.tsx
View file @
426be222
...
@@ -16,17 +16,22 @@ const ReadyConfirmReturnOrderDetail: React.FC = () => {
...
@@ -16,17 +16,22 @@ const ReadyConfirmReturnOrderDetail: React.FC = () => {
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postOrderReceiptOrderConfirmedAll
)
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postOrderReceiptOrderConfirmedAll
)
// 提交表单
// 提交表单
const
handleSubmit
=
useCallback
(
async
()
=>
{
// const handleSubmit = useCallback(async () => {
const
params
=
{
// const params = {
id
:
Number
(
id
),
// id: Number(id),
state
:
1
// state: 1
}
// }
const
result
=
await
run
(
params
)
// const result = await run(params)
// if (result.code === 1000) {
// history.goBack()
// }
// }, [])
if
(
result
.
code
===
1000
)
{
const
handleSubmit
=
()
=>
{
history
.
goBack
()
const
deleveBox
=
document
.
querySelector
(
'#deleveBox'
)
as
any
window
.
scrollTo
(
0
,
deleveBox
.
offsetTop
)
}
}
},
[])
return
(
return
(
<
div
>
<
div
>
...
@@ -34,11 +39,11 @@ const ReadyConfirmReturnOrderDetail: React.FC = () => {
...
@@ -34,11 +39,11 @@ const ReadyConfirmReturnOrderDetail: React.FC = () => {
<
OrderDetailHeader
<
OrderDetailHeader
detailList=
{
detailList
}
detailList=
{
detailList
}
detailData=
{
formContext
.
data
}
detailData=
{
formContext
.
data
}
// extraRight={
extraRight=
{
// <Button type='primary' onClick={handleSubmit} loading={loading}>
<
Button
type=
'primary'
onClick=
{
handleSubmit
}
loading=
{
loading
}
>
// 确认全部已回单
确认全部已回单
// </Button>
</
Button
>
// }
}
/>
/>
<
OrderDetailWrapper
>
<
OrderDetailWrapper
>
...
...
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