fix：处理销售订单物流单入库单跳转，处理采购下单签电子合同校验问题

src/locales/zh-CN/menu.ts

@@ -71,9 +71,9 @@ export default {
   'menu.commodityAbility.adjustRepository': '仓位库存调拨',
   'menu.commodityAbility.priceManage': '价格管理',
   'menu.commodityAbility.priceManage.priceStrategy': '价格策略',
-  'menu.commodityAbility.priceManage.priceStrategy.addStrategy': '新建商品价格策略',
-  'menu.commodityAbility.priceManage.priceStrategy.editStrategy': '编辑商品价格策略',
-  'menu.commodityAbility.priceManage.priceStrategy.previewStrategy': '查看商品价格策略',
+  'menu.commodityAbility.priceManage.addStrategy': '新建商品价格策略',
+  'menu.commodityAbility.priceManage.editStrategy': '编辑商品价格策略',
+  'menu.commodityAbility.priceManage.previewStrategy': '查看商品价格策略',
   'menu.commodityAbility.priceManage.fastModifyPrice': '快捷修改单价',
   // 会员能力
   'menu.memberAbility': '会员',

src/pages/priceManage/constant/index.tsx

@@ -35,9 +35,9 @@ export const columnsSetMember: any[] = [
 export const columnsSetProduct: any[] = [
     {
       title: '商品ID',
-      dataIndex: 'id',
+      dataIndex: 'commodityId',
       align: 'center',
-      key: 'id',
+      key: 'commodityId',
     },
     {
       title: '商品名称',

src/pages/priceManage/priceStrategy/component/PriceSetting.tsx

@@ -69,7 +69,7 @@ const selectMemberAction = createFormActions()
 const PriceSetting:React.FC<PriceSettingProps> = (props) => {
   const { addSchemaAction, schema, formSubmit, onFieldChange = () => {} } = props
   const [visibleChannelMember, setVisibleChannelMember] = useState(false)
-  const [visibleChannelRroduct, setVisibleChannelRroduct] = useState(false)
+  const [visibleProduct, setVisibleProduct] = useState(false)
   const [visibleUnitProduct, setVisibleUnitProduct] = useState(false)
   const [modifyModal, setModifyModal] = useState(false)
 
@@ -161,16 +161,6 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
       priceTypeList: [1, 2],
     })
     return res.data
-
-    // const shopType = addSchemaAction.getFieldValue('shopType')
-    // let shopInfo: any = GlobalConfig.web.shopInfo.filter(item => item.id === shopType)
-    // console.log(shopInfo, 'skhopIndo0')
-    // const res = await PublicApi.getProductCommodityCommonGetCommodityListBySeller({
-    //   shopType,
-    //   environment: shopInfo[0].environment,
-    //   priceTypeList: [1, 2],
-    // })
-    // return res.data
   }
 
   // 指定规格商品列表
@@ -219,7 +209,7 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
       message.error('请先选择商品')
       return false
     }
-    // setVisibleChannelRroduct(true)
+    setVisibleUnitProduct(true)
   }
 
   const handleSetProductPrice = (id: any) => {
@@ -234,7 +224,7 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
       return false
     }
 
-    setVisibleChannelRroduct(true)
+    setVisibleProduct(true)
   }
   // 新增会员
   const tableAddMemberButton =
@@ -267,15 +257,39 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
     <Button style={{marginBottom: 16}} block icon={<PlusOutlined/>} onClick={handleAddProductUnitBtn} type='dashed'>选择商品规格</Button>
     </>
     // : null
