Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/afterService/components/ReturnDetailInfo/index.tsx

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