Merge branch 'master' into feature-afterSalesRefund

config/env.config.js

 const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
-const environment = 'sc';
+const environment = 'yxm2';
 const envAPi = {
   api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net',
   kdspOpApi: `https://sc-merchant-api-${environment}.liangkebang.net`,

src/components/MessageReminder/Simple/index.jsx

@@ -139,7 +139,7 @@ const Simple = props => {
     }
     const params = {
       pageNo: 1,
-      pageSize: 1000,
+      pageSize: 200,
     };
     const data = {
       channelId: CHANNEL_ID,

src/pages/AfterSaleManage/components/LogisticsRecordModal.jsx

 import React, { useState, forwardRef, useImperativeHandle, useEffect } from 'react';
-import { Modal, Timeline, notification, Spin } from 'antd';
-import { getLogisticsRecord } from '../services';
+import { Modal, Timeline, notification, Spin, Collapse } from 'antd';
+import { getLogisticsRecord, apiDeliveriesTraceList } from '../services';
+import styles from '../index.less';
+
+const { Panel } = Collapse;
 
 const LogisticsRecordModal = (props, ref) => {
   // const { } = props;
 
   const [visible, setVisible] = useState(false);
-  const [result, setResult] = useState({});
   const [loading, setLoading] = useState(false);
+  const [dataList, setDataList] = useState([]);
+  const [isSingle, setIsSingle] = useState(false);
 
-  const getRecordList = async orderNo => {
-    const tempObj = {
-      detailList: [],
-      key: Date.now(),
-    };
+  const getRecordList = async params => {
     setLoading(true);
-    const res = await getLogisticsRecord({ orderNo });
+    const res = await apiDeliveriesTraceList(params);
     setLoading(false);
     if (!res) {
       notification.info({ message: '暂无物流信息' });
       return;
     }
-    const { logisticsName, logisticsBillNo, logisticsList = [] } = res.data;
-    tempObj.expressCompanyName = logisticsName;
-    tempObj.deliveryNo = logisticsBillNo;
-    logisticsList.forEach(v => {
-      tempObj.detailList = [...tempObj.detailList, ...v.detailList];
-    });
-    setResult(tempObj);
+
+    setDataList(res.data);
   };
 
-  const open = orderNo => {
+  const open = (record, type) => {
     setVisible(true);
-    getRecordList(orderNo);
+    getRecordList(record);
+    if (type === 'single') {
+      setIsSingle(true);
+    }
   };
   const onCancel = () => {
     setVisible(false);
-    setResult([]);
+    setTimeout(() => {
+      setDataList([]);
+    }, 1000);
   };
   useImperativeHandle(ref, () => ({
     open,
@@ -59,18 +59,70 @@ const LogisticsRecordModal = (props, ref) => {
   return (
     <Modal {...modalProps}>
       <Spin spinning={loading}>
-        {result.detailList?.length ? (
+        {dataList.length ? (
+          dataList.map((dataItem, dataIndex) => (
+            <div className={styles['logistics-record']}>
+              {!isSingle ? (
+                <div className={styles['logistics-record__topbar']}>包裹{dataIndex + 1}</div>
+              ) : (
+                ''
+              )}
+              <div className={styles['logistics-record__head']}>
+                <span className={styles.name}>物流公司：{dataItem.expressCompanyName}</span>
+                <span className={styles.no}>物流单号：{dataItem.expressNo}</span>
+              </div>
+              {dataItem.traceList.map(traceItem => (
                 <Timeline>
-            {result?.detailList?.map((item, index) => (
+                  {traceItem?.detailList.length ? (
+                    traceItem?.detailList?.map((item, index) => (
                       <Timeline.Item color={index > 0 ? 'gray' : 'blue'} key={index.toString()}>
                         <p>{item.desc}</p>
-                <p>{item.logisticsTime}</p>
+                        <p>{item.time}</p>
                       </Timeline.Item>
+                    ))
+                  ) : (
+                    <div style={emptyStyle}>暂无物流信息</div>
+                  )}
+                </Timeline>
               ))}
+            </div>
+          ))
+        ) : (
+          <div style={emptyStyle}>暂无物流信息</div>
+        )}
+
+        {/* 折叠 */}
+        {/* <Collapse defaultActiveKey={['0']} ghost >
+          {dataList.length ? (
+            dataList.map((dataItem, dataIndex) => (
+              <Panel showArrow={false} header={<div className={styles['logistics-record__topbar']}>包裹{dataIndex + 1}</div>} key={dataIndex.toString()}>
+              <div className={styles['logistics-record']}>
+
+                <div className={styles['logistics-record__head']}>
+                  <span className={styles.name}>物流公司：{dataItem.expressCompanyName}</span>
+                  <span className={styles.no}>物流单号：{dataItem.expressNo}</span>
+                </div>
+                {dataItem.traceList.map(traceItem => (
+                  <Timeline>
+                    {traceItem?.detailList.length ? (
+                      traceItem?.detailList?.map((item, index) => (
+                        <Timeline.Item color={index > 0 ? 'gray' : 'blue'} key={index.toString()}>
+                          <p>{item.desc}</p>
+                          <p>{item.time}</p>
+                        </Timeline.Item>
+                      ))
+                    ) : (
+                      <div style={emptyStyle}>暂无物流信息</div>
+                    )}
                   </Timeline>
+                ))}
+              </div>
+              </Panel>
+            ))
           ) : (
             <div style={emptyStyle}>暂无物流信息</div>
           )}
+        </Collapse> */}
       </Spin>
     </Modal>
   );

src/pages/AfterSaleManage/components/auditModal.jsx

@@ -105,7 +105,8 @@ const AuditModal = props => {
   };
 
   const openLogisticsRecord = () => {
-    logisticsRecordModalRef.current.open(formData.orderNo);
+    const { orderNo, skuNo } = formData;
+    logisticsRecordModalRef.current.open({ orderNo, skuNo });
   };
 
   const layout = {

src/pages/AfterSaleManage/index.jsx

@@ -16,6 +16,7 @@ import RejectModal from './components/rejectModal';
 import LogisticsCom from '../orderManage/pendingDeliveryOrder/components/LogisticsCom';
 import CancelAuditModal from './components/CancelAuditModal';
 import CancelDetailTable from './components/CancelDetailTable';
+import LogisticsRecordModal from './components/LogisticsRecordModal';
 
 import { getColumns, getFormConfig, TAB_MAPPING_DATA } from './data.js';
 import { getDetail } from '@/pages/afterSale/appeal/services';
@@ -44,6 +45,7 @@ const AfterSale = props => {
 
   const actionRef = useRef();
   const formRef = useRef();
+  const logisticsRecordModalRef = useRef();
   const [tableParams, setTableParams] = useState({});
   const [currentTab, setCurrentTab] = useState('');
   // const [appealDetailModal, setAppealDetailModal] = useState(false);
@@ -125,32 +127,35 @@ const AfterSale = props => {
   };
 
   // 审核
-  const openAudit = async ({ serviceNo, serviceType, orderNo }) => {
+  const openAudit = async ({ serviceNo, serviceType, orderNo, skuNo }) => {
     const data = await auditInfoApi({ serviceNo });
-    setAuditInfo({ ...data?.data, serviceNo, serviceType, orderNo });
+    setAuditInfo({ ...data?.data, serviceNo, serviceType, orderNo, skuNo });
     setVisible(true);
   };
 
   // 查看物流
-  const handleCom = async ({ expressCompanyCode, deliveryNo }) => {
-    const tempObj = {
-      detailList: [],
-      key: Date.now(),
-    };
-    const data = await trackInfo({ expressCompanyCode, logisticsNo: deliveryNo });
-    if (!data) {
-      notification.info({ message: '暂无物流信息' });
-      return;
-    }
-    tempObj.expressCompanyName = data.logisticsName;
-    tempObj.deliveryNo = data.logisticsBillNo;
-    if (data.logisticsList?.length) {
-      data.logisticsList.forEach(v => {
-        tempObj.detailList = [...tempObj.detailList, ...v.detailList];
-      });
-    }
-    setLogisticsComModalVisible(true);
-    setLogisticsComList(tempObj);
+  const handleCom = async record => {
+    console.log('record', record);
+    const { expressCompanyCode, deliveryNo: expressNo } = record;
+    logisticsRecordModalRef.current.open({ expressCompanyCode, expressNo }, 'single');
+    // const tempObj = {
+    //   detailList: [],
+    //   key: Date.now(),
+    // };
+    // const data = await trackInfo({ expressCompanyCode, logisticsNo: deliveryNo });
+    // if (!data) {
+    //   notification.info({ message: '暂无物流信息' });
+    //   return;
+    // }
+    // tempObj.expressCompanyName = data.logisticsName;
+    // tempObj.deliveryNo = data.logisticsBillNo;
+    // if (data.logisticsList?.length) {
+    //   data.logisticsList.forEach(v => {
+    //     tempObj.detailList = [...tempObj.detailList, ...v.detailList];
+    //   });
+    // }
+    // setLogisticsComModalVisible(true);
+    // setLogisticsComList(tempObj);
   };
 
   // 物流拦截
@@ -439,6 +444,8 @@ const AfterSale = props => {
         onCancel={closeModal}
         dataSource={cancelDetailInfo}
       />
+
+      <LogisticsRecordModal ref={logisticsRecordModalRef} />
     </PageHeaderWrapper>
   );
 };

src/pages/AfterSaleManage/index.less

@@ -59,3 +59,24 @@
     }
   }
 }
+
+.logistics-record {
+  &__topbar {
+    margin-bottom: 15px;
+    padding-left: 10px;
+    color: #000;
+    font-weight: bold;
+    font-size: 16px;
+    border-left: 10px solid #2391fe;
+  }
+  &__head {
+    padding-bottom: 25px;
+    color: #000;
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 1;
+    .no {
+      margin-left: 20px;
+    }
+  }
+}

src/pages/AfterSaleManage/services.js

@@ -131,6 +131,21 @@ export async function getLogisticsRecord(params) {
   });
 }
 
+/**
+ * 多物流发货-查询物流轨迹
+ * @see http://yapi.quantgroups.com/project/389/interface/api/46120
+ */
+
+export function apiDeliveriesTraceList(data) {
+  return request.post('/api/merchants/deliveries/trace/list', {
+    data: stringify(data),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+    prefix: kdspApi,
+  });
+}
+
 // 查询售后待办数量
 export function getAfterPendingNum(data) {
   return request.post('/api/kdsp/op/afs/getPendingNum', {

src/pages/orderManage/pendingDeliveryOrder/components/LogisticsCom.jsx

@@ -31,7 +31,7 @@ const LogisticsCom = props => {
             // eslint-disable-next-line react/no-array-index-key
             <Timeline.Item color={index > 0 ? 'gray' : 'blue'} key={index}>
               <p>{item.desc}</p>
-              <p>{item.logisticsTime}</p>
+              <p>{item.time}</p>
             </Timeline.Item>
           ))}
         </Timeline>

src/pages/orderManage/pendingDeliveryOrder/components/MultiLogisticsModal/index.less

+.sku-list-module {
+  margin-bottom: 20px;
+  padding: 10px 20px;
+  border: 1px solid #f2f2f2;
+  &__index {
+    margin-bottom: 5px;
+    font-weight: 700;
+    font-size: 14px;
+  }
+}
+
+.sku-list-box {
+  padding-bottom: 10px;
+  .sku-list {
+    display: flex;
+    // padding-bottom: 19px;
+    &__goods-name {
+      flex: 1;
+      margin-bottom: 0 !important;
+    }
+
+    &__goods-count {
+      width: 100px;
+      margin-bottom: 5px !important;
+    }
+  }
+}
+
+.operation {
+  font-size: 24px;
+  text-align: center;
+  > * {
+    margin: 0 10px;
+  }
+}

src/pages/orderManage/pendingDeliveryOrder/index.jsx

@@ -12,6 +12,8 @@ import LogisticsForm from './components/LogisticsForm';
 import PopoverDom from './components/PreviewImage';
 import LogisticsCom from './components/LogisticsCom';
 import DelayDeliverGoods from './components/DelayDeliverGoods';
+
+import MultiLogisticsModal from './components/MultiLogisticsModal';
 import {
   queryToSend,
   queryExpress,
@@ -19,6 +21,8 @@ import {
   getLogistics,
   downOrder,
   getJDLogisticsInfo,
+  apiQueryOrderInfo,
+  apiDeliveriesTraceList,
 } from './service';
 
 const { confirm } = Modal;
@@ -58,25 +62,34 @@ const TableList = props => {
   // const endDisabledDate = current =>
   //   current && (current.diff(startTime, 'days') > 30 || current.diff(startTime, 'days') < 0);
 
+  const multiLogisticsModalRef = useRef();
   const actionRef = useRef();
   const ref = useRef(FormInstance);
-  const handleCom = async (record, skuItem) => {
+  const handleCom = async (skuInfo, expressInfo) => {
     const tempObj = {
-      expressCompanyCode: skuItem?.expressCompanyCode ?? '',
-      expressCompanyName: skuItem.expressCompanyName ?? '',
-      deliveryNo: skuItem?.deliveryNo ?? '',
+      expressCompanyCode: expressInfo?.expressCompanyCode ?? '',
+      expressCompanyName: expressInfo.expressCompanyName ?? '',
+      deliveryNo: expressInfo?.expressNo ?? '',
       detailList: [],
       key: Date.now(),
     };
-    const data = await getJDLogisticsInfo(skuItem.orderSkuId);
+
+    const res = await apiDeliveriesTraceList({
+      expressCompanyCode: expressInfo.expressCompanyCode,
+      expressNo: expressInfo.expressNo,
+      orderNo: skuInfo.orderNo,
+    });
+
+    const data = res.data[0];
+    console.log(data);
     if (!data) {
       notification.info({ message: '暂无物流信息' });
       return;
     }
-    tempObj.expressCompanyName = data?.logisticsName || tempObj.expressCompanyName;
-    tempObj.deliveryNo = data?.logisticsBillNo || tempObj.deliveryNo;
-    if (data.logisticsList?.length) {
-      data.logisticsList.forEach(v => {
+    tempObj.expressCompanyName = data?.expressCompanyName || tempObj.expressCompanyName;
+    tempObj.deliveryNo = data?.expressNo || tempObj.deliveryNo;
+    if (data.traceList?.length) {
+      data.traceList.forEach(v => {
         tempObj.detailList = [...tempObj.detailList, ...v.detailList];
       });
     }
@@ -109,8 +122,13 @@ const TableList = props => {
 
   const renderContent = (record, key) => {
     if (record.mchOrderSkuVoList) {
-      return record?.mchOrderSkuVoList.map((item, index) => (
-        <p
+      return record?.mchOrderSkuVoList.map((item, index) => {
+        const tableContentHeight = item?.expressList?.length || 1;
+
+        return (
+          <div
+            // eslint-disable-next-line prefer-template
+            style={{ height: tableContentHeight * 60 + 'px' }}
             className={[
               'tableContent',
               index < record?.mchOrderSkuVoList?.length - 1 ? 'border' : null,
@@ -118,21 +136,46 @@ const TableList = props => {
             key={item.orderSkuId}
           >
             {key === 'skuName' ? <PopoverDom name={item[key]} url={item.imageUrl} /> : ''}
-          {key === 'action' && props.type === 2 ? (
-            <Button
-              size="small"
-              type="primary"
+            {key === 'expressCompanyName' ? (
+              <div className="expressList">
+                {item.expressList?.map((info, idx) => (
+                  <span
+                    className={[
+                      'subContent',
+                      idx < item.expressList?.length - 1 ? 'border' : null,
+                    ].join(' ')}
+                  >
+                    {info.expressCompanyName}
+                  </span>
+                ))}
+              </div>
+            ) : (
+              ''
+            )}
+
+            {key === 'deliveryNo' ? (
+              <div className="expressList">
+                {item.expressList?.map((info, idx) => (
+                  <a
                     onClick={() => {
-                handleCom(record, item);
+                      handleCom(item, info);
                     }}
+                    className={[
+                      'subContent',
+                      idx < item.expressList?.length - 1 ? 'border' : null,
+                    ].join(' ')}
                   >
-              查看物流
-            </Button>
+                    {info.expressNo}
+                  </a>
+                ))}
+              </div>
             ) : (
-            item[key]
+              ''
             )}
-        </p>
-      ));
+            {item[key]}
+          </div>
+        );
+      });
     }
     return '';
   };
@@ -148,7 +191,7 @@ const TableList = props => {
 
   const columns = [
     {
-      title: '订单ID',
+      title: '订单号',
       dataIndex: 'orderNo',
       key: 'orderNo',
       order: 6,
@@ -322,7 +365,7 @@ const TableList = props => {
       title: '物流公司',
       dataIndex: 'expressCompanyName',
       key: 'expressCompanyName',
-      width: 100,
+      width: 120,
       className: 'colStyle',
       hideInSearch: true,
       render: (_, record) => renderContent(record, 'expressCompanyName'),
@@ -331,20 +374,20 @@ const TableList = props => {
       title: '物流单号',
       dataIndex: 'deliveryNo',
       key: 'deliveryNo',
-      width: 180,
+      width: 210,
       className: 'colStyle',
       hideInSearch: true,
       render: (_, record) => renderContent(record, 'deliveryNo'),
     },
-    {
-      title: '物流信息',
-      dataIndex: 'action',
-      key: 'action',
-      width: 150,
-      hideInSearch: true,
-      className: 'colStyle',
-      render: (_, record) => renderContent(record, 'action'),
-    },
+    // {
+    //   title: '物流信息',
+    //   dataIndex: 'action',
+    //   key: 'action',
+    //   width: 150,
+    //   hideInSearch: true,
+    //   className: 'colStyle',
+    //   render: (_, record) => renderContent(record, 'action'),
+    // },
     {
       title: '订单状态',
       dataIndex: 'orderStatusDesc',
@@ -400,19 +443,30 @@ const TableList = props => {
                 marginBottom: '10px',
               }}
               onClick={async () => {
-                const skuListData = await getGoods(record?.orderId);
-                let logisticsData = [{}];
-                setSkuList(skuListData);
-                const data = await getLogistics(record?.orderId);
-                logisticsData = data.map(item => ({
-                  selectedGoods: item?.skus?.map(sku => sku?.orderSkuId),
-                  selectedCompany: item.expressCompanyCode
-                    ? `${item?.expressCompanyCode}-${item?.expressCompanyName}`
-                    : null,
-                  orderNum: item?.deliveryNo,
-                }));
-                setLogisticsData(logisticsData);
-                handleModalVisible(true);
+                // const skuListData = await getGoods(record?.orderId);
+                // let logisticsData = [{}];
+                // setSkuList(skuListData);
+                // const data = await getLogistics(record?.orderId);
+                // logisticsData = data.map(item => ({
+                //   selectedGoods: item?.skus?.map(sku => sku?.orderSkuId),
+                //   selectedCompany: item.expressCompanyCode
+                //     ? `${item?.expressCompanyCode}-${item?.expressCompanyName}`
+                //     : null,
+                //   orderNum: item?.deliveryNo,
+                // }));
+                // setLogisticsData(logisticsData);
+                // handleModalVisible(true);
+                const res = await apiQueryOrderInfo({
+                  orderNo: record.orderNo,
+                });
+
+                multiLogisticsModalRef.current.open(
+                  {
+                    ...record,
+                    packageList: res.data.packageList || [],
+                  },
+                  actionRef,
+                );
               }}
             >
               {props.type === 2 ? '更新物流信息' : '填写物流信息'}
@@ -566,6 +620,8 @@ const TableList = props => {
         orderId={delayOrderIDs}
         onCancel={e => onCancelDelay(e)}
       />
+
+      <MultiLogisticsModal companys={companys} ref={multiLogisticsModalRef} />
     </PageHeaderWrapper>
   );
 };

src/pages/orderManage/pendingDeliveryOrder/index.less

@@ -5,12 +5,30 @@
     .tableContent {
       display: flex;
       align-items: center;
-      height: 60px;
-      padding: 16px;
+      // height: 60px;
+      min-height: 60px;
+      padding: 0 12px;
     }
     .border {
       border-bottom: 1px solid #e8e8e8;
     }
+
+    .subContent {
+      flex: 1;
+      padding: 12px;
+      overflow: hidden;
+      line-height: 36px;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .expressList {
+      display: flex;
+      flex-direction: column;
+      width: calc(100% + 24px);
+      height: 100%;
+      margin: -12px;
+    }
     tbody .colStyle {
       padding: 0;
     }

src/pages/orderManage/pendingDeliveryOrder/service.js

@@ -62,7 +62,7 @@ export async function getLogistics(orderId) {
 export async function uploadFile(file) {
   const params = new FormData();
   params.append('file', file);
-  const data = await request.post('/api/kdsp/op/mch-order/order-logistics-batch-import', {
+  const data = await request.post('/api/merchants/orders/deliveries/batches/import', {
     data: params,
     prefix: config.kdspApi,
   });
@@ -71,7 +71,8 @@ export async function uploadFile(file) {
 export function downTemplate() {
   window.location.href =
     // 'https://kdspstatic.q-gp.com/%E8%AE%A2%E5%8D%95%E7%89%A9%E6%B5%81%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF-v1.xlsx';
-    'https://kdspstatic.q-gp.com/order_import_templatev2.xlsx';
+    // 'https://kdspstatic.q-gp.com/order_import_templatev2.xlsx';
+    'https://sc-img.q-gp.com/orders/templates/batch_deliveriesV2.xlsx';
 }
 export async function downOrder(params) {
   const data = await request.post('/api/kdsp/op/mch-order/order-export', {
@@ -151,3 +152,86 @@ export function apiDelayDeliverGoods(data) {
     prefix: config.kdspApi,
   });
 }
+
+/**
+ * 多物流发货-查询多物流订单信息
+ * @param {*} params
+ * @returns
+ * @see http://yapi.quantgroups.com/project/389/interface/api/45840
+ */
+export function apiQueryOrderInfo(params) {
+  // return new Promise(resolve => {
+  //   setTimeout(() => {
+  //     resolve({
+  //       packageList: [
+  //         {
+  //           expressCompanyCode: 'yunda',
+  //           expressCompanyName: '',
+  //           expressNo: 'YUNDA012345678',
+  //           serialNumber: '0011223344',
+  //           skuInfoList: [
+  //             {
+  //               skuNo: ['529355424931841'],
+  //               quantity: '2',
+  //             },
+  //             {
+  //               skuNo: ['530724210084865'],
+  //               quantity: '12',
+  //             },
+  //           ],
+  //         },
+  //         {
+  //           expressCompanyCode: 'yunda',
+  //           expressCompanyName: '',
+  //           expressNo: 'YUNDA012345678',
+  //           serialNumber: '0011223344',
+  //           skuInfoList: [
+  //             {
+  //               skuNo: ['529355424931841'],
+  //               quantity: '2',
+  //             },
+  //           ],
+  //         },
+  //       ],
+  //     });
+  //   }, 1000);
+  // });
+  return request.get('/api/merchants/orders/deliveries/packages/detail', {
+    params,
+    prefix: config.kdspApi,
+  });
+}
+/**
+ * 多物流发货-新建发货/更新发货信息
+ * @param {*} data
+ * @returns
+ * @see http://yapi.quantgroups.com/project/389/interface/api/45816
+ */
+export function apiDeliveriesAdd(data) {
+  return request.post('/api/merchants/orders/deliveries/add', {
+    data,
+    prefix: config.kdspApi,
+  });
+}
+
+export function apiDeliveriesEdit(data) {
+  return request.post('/api/merchants/orders/deliveries/edit', {
+    data,
+    prefix: config.kdspApi,
+  });
+}
+
+/**
+ * 多物流发货-查询物流轨迹
+ * @see http://yapi.quantgroups.com/project/389/interface/api/46120
+ */
+
+export function apiDeliveriesTraceList(data) {
+  return request.post('/api/merchants/deliveries/trace/list', {
+    data: stringify(data),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+    prefix: config.kdspApi,
+  });
+}

src/pages/orderManage/queryOrder/components/CustomTable/index.jsx

@@ -45,7 +45,7 @@ const CustomTable = props => {
         subDataItem && subDataItem[key] !== undefined ? subDataItem[key] : dataSourceItem[key];
 
       let rowSpan = 1;
-      // 设置了自动合并 && 只设置第一条数据的值，其他的返回<></</>
+      // 设置了自动合并 && 只设置第一条数据的值，其他的返回<></>
       if (column.rowSpanMode === 'auto' && subData) {
         rowSpan = subData.length;
         if (subDataIndex > 0) {

src/pages/orderManage/queryOrder/index.jsx

-import { Form, Tabs, Input, Button, Pagination } from 'antd';
+import { Form, Tabs, Input, Button, Pagination, notification } from 'antd';
 import React, { useState, useEffect, useRef } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { connect } from 'dva';
 import { QUERY_ORDER } from '@/../config/permission.config';
+import { values } from 'lodash';
 import style from './index.less';
 import { CustomTable } from './components/CustomTable/index';
 import { FormSearch, SEARCH_TYPE } from './components/FormSearch/index';
 
-import LogisticsForm from './components/LogisticsFormModel';
+import MultiLogisticsModal from '../pendingDeliveryOrder/components/MultiLogisticsModal';
+import LogisticsCom from '../pendingDeliveryOrder/components/LogisticsCom';
 import DetailModal from './components/DetailModal/index';
 
 import { queryOrderList, getGoods, getLogistics, queryExpress, queryToSend } from './service';
+import { apiQueryOrderInfo, apiDeliveriesTraceList } from '../pendingDeliveryOrder/service';
 import { ORDER_SEARCH_TYPE, ORDER_TYPE, ORDER_STATUS } from './const';
 
 const { TabPane } = Tabs;
@@ -20,16 +23,15 @@ const OrderList = props => {
   const canEditable = permissions[QUERY_ORDER.EDITABLE];
   const [loading, setLoading] = useState(false);
   const detailModalRef = useRef();
+  const multiLogisticsModalRef = useRef();
 
   /** @module 发货弹框 */
   // 物流公司数据
   const [companys, setCompanys] = useState([]);
-  // 物流弹出框展示
-  const [LogisticsModalVisible, handleModalVisible] = useState(false);
-  // 订单下商品列表
-  const [skuList, setSkuList] = useState([]);
-  // 当前物流数据
-  const [LogisticsData, setLogisticsData] = useState([{}]);
+
+  /** @module 查看物流记录 */
+  const [LogisticsComList, setLogisticsComList] = useState({});
+  const [LogisticsComModalVisible, handleComModalVisible] = useState(false);
 
   /**  @module 表格区域 */
   const [tableData, setTableData] = useState([]);
@@ -95,12 +97,50 @@ const OrderList = props => {
     });
   }
 
+  // 获取物流记录信息
+  const handleCom = async (skuInfo, expressInfo) => {
+    const tempObj = {
+      expressCompanyCode: expressInfo?.expressCompanyCode ?? '',
+      expressCompanyName: expressInfo.expressCompanyName ?? '',
+      deliveryNo: expressInfo?.expressNo ?? '',
+      detailList: [],
+      key: Date.now(),
+    };
+
+    const res = await apiDeliveriesTraceList({
+      expressCompanyCode: expressInfo.expressCompanyCode,
+      expressNo: expressInfo.expressNo,
+      orderNo: skuInfo.orderNo,
+    });
+
+    const data = res.data[0];
+    console.log(data);
+    if (!data) {
+      notification.info({ message: '暂无物流信息' });
+      return;
+    }
+    tempObj.expressCompanyName = data?.expressCompanyName || tempObj.expressCompanyName;
+    tempObj.deliveryNo = data?.expressNo || tempObj.deliveryNo;
+    if (data.traceList?.length) {
+      data.traceList.forEach(v => {
+        tempObj.detailList = [...tempObj.detailList, ...v.detailList];
+      });
+    }
+    handleComModalVisible(true);
+    setLogisticsComList(tempObj);
+  };
+
   // 重载
   const reload = () => {
-    handleModalVisible(false);
     getOrderList();
   };
 
+  const actionRef = {
+    current: {
+      reload,
+    },
+  };
+
   // 获取物流公司列表
   const getCompanys = async () => {
     const res = await queryExpress();
@@ -267,9 +307,27 @@ const OrderList = props => {
     },
     {
       title: '配送方式',
-      dataIndex: 'deliveryType',
-      rowSpanMode: 'auto',
+      dataIndex: 'deliveryMethodList',
+      // rowSpanMode: 'auto',
       width: 150,
+      render: ({ value, record, subRecord }) => {
+        console.log(value);
+        const info = {
+          orderNo: record.orderNoStr,
+        };
+        return value?.map(item => (
+          <p>
+            {item.expressCompanyName}/
+            <a
+              onClick={() => {
+                handleCom(info, item);
+              }}
+            >
+              {item.expressNo}
+            </a>
+          </p>
+        ));
+      },
     },
     {
       title: '售后',
@@ -315,19 +373,23 @@ const OrderList = props => {
               <Button
                 type="primary"
                 onClick={async () => {
-                  const skuListData = await getGoods(record?.orderId);
-                  let logisticsData = [{}];
-                  setSkuList(skuListData);
-                  const res = await getLogistics(record?.orderId);
-                  logisticsData = res.map(item => ({
-                    selectedGoods: item?.skus?.map(sku => sku?.orderSkuId),
-                    selectedCompany: item.expressCompanyCode
-                      ? `${item?.expressCompanyCode}-${item?.expressCompanyName}`
-                      : null,
-                    orderNum: item?.deliveryNo,
-                  }));
-                  setLogisticsData(logisticsData);
-                  handleModalVisible(true);
+                  const res = await apiQueryOrderInfo({
+                    orderNo: record.orderNoStr,
+                  });
+
+                  multiLogisticsModalRef.current.open(
+                    {
+                      ...record,
+                      orderNo: record.orderNoStr,
+                      mchOrderSkuVoList: record.skuVos.map(item => ({
+                        ...item,
+                        skuNo: item.skuId?.toString(),
+                        orderNo: record.orderNoStr,
+                      })),
+                      packageList: res.data.packageList || [],
+                    },
+                    actionRef,
+                  );
                 }}
               >
                 {text}
@@ -406,15 +468,14 @@ const OrderList = props => {
         )}
       </div>
 
-      <LogisticsForm
+      <LogisticsCom
         onSubmit={reload}
-        skuList={skuList}
-        companys={companys}
-        onCancel={() => handleModalVisible(false)}
-        modalVisible={LogisticsModalVisible}
-        value={LogisticsData}
+        onCancel={() => handleComModalVisible(false)}
+        modalVisible={LogisticsComModalVisible}
+        value={LogisticsComList}
+        key={LogisticsComList.key}
       />
-
+      <MultiLogisticsModal companys={companys} ref={multiLogisticsModalRef} />
       <DetailModal ref={detailModalRef} />
     </PageHeaderWrapper>
   );