fix: 修复退款金额显示错误的问题

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 17:36:45
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-08-31 10:33:36
+ * @LastEditTime: 2021-09-03 17:16:15
  * @Description: 查看退货数量与退款金额 抽屉
  */
 import React, { useEffect, useState } from 'react';
@@ -234,7 +234,12 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
       ...applyInfo,
       payList,
       returnCount: applyInfo.returnCount || applyInfo.remaining,  // 默认赋值
-      refundAmount: applyInfo.refundAmount || +(new BigNumber(+applyInfo.remaining).multipliedBy(applyInfo.purchasePrice)),  // 默认赋值
+      refundAmount: applyInfo.refundAmount !== undefined ?
+        applyInfo.refundAmount : (
+          isMateriel ?
+            +(new BigNumber(+applyInfo.remaining).multipliedBy(applyInfo.purchasePrice))
+            : 0
+      ),  // 默认赋值，如果是有支付信息的订单，退款金额 refundAmount 交给 payList 累加
     });
   };
 

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx

@@ -407,13 +407,13 @@ const ReturnForm: React.FC<BillsFormProps> = ({
           ,
           returnGoodsList: goodsDetailList.map(item => ({
             ...item, 
-            remaining: item.purchaseCount || 0,     // 可退货数量，这里取 采购数量判断即可
             extraData: {
               returnReason: item.returnReason, 
               payList: item.payList || [], 
               id: item.orderRecordId, 
               taskTypeKey,
               orderId: item.orderId,
+              remaining: item.purchaseCount || 0,     // 可退货数量，这里取 采购数量判断即可
             }, 
             associated: !item.associatedProductId ? '' : `${item.associatedProductId}/${item.associatedProductName}/${item.associatedType || ' '}/${item.associatedCategory}/${item.associatedBrand}`,
           })),
@@ -686,7 +686,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         payAmount: item.paidAmount,
         type: item.type,
         returnCount: '', 
-        refundAmount: '', 
+        refundAmount: undefined, 
         extraData: {
           id: item.id, 
           returnReason: '', 
@@ -725,13 +725,14 @@ const ReturnForm: React.FC<BillsFormProps> = ({
     const { getFieldValue } = addSchemaAction;
     const returnGoodsListValue = getFieldValue('returnGoodsList');
     const item = returnGoodsListValue[index];
+    const { extraData, ...rest } = item;
 
     setApplyInfo({
       index, 
-      ...item, 
-      payList: item.extraData.payList, 
-      remaining: item.extraData.remaining, 
-      returnReason: item.extraData.returnReason,
+      ...rest, 
+      payList: extraData.payList, 
+      remaining: extraData.remaining, 
+      returnReason: extraData.returnReason,
       orderType: orderTypeValue,
     });
     setVisibleReturnInfoDrawer(true)
@@ -871,7 +872,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
           applyInfo={applyInfo}
           onClose={() => setVisibleReturnInfoDrawer(false)}
           onSubmit={handleReturnInfoSubmit}
-          isEdit
+          isEdit={!id}
         />
 
         <Prompt when={unsaved} message="您还有未保存的内容，是否确定要离开？" />