Merge branch 'dev' into test

ab35d354 · 前端-许佳敏 · 42288c05 · de997cf6 · ab35d354
Commit ab35d354 authored Nov 06, 2020 by 前端-许佳敏
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

index.tsx ...Order/orderCollect/components/productModalTable/index.tsx +1 -1

No files found.
--- a/src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx
+++ b/src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx
@@ -138,7 +138,7 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {

  const handleConfirmProduct = async () => {
    // 判断所选择的商品是否属于同一个工作流
-    const { code, data } = await PublicApi.postOrderIsWorkFlow({productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
+    const { code, data } = await PublicApi.postOrderIsWorkFlow({memberId: rowSelectionCtl.selectRow[0].memberId, productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })

    if (code === 1000) {
      const productData = schemaAction.getFieldValue('orderProductRequests')