+
   const tableProductColumns = [
-    { dataIndex: 'memberId', title: 'ID', },
-    { dataIndex: 'name', title: '商品名称' },
-    { dataIndex: 'memberTypeName', title: '颜色' },
-    { dataIndex: 'memberTypeName', title: '尺码' },
-    { dataIndex: 'memberTypeName', title: '对应货品' },
-    { dataIndex: 'memberTypeName', title: '单价(元)' },
+    // { dataIndex: 'memberId', title: 'ID', },
+    {
+      dataIndex: 'name',
+      title: '商品名称',
+    },
     {
-      dataIndex: 'ctl', title: '操作', render: (_, record) => <>
+      dataIndex: 'memberTypeName',
+      title: '颜色',
+     },
+    {
+      dataIndex: 'memberTypeName',
+      title: '尺码'
+    },
+    {
+      dataIndex: 'memberTypeName',
+      title: '对应货品'
+    },
+    {
+      dataIndex: 'memberTypeName',
+      title: '单价(元)',
+      render: (text, record) => {
+        if (!text || JSON.stringify(text)==='{}') return null
+        return Object.keys(text).map((v, i) => {
+          return <><span key={i}>{v==='0-0'?'':`${v}:`} <span style={{color:'red'}}>{priceType===3?'':'￥'}{text[v]}</span></span><br /></>
+        })
+      }
+    },
+    {
+      dataIndex: 'ctl',
+      title: '操作',
+      render: (_, record) => <>
         <Button type='link' onClick={() => handleDeleteProductTable(record.productId)}>删除</Button>
         <Button type='link' onClick={() => handleSetProductPrice(record.productId)}>设置价格</Button>
         </>
@@ -285,7 +299,6 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
   // 选择商品
   const connectProduct = <div className='connectBtn' onClick={handleAddProductBtn}><LinkOutlined style={{marginRight: 4}}/>选择</div>
 
-
   // 仓位设置表单提交
   const handleSubmit = async (values) => {
     formSubmit && formSubmit(values)
@@ -304,23 +317,24 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
 
   // 商品添加弹窗控制
   const handleOkAddProduct = async () => {
-    setVisibleChannelRroduct(false)
+    setVisibleProduct(false)
     const selectResult = productRowCtl.selectRow[0]
     if (!selectResult) {
       return null
     }
+    console.log(selectResult,'selectResult')
     const goodsId = selectResult.goodsId
     setProductState(selectResult)
     addSchemaAction.setFieldValue('productName', selectResult.name)
-    addSchemaAction.setFieldValue('category', selectResult.customerCategoryName)
-    addSchemaAction.setFieldValue('brand', selectResult.brandName)
-    addSchemaAction.setFieldValue('unit', selectResult.unitName)
-    addSchemaAction.setFieldValue('productId', selectResult.id)
-    addSchemaAction.setFieldState('inventory', state => {
-      state.props["x-props"] = {
-        addonAfter: <div style={{marginLeft: 4}}>{selectResult.unitName}</div>
-      }
-    })
+    addSchemaAction.setFieldValue('productId', selectResult.commodityId)
+    // addSchemaAction.setFieldValue('category', selectResult.customerCategoryName)
+    // addSchemaAction.setFieldValue('brand', selectResult.brandName)
+    // addSchemaAction.setFieldValue('unit', selectResult.unitName)
+    // addSchemaAction.setFieldState('inventory', state => {
+    //   state.props["x-props"] = {
+    //     addonAfter: <div style={{marginLeft: 4}}>{selectResult.unitName}</div>
+    //   }
+    // })
 
     // 商品有可能没有货品, 没有货品时不请求
     if (goodsId) {
@@ -349,7 +363,7 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
   }
 
   const handleCancelAddProduct = () => {
-    setVisibleChannelRroduct(false)
+    setVisibleProduct(false)
   }
 
   // 规格商品添加弹窗控制
@@ -358,7 +372,7 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
   }
 
   const handleCancelAddSpec = () => {
-
+    setVisibleUnitProduct(false)
   }
 
   const paginationChange = async (page: number, size: number) => {
@@ -506,7 +520,7 @@ const PriceSetting:React.FC<PriceSettingProps> = (props) => {
         modalTitle='选择商品'
         confirm={handleOkAddProduct}
         cancel={handleCancelAddProduct}
-        visible={visibleChannelRroduct}
+        visible={visibleProduct}
         columns={columnsSetProduct}
         rowSelection={productRowSelection}
         fetchTableData={params => fetchProductList(params)}

src/pages/priceManage/schema/index.tsx

@@ -206,23 +206,11 @@ export const setPriceSchema: ISchema = {
                   },
                   required: true
                 },
-                category: {
-                  type: 'string',
-                  display: false
-                },
-                brand: {
-                  type: 'string',
-                  display: false
-                },
-                unit: {
-                  type: 'string',
-                  display: false
-                },
                 productId: {
                   type: 'string',
                   display: false
                 },
-                inventoryDeductWay: {
+                priceType: {
                   type: 'radio',
                   title: '商品定价',
                   required: true,
@@ -237,7 +225,19 @@ export const setPriceSchema: ISchema = {
                     }
                   ],
                   default: 1
-                }
+                },
+                 // category: {
+                //   type: 'string',
+                //   display: false
+                // },
+                // brand: {
+                //   type: 'string',
+                //   display: false
+                // },
+                // unit: {
+                //   type: 'string',
+                //   display: false
+                // },
               }
             }
           }

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

