chore: 修改已支付金额字段

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-04 15:09:09
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-08-10 11:29:44
+ * @LastEditTime: 2021-08-11 11:44:19
  * @Description: 维修商品抽屉组件
  */
 import React from 'react';
@@ -432,7 +432,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
                 ? product.payInfoList.reduce((prev, now) => {
                   return now.externalState === PayOutWorkState.CONFIRM_ACCOUNT ? +(new BigNumber(+product.purchaseCount).multipliedBy(product.price).multipliedBy(new BigNumber(now.payRatio).dividedBy(100))).toFixed(2) + prev : prev;
                 }, 0)
-                : product.amount,
+                : product.paidAmount,
           });
         }
       });

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

@@ -137,8 +137,8 @@ const ReturnForm: React.FC<BillsFormProps> = ({
     },
     {
       title: '订单摘要',
-      dataIndex: 'digest', 
-      align: 'center',
+      dataIndex: 'digest',
+      ellipsis: true,
     },
     {
       title: '供应会员',
@@ -178,31 +178,31 @@ const ReturnForm: React.FC<BillsFormProps> = ({
   const childTableColumn: ColumnType<any>[] = [
     !isMateriel ?{
       title: '商品ID',
-      dataIndex: 'productId',
+      dataIndex: 'productNo',
       align: 'center',
     } : {
       title: '物料编号',
-      dataIndex: 'materialCode',
+      dataIndex: 'productNo',
       align: 'center',
     },
     !isMateriel ? {
       title: '商品名称',
       dataIndex: 'name',
-      align: 'center',
+      ellipsis: true,
     } : {
       title: '物料名称、规格',
-      dataIndex: 'materialName',
+      dataIndex: 'name',
       align: 'center',
       render: (text, record) => `${text}/${record.materialType}`,
     },
     {
       title: '品类',
-      dataIndex: !isMateriel ? 'category' : 'materialCategory',
+      dataIndex: !isMateriel ? 'category' : 'quotedCategory',
       align: 'center',
     },
     {
       title: '品牌',
-      dataIndex: !isMateriel ? 'brand' : 'materialBrand',
+      dataIndex: !isMateriel ? 'brand' : 'quotedBrand',
       align: 'center',
     },
     {
@@ -223,7 +223,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
     }, 
     {
       title: '金额',
-      dataIndex: 'amount',
+      dataIndex: 'paidAmount',
       align: 'center',
       render: (text) => `¥ ${text}`,
     },
@@ -623,7 +623,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         purchasePrice: item.price, 
         purchaseCount: item.quantity, 
         purchaseAmount: +(item.price * item.quantity).toFixed(2), 
-        payAmount: item.payAmount, 
+        payAmount: item.paidAmount,
         returnCount: '', 
         refundAmount: '', 
         extraData: {