fix:修改统一收发货文案

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

@@ -162,19 +162,19 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
   const { orderReceivingStatisticsResponses, orderDeliveryDetailsResponses } = data
   const sideOrderCols: any[] = [
     {
-      title: '收货批次',
+      title: '发货批次',
       dataIndex: 'deliveryBatch',
       align: 'center',
       key: 'deliveryBatch'
     },
     {
-      title: '收货单号',
+      title: '发货单号',
       dataIndex: 'deliveryNo',
       align: 'center',
       key: 'deliveryNo',
     },
     {
-      title: '收货时间',
+      title: '发货时间',
       dataIndex: 'deliveryTime',
       align: 'center',
       key: 'deliveryTime',

src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx

@@ -137,11 +137,16 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
   }, [])
 
   const handleConfirmProduct = async () => {
+    // 判断所选择的商品是否属于同一个工作流
+    const { code, data } = await PublicApi.postOrderIsWorkFlow({productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
+
+    if (code === 1000) {
       const productData = schemaAction.getFieldValue('orderProductRequests')
       schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow))
       confirmModal && confirmModal()
       setVisible(false)
     }
+  }
 
   const fetchProductList = (values) => {
     const modelType = schemaAction.getFieldValue('orderModel')

src/pages/transaction/purchaseOrder/orderCollect/model/useProductTable.tsx

@@ -44,7 +44,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
       productInfoColumns[productInfoColumns.length - 1].render = (text, record) => {
         return <>
           <Button type='link' onClick={() => handleDelete(record)}>删除</Button>
-          <Button type='link'>选择合并订单</Button>
+          {/* <Button type='link'>选择合并订单</Button> */}
         </>
       }
     } else {