Merge branch 'dev' into test

src/pages/transaction/demandPosts/components/detail.tsx

@@ -292,7 +292,7 @@ const detailInfo: React.FC<detailParams> = (props) => {
 
   const fetchData = (params?: any) => {
     return new Promise(resolve => {
-      PublicApi.getOrderRequisitionFormProductList({ ...params }).then(res => {
+      PublicApi.getOrderRequisitionFormProductList({id, ...params }).then(res => {
         if (res.code === 1000) {
           const arr: any[] = []
           res.data.data.forEach((item: any, index: number) => {
@@ -520,7 +520,7 @@ const detailInfo: React.FC<detailParams> = (props) => {
           {data.type === 1 &&
             <Form.Item name='shopIds' noStyle wrapperCol={{ span: 24 }}>
               <Checkbox.Group disabled className={style.checkbox_wrap_style}>
-                <Row>
+                <Row gutter={[24,24]}>
                   {
                     goodAllIds.map((v: any, i: number) => {
                       return (

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

@@ -87,7 +87,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
       }
       case 'select': {
         const { options, ...rest } = formItemProps
-        console.log(originOptions)
         // 支付方式
         if (dataIndex === 'payWay') {
           return <Select ref={formItemRef}
@@ -116,7 +115,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
 
       }
     }
-    console.log(type, originOptions, childOptions)
   }
 
   let childNode = children;

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

@@ -205,7 +205,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
             // theInvoiceInfo: value.theInvoiceInfo
           }
           // 校验是否选择支付渠道
-          console.log(params, 'params')
           let judgementByPay = params.paymentInformationResponses.map(item => {
             if(item.channel && item.payWay){
               return true

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

@@ -99,7 +99,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
         ...item,
         ...row,
       });
-      ctx.setFieldValue('paymentInfor+mationResponses', newData)
+      ctx.setFieldValue('paymentInformationResponses', newData)
       resolve({item, newData})
     })