对接后台接口修改

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-04 15:09:09
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-11-17 15:22:46
+ * @LastEditTime: 2020-11-25 11:22:40
  * @Description: 维修商品抽屉组件
  */
 import React, { useState, useEffect } from 'react';

src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx

@@ -181,8 +181,8 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
           replaceGoodsAddress, 
           faultFileList, 
           supplierName, 
-          supplierMemberId, 
-          supplierRoleId, 
+          parentMemberId, 
+          parentMemberRoleId, 
           ...rest
         } = res.data;
 
@@ -197,24 +197,21 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
           proofFileList: faultFileList.map(item => normalizeFiledata(item.filePath)), 
           deliveryAddress: {
             fullAddress: replaceGoodsAddress.receiveAddress, 
-            id: 123,        // 缺
-            isDefault: 1,   // 缺
+            id: replaceGoodsAddress.receiveId, 
             phone: replaceGoodsAddress.receiveUserTel, 
             receiverName: replaceGoodsAddress.receiveUserName, 
           }, 
           // 物流
           shippingAddress: returnGoodsAddress.deliveryType === 1 ? {
             fullAddress: returnGoodsAddress.sendAddress, 
-            id: 123,        // 缺
-            isDefault: 1,   // 缺
+            id: returnGoodsAddress.sendId, 
             phone: returnGoodsAddress.sendUserTel, 
             receiverName: returnGoodsAddress.sendUserName, 
           } : undefined, 
           // 自提
           pickupAddress: returnGoodsAddress.deliveryType === 2 ? {
             fullAddress: returnGoodsAddress.sendAddress, 
-            id: 123,        // 缺
-            isDefault: 1,   // 缺
+            id: returnGoodsAddress.sendId, 
             phone: returnGoodsAddress.sendUserTel, 
             receiverName: returnGoodsAddress.sendUserName, 
           } : undefined, 
@@ -223,8 +220,8 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
               [
                 {
                   name: supplierName, 
-                  memberId: supplierMemberId, 
-                  roleId: supplierRoleId, 
+                  memberId: parentMemberId, 
+                  roleId: parentMemberRoleId, 
                 }, 
               ] : 
               []
@@ -306,12 +303,39 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
         receiveAddress: deliveryAddress.fullAddress || '', 
         receiveUserName: deliveryAddress.receiverName || '', 
         receiveUserTel: deliveryAddress.phone || '', 
+        receiveId: deliveryAddress.id || '', 
       }, 
+      // 配送方式为 1 = 物流 选择 发货地址
       returnGoodsAddress: {
         deliveryType, 
-        sendAddress: deliveryType === 1 ? shippingAddress.fullAddress : (pickupAddress.fullAddress || ''), 
-        sendUserName: deliveryType === 1 ? shippingAddress.shipperName : (pickupAddress.shipperName || ''), 
-        sendUserTel: deliveryType === 1 ? shippingAddress.phone : (pickupAddress.phone || ''), 
+        sendAddress: 
+          deliveryType === 1 ? 
+            shippingAddress.fullAddress : 
+              deliveryType === 2 ? 
+                pickupAddress.fullAddress : 
+                ''
+        , 
+        sendUserName: 
+          deliveryType === 1 ? 
+            shippingAddress.shipperName : 
+              deliveryType === 2 ? 
+                pickupAddress.shipperName : 
+                ''
+        , 
+        sendUserTel: 
+          deliveryType === 1 ? 
+            shippingAddress.phone : 
+              deliveryType === 2 ? 
+                pickupAddress.phone : 
+                ''
+        , 
+        sendId: 
+          deliveryType === 1 ? 
+            shippingAddress.sendId : 
+              deliveryType === 2 ? 
+                pickupAddress.sendId : 
+                ''
+        , 
       }, 
       proofFileList: proofFileList.filter(item => item.status === 'done').map(item => ({
         fileName: item.name, 
@@ -389,7 +413,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
           existing : 
           {
             id: item.id, 
-            orderId: item.orderId,
+            orderRecordId: item.orderId,
             orderNo: item.orderNo, 
             productId: item.productId, 
             productName: item.productName, 

src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx

@@ -122,7 +122,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
     PublicApi.postAsReplaceGoodsSetNeedReturnGoods({
       replaceId: +id, 
       replaceGoodsId: record.productId, 
-      isNeed: record.needReplaceName === 1 ? 0 : 1, 
+      isNeed: record.isNeedReturn === 1 ? 0 : 1, 
     }).then(res => {
       if (res.code === 1000) {
         getReplaceGoods();

src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx

@@ -73,8 +73,8 @@ const RepairForm: React.FC<BillsFormProps> = ({
           repairAddress, 
           faultFileList, 
           supplierName, 
-          supplierMemberId, 
-          supplierRoleId, 
+          parentMemberId, 
+          parentMemberRoleId, 
           ...rest
         } = res.data;
 
@@ -94,8 +94,8 @@ const RepairForm: React.FC<BillsFormProps> = ({
               [
                 {
                   name: supplierName, 
-                  memberId: supplierMemberId, 
-                  roleId: supplierRoleId, 
+                  memberId: parentMemberId, 
+                  roleId: parentMemberRoleId, 
                 }, 
               ] : 
               []

src/utils/index.tsx

@@ -456,7 +456,8 @@ export function normalizeFiledata(url: any): any {
     uid: Math.random().toFixed(16).slice(2, 10),
     name: fileName,
     status: 'done',
-    url,
+    url, 
+    data: url,    // formily Upload value 需要这个字段
   };
 };