Commit fb04a535 authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复线下退款完毕弹窗没有消失的问题

parent e1cc7343
......@@ -118,6 +118,10 @@ interface IProps {
* 采购商角色id
*/
purchaserRoleId: number,
/**
* 弹窗提交 loading
*/
submitLoading: boolean;
}
const UploadPaymentVoucher: React.FC<IProps> = (props: IProps) => {
......@@ -127,6 +131,7 @@ const UploadPaymentVoucher: React.FC<IProps> = (props: IProps) => {
onSubmit,
purchaserId,
purchaserRoleId,
submitLoading,
} = props;
const [bankAccount, setBankAccount] = useState<BankAccount>({
name: '',
......@@ -136,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 = () => {
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-27 15:38:04
* @LastEditTime: 2021-08-27 16:09:15
* @Description: 退款明细
*/
import React, { useState } from 'react';
......@@ -306,8 +306,8 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
};
const handleRefundConfirm = (values, modalName) => {
setSubmitLoading(true);
if (onRefund) {
setSubmitLoading(true);
onRefund(values).finally(() => {
setSubmitLoading(false);
setRefundModalVisible(false);
......@@ -317,7 +317,11 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
const handlePaymentVoucherSubmit = (value) => {
if (onRefund) {
return onRefund({ ...value, id: refundModalValue.id });
setSubmitLoading(true);
return onRefund({ ...value, id: refundModalValue.id }).finally(() => {
setSubmitLoading(false);
setPaymentVoucherVisible(false);
});
}
return Promise.reject();
};
......@@ -490,6 +494,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
onSubmit={handlePaymentVoucherSubmit}
purchaserId={refundModalValue.purchaserId}
purchaserRoleId={refundModalValue.purchaserRoleId}
submitLoading={submitLoading}
/>
</MellowCard>
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment