Merge branch 'fix418' into 'v2-220418'

src/pages/repositories/components/batchPositionSetting.tsx

@@ -16,7 +16,7 @@ import Search from '@/components/NiceForm/components/Search'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import Submit from '@/components/NiceForm/components/Submit'
 import { MALL_TYPE } from '@/constants';
-import { fectchShopListsSource } from '@/utils/type'
+import { fectchShopListsSource, fectchShopListsSourceTradeRule } from '@/utils/type'
 import { getMemberManagePageitems, postMemberManageAllPageByshoptype } from '@/services/MemberV2Api'
 import { getProductCommodityCommonGetCommodityListByStock, getProductFreightSpaceDetails, getProductFreightSpaceMamberList, getProductSelectGetSelectBrand, getProductSelectGetSelectCustomerCategory } from '@/services/ProductV2Api'
 
@@ -498,7 +498,7 @@ const BatchPositionSetting: React.FC<BatchPositionSettingProps> = (props) => {
           createAddRepositoryEffect(addSchemaAction)
           $('onFieldValueChange', 'shopType').subscribe(async parentState => {
             if (parentState.value) {
-              const data = await fectchShopListsSource({ type: parentState.value })
+              const data = await fectchShopListsSourceTradeRule({ type: parentState.value })
               setFieldState('shopIds', state => {
                 state.props["x-component-props"].dataSource = data
               });

src/pages/transaction/saleOrder/index.tsx

@@ -264,7 +264,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
       const { code, data } = await postOrderVendorTransferPreview({
         roleId: defaultRoleId,
         orderIds: [orderId]
-      }, {ctlType: 'none'})
+      })
       if(code === 1000) {
         transformRef.current.setVisible(true)
         transformActions.setFieldValue('orders', data)
@@ -276,7 +276,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
       const { code, data } = await postOrderVendorTransferPreview({
         roleId: defaultRoleId,
         orderIds: selectRef.current,
-      }, { ctlType: 'none' })
+      })
       if(code === 1000) {
         transformRef.current.setVisible(true)
         transformActions.setFieldValue('orders', data)