@@ -184,6 +184,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       dataIndex: 'deliveryNo',
       align: 'center',
       key: 'deliveryNo',
+      render: text => <a href={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?deliveryNo=${text}`}>{text}</a>
     },
     {
       title: '发货时间',
@@ -197,6 +198,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       dataIndex: 'logisticsNo',
       align: 'center',
       key: 'logisticsNo',
+      render: text => <a href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${data.orderNo}`}>{text}</a>
     },
     {
       title: '物流公司',

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

-import React, { useRef } from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { PurchaseOrderInsideWorkState } from '@/constants'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-
-// 一级待审核订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderProcurementReviewedListOne(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref,
-    rowSelection,
-    rowSelectionCtl
-  } = useSelfTable()
-
-  const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedAll)
-
-  const handleSubmitBatch = async () => {
-    if (rowSelectionCtl.selectRow.length === 0) {
-      message.error('请先勾选订单')
-      return ;
-    }
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER)
-    if (canBitch) {
-      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
-      if (code === 1000) {
-        ref.current.reload()
-        rowSelectionCtl.setSelectRow([])
-        rowSelectionCtl.setSelectedRowKeys([])
-      }
-    } else {
-      message.error('只能批量提交内部状态为审核中的订单')
-    }
-  }
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React, { useRef } from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState } from '@/constants'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+
+// 一级待审核订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderProcurementReviewedListOne(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  } = useSelfTable()
+
+  const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedAll)
+
+  const handleSubmitBatch = async () => {
+    if (rowSelectionCtl.selectRow.length === 0) {
+      message.error('请先勾选订单')
+      return ;
+    }
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER)
+    if (canBitch) {
+      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
+      if (code === 1000) {
+        ref.current.reload()
+        rowSelectionCtl.setSelectRow([])
+        rowSelectionCtl.setSelectedRowKeys([])
+      }
+    } else {
+      message.error('只能批量提交内部状态为审核中的订单')
+    }
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder

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

@@ -297,10 +297,10 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
           if(!judgementByCount || judgementByCount.includes(false)){
             throw new Error('请填写商品采购数量')
           }
