feat: 新增单据 换货发货单、入库单 相关逻辑

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

@@ -53,6 +53,8 @@ import {
   getMachiningDeliveryList, 
   getRefundDeliveryList, 
   getRefundWarehousingList, 
+  getExchangeReturnDeliveryList, 
+  getExchangeReturnWarehousingList, 
   getExchangeDeliveryList, 
   getExchangeWarehousingList, 
 } from '../fetchBillList';
@@ -158,7 +160,7 @@ const getParams = type => {
     case DOC_TYPE_EXCHANGE_RETURN_INVOICE: {
       basicParams.modalProps.title = '选择售后单';
       basicParams.columns = getAfterSaleColumns(true);
-      basicParams.fetchTableData = getExchangeDeliveryList;
+      basicParams.fetchTableData = getExchangeReturnDeliveryList;
       basicParams.formilyProps.ctx.schema = afterSaleBillSchema(true); 
       basicParams.tableProps.rowKey = 'applyNo'; 
       basicParams.tableProps.lableKey = 'applyNo'; 
@@ -169,7 +171,7 @@ const getParams = type => {
     case DOC_TYPE_EXCHANGE_RETURN_RECEIPT: {
       basicParams.modalProps.title = '选择售后单';
       basicParams.columns = getAfterSaleColumns(false);
-      basicParams.fetchTableData = getExchangeWarehousingList;
+      basicParams.fetchTableData = getExchangeReturnWarehousingList;
       basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false); 
       basicParams.tableProps.rowKey = 'applyNo'; 
       basicParams.tableProps.lableKey = 'applyNo'; 
@@ -178,13 +180,23 @@ const getParams = type => {
     
     // 换货发货单
     case DOC_TYPE_EXCHANGE_INVOICE: {
-      
+      basicParams.modalProps.title = '选择售后单';
+      basicParams.columns = getAfterSaleColumns(true);
+      basicParams.fetchTableData = getExchangeDeliveryList;
+      basicParams.formilyProps.ctx.schema = afterSaleBillSchema(true); 
+      basicParams.tableProps.rowKey = 'applyNo'; 
+      basicParams.tableProps.lableKey = 'applyNo'; 
       break;
     }
     
     // 换货入库单
     case DOC_TYPE_EXCHANGE_RECEIPT: {
-      
+      basicParams.modalProps.title = '选择售后单';
+      basicParams.columns = getAfterSaleColumns(false);
+      basicParams.fetchTableData = getExchangeWarehousingList;
+      basicParams.formilyProps.ctx.schema = afterSaleBillSchema(false); 
+      basicParams.tableProps.rowKey = 'applyNo'; 
+      basicParams.tableProps.lableKey = 'applyNo'; 
       break;
     }
   

src/pages/transaction/stockSellStorage/bills/components/BillsForm/fetchBillList.ts

@@ -151,7 +151,7 @@ export const getRefundWarehousingList = async (params: any) => {
 };
 
 // 获取售后换货退货发货单单相关数据
-export const getExchangeDeliveryList = async (params: any) => {
+export const getExchangeReturnDeliveryList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
   const res = await PublicApi.getAsReplaceGoodsPageToBeAddReturnDeliveryGoods({
     applyNo: search, 
@@ -180,7 +180,7 @@ export const getExchangeDeliveryList = async (params: any) => {
 };
 
 // 获取售后换货退货入库单单相关数据
-export const getExchangeWarehousingList = async (params: any) => {
+export const getExchangeReturnWarehousingList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
   const res = await PublicApi.getAsReplaceGoodsPageToBeAddReturnGoodsStorage({
     applyNo: search, 
@@ -193,7 +193,7 @@ export const getExchangeWarehousingList = async (params: any) => {
       data: res.data.data.map(item => ({
         ...item, 
         id: item.replaceId, 
-        memberName: item.supplierName, 
+        memberName: item.consumerName, 
         membersId: item.parentMemberId, 
         membersRoleId: item.parentMemberRoleId, 
         deliveryAddresId: item.returnGoodsAddress.receiveId, 
@@ -207,3 +207,61 @@ export const getExchangeWarehousingList = async (params: any) => {
   }
   return [];
 };
+
+// 获取售后换货发货单单相关数据
+export const getExchangeDeliveryList = async (params: any) => {
+  const { search, startTime, endTime, ...rest } = params;
+  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReplaceDeliveryGoods({
+    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.replaceGoodsAddress.receiveId, 
+        fullAddress: item.replaceGoodsAddress.receiveAddress || '', 
+        receiverName: item.replaceGoodsAddress.receiveUserName || '',
+        phone: item.replaceGoodsAddress.receiveUserTel || '',
+        deliveryType: item.replaceGoodsAddress.deliveryType || '',
+      })), 
+      total: res.data.totalCount, 
+    };
+  }
+  return [];
+};
+
+// 获取售后换货入库单单相关数据
+export const getExchangeWarehousingList = async (params: any) => {
+  const { search, startTime, endTime, ...rest } = params;
+  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReplaceGoodsStorage({
+    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.consumerName, 
+        membersId: item.parentMemberId, 
+        membersRoleId: item.parentMemberRoleId, 
+        deliveryAddresId: item.replaceGoodsAddress.receiveId, 
+        fullAddress: item.replaceGoodsAddress.receiveAddress || '', 
+        receiverName: item.replaceGoodsAddress.receiveUserName || '',
+        phone: item.replaceGoodsAddress.receiveUserTel || '',
+        deliveryType: item.replaceGoodsAddress.deliveryType || '',
+      })), 
+      total: res.data.totalCount, 
+    };
+  }
+  return [];
+};
\ No newline at end of file

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

@@ -682,15 +682,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);