Merge branch 'fix418' of https://gitlab.shushangyun.com/weipengzhong/pro-platform into fix418

src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx

@@ -97,7 +97,7 @@ function DeliveryNoticeFromCreate() {
     service.getForomService().setTableData(tableDataSource);
     service.getForomService().submit().then(res => {
       if (res.code === 1000) {
-        handleAnchor(false)
+        handleLeave(false)
         setTimeout(() => {
           history.go(-1)
         }, 1000);

src/pages/order/receivingNote/deliveryNoteManage/schema/index.tsx

@@ -19,13 +19,6 @@ export const deliveryNoteManageSchema: ISchema = {
             className: 'useMegaStart'
           },
           properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
             'receiveNo': {
               type: 'string',
               'x-component': 'Search',

src/pages/order/receivingNote/deliveryNoteQuery/schema/index.tsx

@@ -19,13 +19,6 @@ export const deliveryNoteQuerySchema: ISchema = {
             className: 'useMegaStart'
           },
           properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
             'deliveryNo': {
               type: 'string',
               'x-component': 'Search',

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/logisticsAbility/logisticsAdminister/logisticsCompanyManage/add.tsx

@@ -123,7 +123,7 @@ const LogisticsCompanyManageAdded = (props: any) => {
     }
     if (values.cooperateType === COOPERATE.PLATFORM) {
       params.companyMemberId = values.companyMemberId;
-      params.companyRoleId = excludeList[0].roleId;
+      params.companyRoleId = values.companyRoleId || excludeList[0].roleId;
     } else {
       params.code = values.code
     }
@@ -199,16 +199,17 @@ const LogisticsCompanyManageAdded = (props: any) => {
       >
         <Card>
           <NiceForm
+            previewPlaceholder='-'
             initialValues={formatedValue}
             actions={formActions}
             onSubmit={handleOnSubmit}
             expressionScope={{
-              connectMember: (
+              connectMember: path !== 'preview' ? (
                 <div onClick={() => toggle(true)}>
                   <LinkOutlined style={{ marginRight: 4 }} />
                   {intl.formatMessage({ id: 'logistics.xuanze' })}
                 </div>
-              )
+              ) : null
             }}
             effects={() => {
               useFormEffects();

src/pages/transaction/purchaseAbility/onlineBid/readyBid/detail/index.tsx

@@ -41,7 +41,7 @@ const Detail = () => {
 
   useEffect(() => {
     const _data = purchaseBiddingMessageSupplier?.data
-    if (purchaseBiddingMessageSupplier && !isEmpty(dataSource)) {
+    if (purchaseBiddingMessageSupplier && !isEmpty(dataSource) && _data.id == onlineId) {
       const _obj = {
         ranking: _data.ranking,
         minLowPrice: _data.minPrice,

src/pages/transaction/purchaseRequisition/increaseRequisition/components/RadioNode/index.tsx

@@ -12,9 +12,9 @@ const RadioNode = (props) => {
       state.props.deliveryType = e.target.value
       // 如果他选择的客户自提 就让他恢复默认的输入框
       const Address = form.getFieldState('deliveryAddressId')
-      const name = Address.value.name ? Address.value.name : Address.value.receiverName;
-      const addres = Address.value.fullAddress ? Address.value.fullAddress : Address.value.streetName + Address.value.address + Address.value.phone;
       if (Address.value) {
+        const name = Address.value.name ? Address.value.name : Address.value.receiverName;
+        const addres = Address.value.fullAddress ? Address.value.fullAddress : Address.value.streetName + Address.value.address + Address.value.phone;
         form.setFieldState('deliveryAddress', state => {
           state.visible = true;
           state.value = `${name} - ${addres}`

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)