-          // 校验简单电子合同必选
-          if(processEnum === 24 && !usingElectronicContracts){
-            throw new Error('此订单必须签署电子合同')
-          }
+          // // 校验简单电子合同必选
+          // if(processEnum === 24 && !usingElectronicContracts){
+          //   throw new Error('此订单必须签署电子合同')
+          // }
           // logistics render字段字符串化
           params.orderProductRequests = params.orderProductRequests.map(item => {
             let logistics: any = { ...item.logistics, render: item.logistics?.render ? JSON.stringify(item.logistics.render) : '' };

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

-import React from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import { DatePicker } from '@formily/antd-components'
-import { useSelfTable } from './model/useReadyAddOrder'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { PurchaseOrderInsideWorkState } from '@/constants'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-
-// 待新增订单
-
-export interface ReadyAddOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderProcurementStayAddList(params)
-  return data
-}
-
-// TODO
-const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
-  const { run: deleteRun } = useHttpRequest(PublicApi.postOrderProcurementOrderDeleteAll)
-  const { loading: submitLoading, run: submitRun } = useHttpRequest(PublicApi.postOrderProcurementOrderSubmitExamineAll)
-
-  const { columns, ref, rowSelection, rowSelectionCtl } = useSelfTable()
-  const handleMenuClick = async (e) => {
-    switch(e.key) {
-      case '1': {
-        // 批量删除
-        const canDelete = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ADD_PURCHASE_ORDER)
-        if (canDelete) {
-          const { code } = await deleteRun({ids: rowSelectionCtl.selectedRowKeys})
-          if (code === 1000) {
-            ref.current.reload()
-            rowSelectionCtl.setSelectRow([])
-            rowSelectionCtl.setSelectedRowKeys([])
-          }
-        } else {
-          message.error('只能删除内部状态为未审核过的订单')
-        }
-        break;
-      }
-    }
-  }
-
-  const handleBitchPush = async () => {
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ADD_PURCHASE_ORDER)
-    if (canBitch) {
-      const { code } = await submitRun({ids: rowSelectionCtl.selectedRowKeys})
-      if (code === 1000) {
-        ref.current.reload()
-        rowSelectionCtl.setSelectRow([])
-        rowSelectionCtl.setSelectedRowKeys([])
-      }
-    } else {
-      message.error('只能提交审核待新增的订单')
-    }
-  }
-
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button 
-              icon={<PlusCircleOutlined/>} 
-              type='primary' 
-              // onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/orderDetail')}
-              onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/add')}
-            >
-              新建
-            </Button>
-            <Button onClick={handleBitchPush} loading={submitLoading}>批量提交审核</Button>
-            <DropDeleteDown>
-              <Menu onClick={(e) => handleMenuClick(e)}>
-                <Menu.Item key="1" icon={<DeleteOutlined />}>
-                  批量删除
-                </Menu.Item>
-              </Menu>
-            </DropDeleteDown>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-ReadyAddOrder.defaultProps = {}
-
-export default ReadyAddOrder
\ No newline at end of file
+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { DatePicker } from '@formily/antd-components'
+import { useSelfTable } from './model/useReadyAddOrder'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState } from '@/constants'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+
+// 待新增订单
+
+export interface ReadyAddOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderProcurementStayAddList(params)
+  return data
+}
+
+// TODO
+const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
+  const { run: deleteRun } = useHttpRequest(PublicApi.postOrderProcurementOrderDeleteAll)
+  const { loading: submitLoading, run: submitRun } = useHttpRequest(PublicApi.postOrderProcurementOrderSubmitExamineAll)
+
+  const { columns, ref, rowSelection, rowSelectionCtl } = useSelfTable()
+  const handleMenuClick = async (e) => {
+    switch(e.key) {
+      case '1': {
+        // 批量删除
+        const canDelete = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ADD_PURCHASE_ORDER)
+        if (canDelete) {
+          const { code } = await deleteRun({ids: rowSelectionCtl.selectedRowKeys})
+          if (code === 1000) {
+            ref.current.reload()
+            rowSelectionCtl.setSelectRow([])
+            rowSelectionCtl.setSelectedRowKeys([])
+          }
+        } else {
+          message.error('只能删除内部状态为未审核过的订单')
+        }
+        break;
+      }
+    }
+  }
+
+  const handleBitchPush = async () => {
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ADD_PURCHASE_ORDER)
+    if (canBitch) {
+      const { code } = await submitRun({ids: rowSelectionCtl.selectedRowKeys})
+      if (code === 1000) {
+        ref.current.reload()
+        rowSelectionCtl.setSelectRow([])
+        rowSelectionCtl.setSelectedRowKeys([])
+      }
+    } else {
+      message.error('只能提交审核待新增的订单')
+    }
+  }
+
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button
+              icon={<PlusCircleOutlined/>}
+              type='primary'
+              // onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/orderDetail')}
+              onClick={() => history.push('/memberCenter/tranactionAbility/purchaseOrder/readyAddOrder/add')}
+            >
+              新建
+            </Button>
+            <Button onClick={handleBitchPush} loading={submitLoading}>批量提交审核</Button>
+            <DropDeleteDown>
+              <Menu onClick={(e) => handleMenuClick(e)}>
+                <Menu.Item key="1" icon={<DeleteOutlined />}>
+                  批量删除
+                </Menu.Item>
+              </Menu>
+            </DropDeleteDown>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+ReadyAddOrder.defaultProps = {}
+
+export default ReadyAddOrder

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

