fix: 处理订单收发货明细展开异常

src/pages/transaction/components/orderDeleveRecord/index.tsx

@@ -285,7 +285,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
             deliveryDetails?.length > 0 && <Tabs.TabPane tab='订单收发货明细' key="2">
               <NestTable
                 NestColumns={[sideOrderCols, sideChildrenCols]}
-                rowKey='id'
+                rowKey='batchNo'
                 childrenDataKey='products'
                 dataSource={deliveryDetails}
               />

src/pages/transaction/components/orderHandDeleved/components/productTableCell/index.tsx

@@ -79,7 +79,7 @@ export const ProductTableCell:React.FC<ProductTableCellProps> = ({
       <Form.Item
         className="customFormItem"
         name={dataIndex}
-        initialValue={record[dataIndex] || ''}
+        initialValue={record[dataIndex]}
         rules={[
           {
             required: true,

src/pages/transaction/components/orderHandDeleved/index.tsx

@@ -22,8 +22,13 @@ const schema: ISchema = {
       type: 'object',
       "x-component": "mega-layout",
       "x-component-props": {
+        // labelAlign: 'left',
+        // labelCol: 6,
+        grid: true,
+        autoRow: true,
+        labelCol: 4,
         labelAlign: 'left',
-        labelCol: 6,
+        columns: 2
       },
       properties: {
         addresId: {
@@ -35,7 +40,10 @@ const schema: ISchema = {
               message: '请选择发货地址',
               required: true
             }
-          ]
+          ],
+          "x-mega-props": {
+            span: 1
+          }
         },
         deliveryTime: {
           type: 'string',
@@ -48,7 +56,8 @@ const schema: ISchema = {
             }
           ],
           "x-mega-props": {
-            full: true
+            full: true,
+            span: 1
           }
         },
         logisticsNo: {
@@ -63,7 +72,10 @@ const schema: ISchema = {
               limitByte: true,
               maxByte: 20
             },
-          ]
+          ],
+          "x-mega-props": {
+            span: 1
+          }
         },
         logisticsCompanyId: {
           type: 'string',
@@ -74,7 +86,10 @@ const schema: ISchema = {
               message: '请选择物流公司',
               required: true
             }
-          ]
+          ],
+          "x-mega-props": {
+            span: 1
+          }
         },
         products: {
           type: 'array',
@@ -86,6 +101,9 @@ const schema: ISchema = {
             // expandable: "{{productChildren}}",
             // pagination: { size: 'small' }
           },
+          "x-mega-props": {
+            span: 2
+          }
         },
         address: {
           type: 'string',
@@ -99,6 +117,7 @@ const schema: ISchema = {
     }
   }
 }
+
 const OrderHandDeleveModal:React.FC<OrderHandDeleveModalProps> = (props) => {
   const { data } = useContext(OrderDetailContext)
   const dataRef = useRef<any>({})

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -343,7 +343,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
                 columns={outOrderCols}
                 dataSource={deliveries}
                 pagination={false}
-                rowKey="id"
+                rowKey="productId"
               />
             </Tabs.TabPane>
           }
@@ -351,7 +351,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
             deliveryDetails?.length > 0 && <Tabs.TabPane tab='订单收发货明细' key="2">
               <NestTable
                 NestColumns={[sideOrderCols, sideChildrenCols]}
-                rowKey='id'
+                rowKey='batchNo'
                 childrenDataKey='products'
                 dataSource={deliveryDetails}
               />

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/detail/index.tsx

@@ -20,7 +20,8 @@ const ReadyConfirmDelevedOrderDetail: React.FC = () => {
   // const isShowBtn = isHandDeleved || formContext.data?.orderDeliveryDetailsResponses?.some(v => v.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER)
 
   // 是否发过货
-  const isHandDeleved = Number(batchNo) <= 0
+  // const isHandDeleved = Number(batchNo) <= 0
+  const isHandDeleved = true
 
   // 是否发货完成