Commit 6aff4ae0 authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复确认退款未到账之后不能再次退款的问题

parent c86eeaa1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18 * @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-28 10:22:16 * @LastEditTime: 2021-02-02 10:36:12
* @Description: 退款明细 * @Description: 退款明细
*/ */
import React, { useState } from 'react'; import React, { useState } from 'react';
...@@ -20,6 +20,7 @@ import { ...@@ -20,6 +20,7 @@ import {
PAY_CHANNEL_COD, PAY_CHANNEL_COD,
RETURN_OUTER_STATUS_TO_BE_REFUNDED, RETURN_OUTER_STATUS_TO_BE_REFUNDED,
RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED, RETURN_OUTER_STATUS_UNCONFIRMED_REFUNDED,
RETURN_OUTER_STATUS_NOT_RECEIVED,
} from '@/constants'; } from '@/constants';
import Stamp from '../Stamp'; import Stamp from '../Stamp';
import CheckVoucherModal from '../CheckVoucherModal'; import CheckVoucherModal from '../CheckVoucherModal';
...@@ -263,7 +264,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -263,7 +264,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
setCurrentDetailItem({ setCurrentDetailItem({
fileList: record.payProve.fileList ? record.payProve.fileList.map(item => normalizeFiledata(item.proveUrl)) : [], fileList: record.payProve.fileList ? record.payProve.fileList.map(item => normalizeFiledata(item.proveUrl)) : [],
}); });
setVisibleResult(true); setVoucherVisible(true);
}; };
const handleRefundConfirm = (values, modalName) => { const handleRefundConfirm = (values, modalName) => {
...@@ -321,7 +322,10 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -321,7 +322,10 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
{ {
isEdit && isEdit &&
!isPurchaser && !isPurchaser &&
outerStatus === RETURN_OUTER_STATUS_TO_BE_REFUNDED && (
outerStatus === RETURN_OUTER_STATUS_TO_BE_REFUNDED ||
outerStatus === RETURN_OUTER_STATUS_NOT_RECEIVED
) &&
!!item.canRefund && ( !!item.canRefund && (
item.outerStatus === REFUND_OUTER_STATUS_NOT_RECEIVED || item.outerStatus === REFUND_OUTER_STATUS_NOT_RECEIVED ||
item.innerStatus === REFUND_INNER_STATUS_NO_REFUND || item.innerStatus === REFUND_INNER_STATUS_NO_REFUND ||
...@@ -409,7 +413,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({ ...@@ -409,7 +413,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
), ),
currentDetailItem.id && ( currentDetailItem.id && (
<Button <Button
key="2" key="3"
type="primary" type="primary"
loading={receivedLoading} loading={receivedLoading}
onClick={() => handleConfirm(currentDetailItem.id, 1)} onClick={() => handleConfirm(currentDetailItem.id, 1)}
......
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