fix

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

@@ -31,7 +31,7 @@ const schema: ISchema = {
           title: '是否使用电子合同',
           enum: [
             { label: '是', value: 1 },
-            { label: '否', value: 2 },
+            { label: '否', value: 0 },
           ],
           default: 1,
           "x-linkages": [
@@ -188,7 +188,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
             useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id'])
           } else {
             actions.setFieldState('usingElectronicContracts', state => {
-              state.value = 2
+              state.value = 0
               state.props["x-component-props"] = {
                 disabled: true
               }

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

@@ -7,7 +7,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
 import { DELIVERY_TYPE, OrderModalType } from '@/constants'
 import { PublicApi } from '@/services/api'
 import { EnvironmentOutlined } from '@ant-design/icons'
-import { Popover, Space, Row } from 'antd'
+import { Popover, Space, Row, message } from 'antd'
 
 export interface ProductModalTableProps extends ModalTableProps {
   type?: 'radio' | 'checkbox',
@@ -138,13 +138,19 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
 
   const handleConfirmProduct = async () => {
     // 判断所选择的商品是否属于同一个工作流
+<<<<<<< HEAD
     const { code, data } = await PublicApi.postOrderIsWorkFlow({productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
+=======
+    const res = await PublicApi.postOrderIsWorkFlow({memberId: rowSelectionCtl.selectRow[0].memberId, productIds: rowSelectionCtl.selectedRowKeys}, { ctlType: 'none' })
+>>>>>>> 37febd41... fix：处理商城跳转过来的下单获取信息报错，处理销售订单审核是否使用合同参数异常
 
-    if (code === 1000) {
+    if (res.code === 1000) {
       const productData = schemaAction.getFieldValue('orderProductRequests')
       schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow))
       confirmModal && confirmModal()
       setVisible(false)
+    } else {
+      message.error(res.message)
     }
   }