-import React, { useRef } from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-
-// 待归档订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderFiledOrderList(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref,
-    rowSelection,
-    rowSelectionCtl
-  } = useSelfTable()
-  const { run, loading } = useHttpRequest(PublicApi.postOrderFiledOrderAddAll)
-
-  const handleSubmitBatch = async () => {
-    if (rowSelectionCtl.selectRow.length === 0) {
-      message.error('请先勾选订单')
-      return ;
-    }
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.FILLING_ORDER)
-    if (canBitch) {
-      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
-      if (code === 1000) {
-        rowSelectionCtl.setSelectRow([])
-        rowSelectionCtl.setSelectedRowKeys([])
-        ref.current.reload()
-      }
-    } else {
-      message.error('只能批量提交内部状态为待确认归档的订单')
-    }
-  }
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React, { useRef } from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+
+// 待归档订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderFiledOrderList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  } = useSelfTable()
+  const { run, loading } = useHttpRequest(PublicApi.postOrderFiledOrderAddAll)
+
+  const handleSubmitBatch = async () => {
+    if (rowSelectionCtl.selectRow.length === 0) {
+      message.error('请先勾选订单')
+      return ;
+    }
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.FILLING_ORDER)
+    if (canBitch) {
+      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
+      if (code === 1000) {
+        rowSelectionCtl.setSelectRow([])
+        rowSelectionCtl.setSelectedRowKeys([])
+        ref.current.reload()
+      }
+    } else {
+      message.error('只能批量提交内部状态为待确认归档的订单')
+    }
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder

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

-import React from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-import { PurchaseOrderOutWorkState, PurchaseOrderInsideWorkState } from '@/constants'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-
-// 待提交订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderProcurementSubmitList(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref,
-    rowSelection,
-    rowSelectionCtl
-  } = useSelfTable()
-  const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderSubmitAll)
-
-  const handleBitchPush = async () => {
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.externalState !== PurchaseOrderOutWorkState.SUBMIT_ORDER || v.interiorState !== PurchaseOrderInsideWorkState.SUBMIT_ORDER)
-    if (canBitch) {
-      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
-      if (code === 1000) {
-        ref.current.reload()
-        rowSelectionCtl.setSelectRow([])
-        rowSelectionCtl.setSelectedRowKeys([])
-      }
-    } else {
-      message.error('只能提交内部状态为审核通过并且外部状态为待提交的订单')
-    }
-  }
-
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        rowSelection={rowSelection}
-        fetchTableData={params => fetchTableData(params)}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleBitchPush} loading={loading}>批量提交</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+import { PurchaseOrderOutWorkState, PurchaseOrderInsideWorkState } from '@/constants'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+
+// 待提交订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderProcurementSubmitList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  } = useSelfTable()
+  const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderSubmitAll)
+
+  const handleBitchPush = async () => {
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.externalState !== PurchaseOrderOutWorkState.SUBMIT_ORDER || v.interiorState !== PurchaseOrderInsideWorkState.SUBMIT_ORDER)
+    if (canBitch) {
+      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
+      if (code === 1000) {
+        ref.current.reload()
+        rowSelectionCtl.setSelectRow([])
+        rowSelectionCtl.setSelectedRowKeys([])
+      }
+    } else {
+      message.error('只能提交内部状态为审核通过并且外部状态为待提交的订单')
+    }
+  }
+
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        rowSelection={rowSelection}
+        fetchTableData={params => fetchTableData(params)}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleBitchPush} loading={loading}>批量提交</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder

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

