Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/transaction/purchaseOrder/index.less

@@ -7,3 +7,12 @@
 //     margin-top: 24px !important;
 //   }
 // }
+
+
+.adjustFormItem {
+  :global{
+    .ant-radio-button-wrapper {
+      margin-right: 16px;
+    }
+  }
+}

src/pages/transaction/purchaseOrder/index.tsx

@@ -13,6 +13,7 @@ import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePicke
 import NiceForm from '@/components/NiceForm'
 import { createFormActions } from '@formily/antd'
 import styled from 'styled-components'
+import styles from './index.less'
 import cx from 'classnames'
 import ModalForm from '@/components/ModalForm'
 import { useHttpRequest } from '@/hooks/useHttpRequest'
@@ -409,7 +410,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
                 "x-component-props": {
                   disabled: false,
                   optionType: 'button',
-                  // className: styles.adjustFormItem
+                  className: styles.adjustFormItem
                 },
               },
               reason: {

src/pages/transaction/purchaseOrder/orderCollectB2b/index.less

+.adjustFormItem {
+  :global{
+    .ant-radio-button-wrapper {
+      margin-right: 16px;
+    }
+  }
+}

src/pages/transaction/purchaseOrder/orderCollectB2b/schema/index.ts

 import { ISchema } from '@formily/antd';
-import { GlobalConfig } from '@/global/config';
-import moment from 'moment'
+import styles from '../index.less'
 
 // 将获取的商城转化为可用类型
 // const getShopTypeMap = (() => {
@@ -280,7 +279,7 @@ const submitInfo: ISchema = {
               "x-component-props": {
                 disabled: false,
                 optionType: 'button',
-                // className: styles.adjustFormItem
+                className: styles.adjustFormItem
               },
             },
           }

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

@@ -24,9 +24,6 @@ import { changeRouterTitleByStatus } from '../../_public/order/utils'
 import { ReadyAddOrderDetailContext } from '../context'
 import { help } from '../../common'
 import styles from './index.less'
-import { getAuth } from '@/utils/auth';
-import { fectchShopListsSource } from '@/utils/type'
-import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
 import { fetchOrderApi } from './apis'
 import MemberModalTable from './components/memberModalTable'
 import { GlobalConfig } from '@/global/config'
@@ -111,7 +108,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', () => {
 })
 
 /** 现货采购订单 下单 */
-const AgentOrderDetail:React.FC<AgentOrderDetailProps> = (props) => {
+const AgentOrderDetail:React.FC<AgentOrderDetailProps> = () => {
   const shopDataRef = useRef<any>({})
   const memberRef = useRef<any>({})
   const [formLoading, setFormLoading] = useState(false)
@@ -409,7 +406,7 @@ const AgentOrderDetail:React.FC<AgentOrderDetailProps> = (props) => {
                   hasMemberType: 1,
                   memberId: state.value,
                   roleId: addSchemaAction.getFieldValue('vendorRoleId')
-                })
+                }, { ctlType: "none" })
                 ctx.setFieldState('shopId', prevState => {
                   prevState.props.enum = data.map(item => ({ ...item, label: item.name, value: item.id }))
                 })

src/pages/transaction/saleOrder/agentOrder/index.less

+.adjustFormItem {
+  :global{
+    .ant-radio-button-wrapper {
+      margin-right: 16px;
+    }
+  }
+}

src/pages/transaction/saleOrder/agentOrder/schema/index.ts

 import { ISchema } from '@formily/antd';
+import styles from '../index.less'
 
 // 基本信息
 const basicInfo: ISchema = {
@@ -242,7 +243,7 @@ const submitInfo: ISchema = {
               "x-component-props": {
                 disabled: false,
                 optionType: 'button',
-                // className: styles.adjustFormItem
+                className: styles.adjustFormItem
               },
             },
           }