Merge branch '20418order' into 'v2-220418'

src/pages/order/deliveryNotice/manageB2B/index.tsx

@@ -32,12 +32,13 @@ const DeliveryNoticeManageB2B: React.FC = () => {
   const formActions = createFormActions()
 
   const controllerBtns = (<Space>
-    <Link to={"/memberCenter/order/deliveryNotice/manageB2B/add"}>
+    {/* <Link to={"/memberCenter/order/deliveryNotice/manageB2B/add"}>
       <Button type='primary' icon={<PlusOutlined />}>
         新增
       </Button>
-    </Link>
+    </Link> */}
   </Space>)
+
   const renderOptionButton = (record: any) => {
     const btnAuthOfOperationTextMap = {
       '修改': 'DevTest',
@@ -127,6 +128,9 @@ const DeliveryNoticeManageB2B: React.FC = () => {
             <NiceForm
               actions={formActions}
               onSubmit={values => ref.current.reload(values)}
+              expressionScope={{
+                controllerBtns,
+              }}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect(
                   $,

src/pages/order/deliveryNotice/manageSRM/index.tsx

@@ -32,11 +32,11 @@ const DeliveryNoticeManageSRM: React.FC = () => {
 
   const controllerBtns = (
     <Space>
-      <Link to="/memberCenter/order/deliveryNotice/manageSRM/add">
+      {/* <Link to="/memberCenter/order/deliveryNotice/manageSRM/add">
         <Button type='primary' icon={<PlusOutlined />}>
           新增
         </Button>
-      </Link>
+      </Link> */}
     </Space>
   )
   const renderOptionButton = (record: any) => {
@@ -123,7 +123,9 @@ const DeliveryNoticeManageSRM: React.FC = () => {
             <NiceForm
               actions={formActions}
               onSubmit={values => ref.current.reload(values)}
-         
+              expressionScope={{
+                controllerBtns,
+              }}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect(
                   $,