-import React from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-
-// 二级待审核订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderProcurementReviewedListTwo(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref
-  } = useSelfTable()
-  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
-  const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedAllTwo)
-
-  const handleSubmitBatch = async () => {
-    const { code } = await run({
-      ids: rowSelectionCtl.selectedRowKeys
-    })
-
-    if (code === 1000) {
-      // 清空选中的值
-      ref.current.reload()
-      rowSelectionCtl.setSelectRow([])
-      rowSelectionCtl.setSelectedRowKeys([])
-    }
-  }
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+
+// 二级待审核订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderProcurementReviewedListTwo(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref
+  } = useSelfTable()
+  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
+  const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedAllTwo)
+
+  const handleSubmitBatch = async () => {
+    const { code } = await run({
+      ids: rowSelectionCtl.selectedRowKeys
+    })
+
+    if (code === 1000) {
+      // 清空选中的值
+      ref.current.reload()
+      rowSelectionCtl.setSelectRow([])
+      rowSelectionCtl.setSelectedRowKeys([])
+    }
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder

src/pages/transaction/saleOrder/firstApprovedOrder/index.tsx

-import React, { useRef } from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-
-// 一级待审核订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderSubmittedReviewOrderOneList(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref,
-    rowSelection,
-    rowSelectionCtl
-  } = useSelfTable()
-
-  const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOneAll)
-
-  const handleBitchPush = async () => {
-    if (rowSelectionCtl.selectedRowKeys.length > 0) {
-      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
-      if (code === 1000) {
-        rowSelectionCtl.setSelectRow([])
-        rowSelectionCtl.setSelectedRowKeys([])
-        ref.current.reload()
-      }
-    } else {
-      message.error('请勾选要审核的订单')
-    }
-  }
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleBitchPush} loading={loading}>批量提交审核</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React, { useRef } from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+
+// 一级待审核订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderSubmittedReviewOrderOneList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  } = useSelfTable()
+
+  const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOneAll)
+
+  const handleBitchPush = async () => {
+    if (rowSelectionCtl.selectedRowKeys.length > 0) {
+      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
+      if (code === 1000) {
+        rowSelectionCtl.setSelectRow([])
+        rowSelectionCtl.setSelectedRowKeys([])
+        ref.current.reload()
+      }
+    } else {
+      message.error('请勾选要审核的订单')
+    }
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleBitchPush} loading={loading}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder

src/pages/transaction/saleOrder/readyReturnDocument/index.tsx

-import React, { useRef } from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-
-// 待归档订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderListOfOrdersToBeFiled(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref,
-    rowSelection,
-    rowSelectionCtl
-  } = useSelfTable()
-  const { run, loading } = useHttpRequest(PublicApi.postOrderOfOrdersToBeFiledAll)
-
-  const handleSubmitBatch = async () => {
-    if (rowSelectionCtl.selectRow.length === 0) {
-      message.error('请先勾选订单')
-      return ;
-    }
-    const canBitch = !rowSelectionCtl.selectRow.some(v => v.purchaseOrderInteriorState !== SaleOrderInsideWorkState.FILLING_ORDER)
-    if (canBitch) {
-      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
-      if (code === 1000) {
-        rowSelectionCtl.setSelectRow([])
-        rowSelectionCtl.setSelectedRowKeys([])
-        ref.current.reload()
-      }
-    } else {
-      message.error('只能批量提交内部状态为待确认归档的订单')
-    }
-  }
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React, { useRef } from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+
+// 待归档订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderListOfOrdersToBeFiled(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  } = useSelfTable()
+  const { run, loading } = useHttpRequest(PublicApi.postOrderOfOrdersToBeFiledAll)
+
+  const handleSubmitBatch = async () => {
+    if (rowSelectionCtl.selectRow.length === 0) {
+      message.error('请先勾选订单')
+      return ;
+    }
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.purchaseOrderInteriorState !== SaleOrderInsideWorkState.FILLING_ORDER)
+    if (canBitch) {
+      const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
+      if (code === 1000) {
+        rowSelectionCtl.setSelectRow([])
+        rowSelectionCtl.setSelectedRowKeys([])
+        ref.current.reload()
+      }
+    } else {
+      message.error('只能批量提交内部状态为待确认归档的订单')
+    }
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder

