Merge branch 'fix418' into 'v2-220418'

src/pages/procurement/components/bidDetailHeader/index.less

@@ -27,7 +27,7 @@
     .ant-row {
       .ant-col-2 {
         .ant-btn {
-          position: absolute;
+          position: fixed;
           // top: 0;
           right: 16px;
         }

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

@@ -261,6 +261,7 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
       visible={applyVisible}
       footer={footer}
       width={608}
+      onClose={() => setApplyVisible(false)}
     >
       <div>
         <Radio.Group className={style.raido_group} value={fieldState.useValue} onChange={e => handleCheck(e)}>

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

@@ -121,9 +121,9 @@ const ReadyAddB2bOrder:React.FC<ReadyAddB2bOrderProps> = () => {
               </Button>
             </AuthButton>
             <DropDeleteDown>
-              <Menu onClick={(e) => handleMenuClick(e)}>
+              <Menu>
                 <AuthButton btnCode="readyAddB2bOrder.piliangshanchu">
-                  <Menu.Item key="1" icon={<DeleteOutlined />}>
+                  <Menu.Item key="1" icon={<DeleteOutlined />} onClick={(e) => handleMenuClick({key: '1'})}>
                     {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})}
                   </Menu.Item>
                 </AuthButton>

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

@@ -119,9 +119,9 @@ const ReadyAddCashOrder:React.FC<ReadyAddCashOrderProps> = () => {
               </Button>
             </AuthButton>
             <DropDeleteDown>
-              <Menu onClick={(e) => handleMenuClick(e)}>
+              <Menu>
                 <AuthButton btnCode="readyAddCashOrder.piliangshanchu">
-                  <Menu.Item key="1" icon={<DeleteOutlined />}>
+                  <Menu.Item key="1" icon={<DeleteOutlined />} onClick={(e) => handleMenuClick({key: '1'})}>
                   {intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})}
                   </Menu.Item>
                 </AuthButton>

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

@@ -140,8 +140,8 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
             }
             </Button>
             <DropDeleteDown>
-              <Menu onClick={(e) => handleMenuClick(e)}>
-                <Menu.Item key="1" icon={<DeleteOutlined />}>
+              <Menu>
+                <Menu.Item key="1" icon={<DeleteOutlined />} onClick={(e) => handleMenuClick({key: '1'})}>
                   {
                     intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})
                   }

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

@@ -121,9 +121,9 @@ const ReadyAddRequisitionOrder:React.FC<ReadyAddRequisitionOrderProps> = () => {
               </Button>
             </AuthButton>
             <DropDeleteDown>
-              <Menu onClick={(e) => handleMenuClick(e)}>
+              <Menu>
                 <AuthButton btnCode="readyAddRequisitionOrder.shanchu">
-                  <Menu.Item key="1" icon={<DeleteOutlined />}>
+                  <Menu.Item key="1" icon={<DeleteOutlined />} onClick={(e) => handleMenuClick({key: '1'})}>
                     {
                       intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})
                     }

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

 import React from 'react'
 import { history, useIntl } from 'umi'
-import { Card, Button, Space, Menu, message } from 'antd'
+import { Card, Button, Space, Menu, message, Dropdown } from 'antd'
 import StandardTable from '@/components/StandardTable';
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { PlusCircleOutlined, DeleteOutlined } from '@ant-design/icons'
@@ -123,9 +123,9 @@ const ReadyAddSrmOrder:React.FC<ReadyAddSrmOrderProps> = () => {
               </Button>
             </AuthButton>
             <DropDeleteDown>
-              <Menu onClick={(e) => handleMenuClick(e)}>
+              <Menu>
                 <AuthButton btnCode="readyAddSrmOrder.piliangshanchu">
-                  <Menu.Item key="1" icon={<DeleteOutlined />}>
+                  <Menu.Item key="1" icon={<DeleteOutlined />} onClick={() => handleMenuClick({key: '1'})}>
                     {
                       intl.formatMessage({id: 'purchaseOrder.readyAddOrder.button3'})
                     }