Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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-admin
Commits
5c246af7
Commit
5c246af7
authored
Aug 30, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复线下退款id传错的问题
parent
bb664d91
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
index.tsx
...age/components/RefundModal/UploadPaymentVoucher/index.tsx
+6
-7
index.tsx
src/pages/returnManage/components/ReturnDetailInfo/index.tsx
+7
-2
No files found.
src/pages/returnManage/components/RefundModal/UploadPaymentVoucher/index.tsx
View file @
5c246af7
...
...
@@ -66,10 +66,6 @@ export type ValueType = {
export
type
SubmitValueType
=
{
/**
* 账户id
*/
id
:
number
,
/**
* 支付凭证 ,PayProveBO
*/
payProve
?:
{
...
...
@@ -122,6 +118,10 @@ interface IProps {
* 采购商角色id
*/
purchaserRoleId
:
number
,
/**
* 弹窗提交 loading
*/
submitLoading
:
boolean
;
}
const
UploadPaymentVoucher
:
React
.
FC
<
IProps
>
=
(
props
:
IProps
)
=>
{
...
...
@@ -131,6 +131,7 @@ const UploadPaymentVoucher: React.FC<IProps> = (props: IProps) => {
onSubmit
,
purchaserId
,
purchaserRoleId
,
submitLoading
,
}
=
props
;
const
[
bankAccount
,
setBankAccount
]
=
useState
<
BankAccount
>
({
name
:
''
,
...
...
@@ -140,7 +141,6 @@ const UploadPaymentVoucher: React.FC<IProps> = (props: IProps) => {
});
const
[
loading
,
setLoading
]
=
useState
(
false
);
const
[
refundDisabled
,
setRefundDisabled
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
// 获取对公账户信息
const
getSettleAccountsGetMemberAccountConfig
=
()
=>
{
...
...
@@ -194,13 +194,12 @@ const UploadPaymentVoucher: React.FC<IProps> = (props: IProps) => {
return
;
}
onSubmit
({
id
,
payProve
:
{
...
rest
,
fileList
:
fileList
.
map
(
item
=>
item
.
status
===
'done'
&&
({
name
:
item
.
name
,
proveUrl
:
item
.
url
,
})).
filter
(
Boolean
),
})).
filter
(
Boolean
)
as
any
,
},
});
}
...
...
src/pages/returnManage/components/ReturnDetailInfo/index.tsx
View file @
5c246af7
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-0
4-19 17:20:3
3
* @LastEditTime: 2021-0
8-30 19:37:4
3
* @Description: 退款明细
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -281,7 +281,11 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
const
handlePaymentVoucherSubmit
=
(
value
)
=>
{
if
(
onRefund
)
{
return
onRefund
(
value
);
setSubmitLoading
(
true
);
return
onRefund
({
...
value
,
id
:
refundModalValue
.
id
}).
finally
(()
=>
{
setSubmitLoading
(
false
);
setPaymentVoucherVisible
(
false
);
});
}
return
Promise
.
reject
();
};
...
...
@@ -450,6 +454,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
onSubmit=
{
handlePaymentVoucherSubmit
}
purchaserId=
{
refundModalValue
.
purchaserId
as
number
}
purchaserRoleId=
{
refundModalValue
.
purchaserRoleId
as
number
}
submitLoading=
{
submitLoading
}
/>
</
MellowCard
>
);
...
...
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