src/pages/transaction/saleOrder/secondApprovedOrder/index.tsx

-import React from 'react'
-import { history } from 'umi'
-import { Card, Button, Space, Dropdown, Menu } from 'antd'
-import { StandardTable } from 'god'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { PublicApi } from '@/services/api'
-import { useSelfTable } from './model/useSelfTable'
-import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
-import DropDeleteDown from '@/components/DropDeleteDown'
-import { tableListSchema } from './schema'
-import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
-import { FORM_FILTER_PATH } from '@/formSchema/const'
-import Submit from '@/components/NiceForm/components/Submit'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { useHttpRequest } from '@/hooks/useHttpRequest'
-import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
-
-// 二级待审核订单
-
-export interface FirstApprovedOrderProps {}
-
-const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderSubmittedReviewOrderTwoList(params)
-  return data
-}
-
-// TODO
-const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
-  const {
-    columns,
-    ref
-  } = useSelfTable()
-  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
-  const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderTwoAll)
-
-  const handleSubmitBatch = async () => {
-    const { code } = await run({
-      ids: rowSelectionCtl.selectedRowKeys
-    })
-    if (code === 1000) {
-      rowSelectionCtl.setSelectRow([])
-      rowSelectionCtl.setSelectedRowKeys([])
-      ref.current.reload()
-    }
-
-  }
-  return <PageHeaderWrapper>
-    <Card>
-      <StandardTable
-        fetchTableData={params => fetchTableData(params)}
-        rowSelection={rowSelection}
-        columns={columns}
-        currentRef={ref}
-        rowKey={'id'}
-        formilyLayouts={{
-          justify: 'space-between'
-        }}
-        formilyProps={{
-          ctx: {
-            inline: false,
-            schema: tableListSchema,
-            effects: ($, actions) => {
-              useStateFilterSearchLinkageEffect(
-                $,
-                actions,
-                'orderNo',
-                FORM_FILTER_PATH,
-              );
-            },
-            components: {
-              DateRangePickerUnix,
-              Submit
-            }
-          },
-          layouts: {
-            order: 2,
-            span: 16
-          }
-        }}
-        formilyChilds={{
-          children: <Space>
-            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
-          </Space>,
-          layouts: {
-            span: 8
-          }
-        }}
-      />
-    </Card>
-  </PageHeaderWrapper>
-}
-
-FirstApprovedOrder.defaultProps = {}
-
-export default FirstApprovedOrder
\ No newline at end of file
+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { useHttpRequest } from '@/hooks/useHttpRequest'
+import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
+
+// 二级待审核订单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderSubmittedReviewOrderTwoList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref
+  } = useSelfTable()
+  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
+  const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderTwoAll)
+
+  const handleSubmitBatch = async () => {
+    const { code } = await run({
+      ids: rowSelectionCtl.selectedRowKeys
+    })
+    if (code === 1000) {
+      rowSelectionCtl.setSelectRow([])
+      rowSelectionCtl.setSelectedRowKeys([])
+      ref.current.reload()
+    }
+
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePickerUnix,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 24
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder