feat: 修改订单查询发货和修改物流

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

@@ -32,8 +32,8 @@ const FormComponent = (props, ref) => {
       ...item,
       // 渲染所有商品选项，通过查找editData 是否存在判断是否选中
       skuInfoList: mchOrderSkuVoList.map((skuInfo, index) => {
-        const skuNo = skuInfo.skuNo.toString();
-        const editData = item.skuInfoList.find(ele => ele.skuNo.toString() === skuNo);
+        const skuNo = skuInfo.skuNo?.toString();
+        const editData = item.skuInfoList.find(ele => ele.skuNo?.toString() === skuNo);
         if (editData) {
           return {
             ...editData,

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

@@ -3,14 +3,16 @@ 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 DetailModal from './components/DetailModal/index';
 
 import { queryOrderList, getGoods, getLogistics, queryExpress, queryToSend } from './service';
+import { apiQueryOrderInfo } from '../pendingDeliveryOrder/service';
 import { ORDER_SEARCH_TYPE, ORDER_TYPE, ORDER_STATUS } from './const';
 
 const { TabPane } = Tabs;
@@ -20,6 +22,7 @@ const OrderList = props => {
   const canEditable = permissions[QUERY_ORDER.EDITABLE];
   const [loading, setLoading] = useState(false);
   const detailModalRef = useRef();
+  const multiLogisticsModalRef = useRef();
 
   /** @module 发货弹框 */
   // 物流公司数据
@@ -101,6 +104,12 @@ const OrderList = props => {
     getOrderList();
   };
 
+  const actionRef = {
+    current: {
+      reload,
+    },
+  };
+
   // 获取物流公司列表
   const getCompanys = async () => {
     const res = await queryExpress();
@@ -267,9 +276,13 @@ const OrderList = props => {
     },
     {
       title: '配送方式',
-      dataIndex: 'deliveryType',
-      rowSpanMode: 'auto',
+      dataIndex: 'deliveryTypeList',
+      // rowSpanMode: 'auto',
       width: 150,
+      render: ({ value, subRecord }) => {
+        console.log(value);
+        return value?.map(item => <p>{item}</p>);
+      },
     },
     {
       title: '售后',
@@ -315,19 +328,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,14 +423,7 @@ const OrderList = props => {
         )}
       </div>
 
-      <LogisticsForm
-        onSubmit={reload}
-        skuList={skuList}
-        companys={companys}
-        onCancel={() => handleModalVisible(false)}
-        modalVisible={LogisticsModalVisible}
-        value={LogisticsData}
-      />
+      <MultiLogisticsModal companys={companys} ref={multiLogisticsModalRef} />
 
       <DetailModal ref={detailModalRef} />
     </PageHeaderWrapper>