feat: 新增单据 退货入库单 相关逻辑

src/components/NiceForm/components/CustomRelevance.tsx

@@ -120,6 +120,9 @@ const Relevance = props => {
         fetchTableData={fetchTableData}
         formilyProps={formilyProps}
         tableProps={tableProps}
+        resetModal={{
+          destroyOnClose: true, 
+        }}
       />
     </RowStyleLayout>
   );

src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-09-16 15:16:47
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-22 16:57:28
+ * @LastEditTime: 2020-12-22 17:34:41
  * @Description: 联动逻辑相关
  */
 import { Modal } from 'antd';
@@ -42,6 +42,7 @@ import {
   machiningWarehousingBillSchema, 
   machiningDeliveryBillSchema, 
   refundDeliveryBillSchema, 
+  afterSaleBillSchema, 
 } from '../schema';
 
 const { 
@@ -180,8 +181,9 @@ const machiningDeliveryColumns = [
   },
 ];
 
-// 售后退货发货订单列表
-const afterSaleRefundDeliveryColumns = [
+// 售后发货、入库订单列表
+const getAfterSaleColumns = (isPurchaser?: boolean) => {
+  return [
     {
       title: '申请单号',
       align: 'center',
@@ -192,10 +194,14 @@ const afterSaleRefundDeliveryColumns = [
       align: 'center',
       dataIndex: 'applyAbstract',
     },
-  {
+    isPurchaser ? {
       title: '供应会员',
       align: 'center',
       dataIndex: 'supplierName',
+    } : {
+      title: '采购会员',
+      align: 'center',
+      dataIndex: 'consumerName',
     },
     {
       title: '单据时间',
@@ -207,7 +213,8 @@ const afterSaleRefundDeliveryColumns = [
       align: 'center',
       dataIndex: 'outerStatusName',
     },
-];
+  ];
+};
 
 // 获取采购入库单相关数据
 const fetchOrderPurchaseReceiptAddList = async (params: any) => {
@@ -322,6 +329,64 @@ const getRefundDeliveryList = async (params: any) => {
   return [];
 };
 
+// 获取售后退货入库单单相关数据
+const getRefundWarehousingList = async (params: any) => {
+  const { search, startTime, endTime, ...rest } = params;
+  const res = await PublicApi.getAsReturnGoodsPageToBeAddReturnGoodsStorage({
+    applyNo: search, 
+    startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+    endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+    ...rest,
+  })
+  if (res.code === 1000) {
+    return {
+      data: res.data.data.map(item => ({
+        ...item, 
+        id: item.returnId, 
+        memberName: item.consumerName, 
+        membersId: item.parentMemberId, 
+        membersRoleId: item.parentMemberRoleId, 
+        deliveryAddresId: item.returnGoodsAddress.sendId, 
+        fullAddress: item.returnGoodsAddress.sendAddress || '', 
+        receiverName: item.returnGoodsAddress.sendUserName || '',
+        phone: item.returnGoodsAddress.sendUserTel || '',
+        deliveryType: item.returnGoodsAddress.deliveryType || '',
+      })), 
+      total: res.data.totalCount, 
+    };
+  }
+  return [];
+};
+
+// 获取售后换货退货发货单单相关数据
+const getExchangeDeliveryList = async (params: any) => {
+  const { search, startTime, endTime, ...rest } = params;
+  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReturnDeliveryGoods({
+    applyNo: search, 
+    startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+    endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
+    ...rest,
+  })
+  if (res.code === 1000) {
+    return {
+      data: res.data.data.map(item => ({
+        ...item, 
+        id: item.replaceId, 
+        memberName: item.supplierName, 
+        membersId: item.parentMemberId, 
+        membersRoleId: item.parentMemberRoleId, 
+        deliveryAddresId: item.returnGoodsAddress.receiveId, 
+        fullAddress: item.returnGoodsAddress.receiveAddress || '', 
+        receiverName: item.returnGoodsAddress.receiveUserName || '',
+        phone: item.returnGoodsAddress.receiveUserTel || '',
+        deliveryType: item.returnGoodsAddress.deliveryType || '',
+      })), 
+      total: res.data.totalCount, 
+    };
+  }
+  return [];
+};
+
 // 获取关联组件对应的 params
 const getParams = type => {
   const basicParams = {
@@ -395,9 +460,9 @@ const getParams = type => {
     // 退货发货单
     case DOC_TYPE_RETURN_INVOICE: {
       basicParams.modalProps.title = '选择售后单';
-      basicParams.columns = afterSaleRefundDeliveryColumns;
+      basicParams.columns = getAfterSaleColumns(true);
       basicParams.fetchTableData = getRefundDeliveryList;
-      basicParams.formilyProps.ctx.schema = refundDeliveryBillSchema; 
+      basicParams.formilyProps.ctx.schema = afterSaleBillSchema(true); 
       basicParams.tableProps.rowKey = 'applyNo'; 
       basicParams.tableProps.lableKey = 'applyNo'; 
       break;
@@ -405,6 +470,28 @@ const getParams = type => {
     
     // 退货入库单
     case DOC_TYPE_RETURN_RECEIPT: {
+      basicParams.modalProps.title = '选择售后单';
+      basicParams.columns = getAfterSaleColumns(false);
+      basicParams.fetchTableData = getRefundWarehousingList;
+      basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false); 
+      basicParams.tableProps.rowKey = 'applyNo'; 
+      basicParams.tableProps.lableKey = 'applyNo'; 
+      break;
+    }
+
+    // 换货退货发货单
+    case DOC_TYPE_EXCHANGE_RETURN_INVOICE: {
+      basicParams.modalProps.title = '选择售后单';
+      basicParams.columns = getAfterSaleColumns(false);
+      basicParams.fetchTableData = getExchangeDeliveryList;
+      basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false); 
+      basicParams.tableProps.rowKey = 'applyNo'; 
+      basicParams.tableProps.lableKey = 'applyNo'; 
+      break;
+    }
+    
+    // 换货退货入库单
+    case DOC_TYPE_EXCHANGE_RETURN_RECEIPT: {
       
       break;
     }
@@ -421,12 +508,6 @@ const getParams = type => {
       break;
     }
   
-    // 换货退货发货单
-    case DOC_TYPE_EXCHANGE_RETURN_INVOICE: {
-      
-      break;
-    }
-  
     default:
       break;
   }
@@ -657,6 +738,10 @@ export const useBusinessEffects = (context, actions) => {
       case DOC_TYPE_EXCHANGE_INVOICE: 
       // 换货入库单
       case DOC_TYPE_EXCHANGE_RECEIPT: {
+        // 设置配送方式相关字段数据
+        setFieldValue('transport', DELIVERY_TYPE[first.deliveryType]);
+        setFieldValue('deliveryType', first.deliveryType);
+
         // 获取明细数据 商品 数据
         PublicApi.getAsReplaceGoodsPageReturnedGoods({
           replaceId: first.id, 

src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx

@@ -445,15 +445,15 @@ const BillsForm: React.FC<BillsFormProps> = ({
                     fullAddress: returnGoodsAddress.receiveAddress || '', 
                     receiverName: returnGoodsAddress.receiveUserName || '',
                     phone: returnGoodsAddress.receiveUserTel || '',
+                    supplyMembersName: supplierName, 
+                    supplyMembersId: parentMemberId, 
+                    supplyMembersRoleId: parentMemberRoleId, 
                   }
                 ] : 
                 []
             , 
             deliveryType: returnGoodsAddress.deliveryType, 
             transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType], 
-            supplyMembersName: supplierName, 
-            supplyMembersId: parentMemberId, 
-            supplyMembersRoleId: parentMemberRoleId, 
           });
         }).finally(() => {
           setInfoLoading(false);
@@ -492,15 +492,15 @@ const BillsForm: React.FC<BillsFormProps> = ({
                     fullAddress: returnGoodsAddress.receiveAddress || '', 
                     receiverName: returnGoodsAddress.receiveUserName || '',
                     phone: returnGoodsAddress.receiveUserTel || '',
+                    supplyMembersName: supplierName, 
+                    supplyMembersId: parentMemberId, 
+                    supplyMembersRoleId: parentMemberRoleId, 
                   }
                 ] : 
                 []
             , 
             deliveryType: returnGoodsAddress.deliveryType, 
             transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType], 
-            supplyMembersName: supplierName, 
-            supplyMembersId: parentMemberId, 
-            supplyMembersRoleId: parentMemberRoleId, 
           });
         }).finally(() => {
           setInfoLoading(false);
@@ -540,15 +540,15 @@ const BillsForm: React.FC<BillsFormProps> = ({
                     fullAddress: returnGoodsAddress.receiveAddress || '', 
                     receiverName: returnGoodsAddress.receiveUserName || '',
                     phone: returnGoodsAddress.receiveUserTel || '',
-                    supplyMembersName: supplierName, 
-                    supplyMembersId: parentMemberId, 
-                    supplyMembersRoleId: parentMemberRoleId, 
                   }
                 ] : 
                 []
             , 
             deliveryType: returnGoodsAddress.deliveryType, 
             transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType], 
+            supplyMembersName: supplierName, 
+            supplyMembersId: parentMemberId, 
+            supplyMembersRoleId: parentMemberRoleId, 
           });
         }).finally(() => {
           setInfoLoading(false);
@@ -587,15 +587,15 @@ const BillsForm: React.FC<BillsFormProps> = ({
                     fullAddress: returnGoodsAddress.receiveAddress || '', 
                     receiverName: returnGoodsAddress.receiveUserName || '',
                     phone: returnGoodsAddress.receiveUserTel || '',
+                    supplyMembersName: supplierName, 
+                    supplyMembersId: parentMemberId, 
+                    supplyMembersRoleId: parentMemberRoleId, 
                   }
                 ] : 
                 []
             , 
             deliveryType: returnGoodsAddress.deliveryType, 
             transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType], 
-            supplyMembersName: supplierName, 
-            supplyMembersId: parentMemberId, 
-            supplyMembersRoleId: parentMemberRoleId, 
           });
         }).finally(() => {
           setInfoLoading(false);
@@ -635,15 +635,15 @@ const BillsForm: React.FC<BillsFormProps> = ({
                     fullAddress: returnGoodsAddress.receiveAddress || '', 
                     receiverName: returnGoodsAddress.receiveUserName || '',
                     phone: returnGoodsAddress.receiveUserTel || '',
+                    supplyMembersName: supplierName, 
+                    supplyMembersId: parentMemberId, 
+                    supplyMembersRoleId: parentMemberRoleId,
                   }
                 ] : 
                 []
             , 
             deliveryType: returnGoodsAddress.deliveryType, 
             transport: DELIVERY_TYPE[returnGoodsAddress.deliveryType],  
-            supplyMembersName: supplierName, 
-            supplyMembersId: parentMemberId, 
-            supplyMembersRoleId: parentMemberRoleId, 
           });
         }).finally(() => {
           setInfoLoading(false);
@@ -1193,9 +1193,9 @@ const BillsForm: React.FC<BillsFormProps> = ({
             }), 
             relevanceInvoicesId: orderNo[0].id, 
             relevanceInvoices: rest.relevanceInvoices, 
-            supplyMembersName: billInfo.supplyMembersName, 
-            supplyMembersId: billInfo.supplyMembersId, 
-            supplyMembersRoleId: billInfo.supplyMembersRoleId, 
+            supplyMembersName: orderNo[0].supplyMembersName, 
+            supplyMembersId: orderNo[0].supplyMembersId, 
+            supplyMembersRoleId: orderNo[0].supplyMembersRoleId, 
             invoicesTypeId, 
           })
             .then(res => {
@@ -1501,9 +1501,9 @@ const BillsForm: React.FC<BillsFormProps> = ({
             }), 
             relevanceInvoicesId: orderNo[0].id, 
             relevanceInvoices: rest.relevanceInvoices, 
-            supplyMembersName: billInfo.supplyMembersName, 
-            supplyMembersId: billInfo.supplyMembersId, 
-            supplyMembersRoleId: billInfo.supplyMembersRoleId, 
+            supplyMembersName: orderNo[0].supplyMembersName, 
+            supplyMembersId: orderNo[0].supplyMembersId, 
+            supplyMembersRoleId: orderNo[0].supplyMembersRoleId, 
             invoicesTypeId, 
           })
             .then(res => {

src/pages/transaction/stockSellStorage/bills/components/BillsForm/schema/index.ts

@@ -752,8 +752,9 @@ export const machiningDeliveryBillSchema: ISchema = {
   },
 };
 
-// 售后退货发货 弹窗 search schema
-export const refundDeliveryBillSchema: ISchema = {
+// 售后发货、入库 弹窗 search schema
+export const afterSaleBillSchema = (isPurchaser: boolean): ISchema => {
+  return {
     type: 'object', 
     properties: {
       megaLayout: {
@@ -787,6 +788,7 @@ export const refundDeliveryBillSchema: ISchema = {
                   allowClear: true, 
                 },
               },
+              ...(isPurchaser ? {
                 supplierName: {
                   type: 'string',
                   'x-component-props': {
@@ -794,6 +796,15 @@ export const refundDeliveryBillSchema: ISchema = {
                     allowClear: true, 
                   },
                 },
+              } : {
+                consumerName: {
+                  type: 'string',
+                  'x-component-props': {
+                    placeholder: '采购会员',
+                    allowClear: true, 
+                  },
+                },
+              }), 
               '[startTime, endTime]': {
                 type: 'string',
                 'x-component': 'DateSelect', 
@@ -816,6 +827,7 @@ export const refundDeliveryBillSchema: ISchema = {
         },
       },
     },
+  }
 };
 
 export const goodsSearchSchema: ISchema = {