Merge branch 'v2-220518-order' into 'v2-220518'

src/pages/transaction/purchaseOrder/orderCollectSrm/model/useMaterialTable.tsx

 import React, { useRef, useState } from 'react'
 import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd';
-import { Button, message } from 'antd';
+import { Button, Image, message } from 'antd';
 import { materialInfoColumns, materialInfoColumnsByRequisition } from '../constant';
 import MaterialTableCell, { MaterialEditableRow } from '../components/materialTableCell';
 import { useModalTable } from './useModalTable';
@@ -8,6 +8,7 @@ import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
 import { useIntl } from 'umi';
 import { OrderModalType } from '@/constants/order';
 import { RequisitionModalTableRef } from '../components/requisitionModalTable';
+import plusIcon from '../images/plus.png';
 
 // 对象按key排序（运用于商城传过来的阶梯价格排序）
 export const sortByKey = (params) => {
@@ -101,7 +102,38 @@ export const useMaterialTable = (
     }
   }
 
-  const materialAddButton = <Button onClick={handleShowMaterial} block type='default' style={{margin: '24px auto'}}>{intl.formatMessage({id: 'purchaseOrder.orderCollect.requisition.button'})}</Button>
+  const materialAddButton = (() => {
+    const buttonStyles: React.CSSProperties = {
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      height: 32,
+      margin: '24px auto',
+      color: '#5C626A',
+      fontSize: 12,
+      background: '#FAFBFC',
+      border: '1px solid #EDEEEF',
+      borderRadius: '4px',
+    }
+    return (
+      <Button
+        type="default"
+        block
+        style={{...buttonStyles}}
+        onClick={handleShowMaterial}
+      >
+        <img
+          src={plusIcon}
+          style={{
+            width: 16,
+            height: 16,
+            marginRight: '8px',
+          }}
+        />
+        选择物料
+      </Button>
+    )
+  })()
   const materialComponents = {
     body: {
       row: MaterialEditableRow,

src/pages/transaction/purchaseOrder/orderCollectSrm/schema/index.ts

@@ -268,7 +268,7 @@ const submitInfo: ISchema = {
                 showTime: true,
                 format: 'YYYY-MM-DD HH:mm',
                 disabledDate: current => {
-                  return current && current < moment().startOf('day')
+                  return current && current < moment().startOf('m')
                 }
               }
             },