required 的封装。 add 和 edit页面同时修改

src/components/FormItem/index.ts

-export { default as FormItem } from './FormItem'
\ No newline at end of file
+export { default as FormItem } from './FormItem'
+
+export const required = (msg: string = "") => {
+  return (
+    {
+      required: true,
+      message: msg
+    }
+  )
+}
\ No newline at end of file

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

@@ -9,7 +9,7 @@ import { BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTi
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
 import { Input, Table, Row, Col, Select, Radio, Form, Button } from 'antd';
 import { DeliveryNoticeTableColumn } from '../../constants/page-table-column';
-import { FormItem } from '@/components/FormItem';
+import { FormItem, required } from '@/components/FormItem';
 import { DatePickerSelect } from '@/components/DatePickerSelect'
 import { AddressDrawer } from '@/components/AddressDrawer';
 import { getLogisticsSelectListReceiverAddress, getLogisticsSelectListShipperAddress, postLogisticsReceiverAddressAdd, postLogisticsReceiverAddressUpdate, postLogisticsShipperAddressAdd, postLogisticsShipperAddressUpdate } from '@/services/LogisticsV2Api';
@@ -74,7 +74,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
         </FormItem>
 
         <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
-          <FormItem label={DeliveryAbstractLabel} name="digest">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={DeliveryAbstractLabel} name="digest">
             <Input />
           </FormItem>
 
@@ -82,7 +86,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             <Input />
           </FormItem>
 
-          <FormItem label={BuyerLabel} name="member">
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={BuyerLabel} name="member">
             <RoleSelect formatFeils={(e) => {
               return {
                 buyerMemberId: e.memberId,
@@ -96,11 +104,19 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
         <ContentBox title={Distribution.name} id={Distribution.key}>
 
-          <FormItem label={DeliveryDateLabel} name="deliveryTime">
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={DeliveryDateLabel} name="deliveryTime">
             <DatePickerSelect className='w-full' />
           </FormItem>
 
-          <FormItem label={DeliveryNameLabel} name="deliveryVO">
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={DeliveryNameLabel} name="deliveryVO">
             <AddressDrawer
               addressListRequest={(val) => {
                 return getLogisticsSelectListReceiverAddress(val)
@@ -116,21 +132,38 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             />
           </FormItem>
 
-          <FormItem label={DeliveryTimeLabel} name="deliveryRangeTime">
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={DeliveryTimeLabel} name="deliveryRangeTime">
             <DatePickerSelect.RangePicker className="w-full" picker='time' />
           </FormItem>
 
-          <FormItem label={DeliveryPhoneLabel} name="executorVO.phone">
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
           </FormItem>
         </ContentBox>
 
-        <ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
-          <FormItem label={ConsigneeTimeLabel} name="sendTime">
+        <ContentBox
+         title={DeliveryInfo.name} id={DeliveryInfo.key}>
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={ConsigneeTimeLabel} name="sendTime">
             <DatePickerSelect className="w-full" />
           </FormItem>
 
-          <FormItem label={ReceivingAddress} name="receiveVO">
+          <FormItem
+          rules={[
+            required()
+          ]}
+          label={ReceivingAddress} name="receiveVO">
             <AddressDrawer
               addressListRequest={(val) => {
                 return getLogisticsSelectListShipperAddress(val)
@@ -150,7 +183,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
         <ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>
 
-          <FormItem label={DeliveryTypeLabel} name="deliveryType">
+          <FormItem 
+          rules={[
+            required()
+          ]}
+          label={DeliveryTypeLabel} name="deliveryType">
             <Radio.Group>
               <Radio.Button value={1}>物流</Radio.Button>
               <Radio.Button value={2}>自提</Radio.Button>
@@ -161,11 +198,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
           <FormItem label={LogisticsCarNoLabel} name="executorVO.carNumbers">
             <Input />
           </FormItem>
-          <FormItem label={LogisticsCompanyLabel} name="logisticsCompanyInt"
-            rules={[
-              { required: true }
-            ]}
-          >
+          <FormItem label={LogisticsCompanyLabel} name="logisticsCompanyInt">
             <LogisticsCompanyMerchantsSelect />
           </FormItem>
           <FormItem label={LogisticsNoLabel} name="logisticsNo">
@@ -175,6 +208,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
 
         <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
+          {/* 在编辑的时候不需要进行此操作 */}
           <DeliveryGoodTableSelect
             form={form}
             onChange={(value) => {

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

@@ -9,7 +9,7 @@ import { BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTi
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
 import { Input, Table, Row, Col, Select, Radio, Form, Button } from 'antd';
 import { DeliveryNoticeTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
-import { FormItem } from '@/components/FormItem';
+import { FormItem, required } from '@/components/FormItem';
 import { DatePickerSelect } from '@/components/DatePickerSelect'
 import { AddressDrawer } from '@/components/AddressDrawer';
 import { getLogisticsSelectListReceiverAddress, getLogisticsSelectListShipperAddress, postLogisticsReceiverAddressAdd, postLogisticsReceiverAddressUpdate, postLogisticsShipperAddressAdd, postLogisticsShipperAddressUpdate } from '@/services/LogisticsV2Api';
@@ -92,7 +92,9 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
         </FormItem>
 
         <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
-          <FormItem label={DeliveryAbstractLabel} name="digest">
+          <FormItem rules={[
+            required()
+          ]} label={DeliveryAbstractLabel} name="digest">
             <Input />
           </FormItem>
 
@@ -100,7 +102,11 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
             <Input />
           </FormItem>
 
-          <FormItem label={BuyerLabel} name="member">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={BuyerLabel} name="member">
             <RoleSelect formatFeils={(e) => {
               return {
                 buyerMemberId: e.id,
@@ -114,11 +120,19 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
 
         <ContentBox title={Distribution.name} id={Distribution.key}>
 
-          <FormItem label={DeliveryDateLabel} name="deliveryTime">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={DeliveryDateLabel} name="deliveryTime">
             <DatePickerSelect className='w-full' />
           </FormItem>
 
-          <FormItem label={DeliveryNameLabel} name="deliveryVO">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={DeliveryNameLabel} name="deliveryVO">
             <AddressDrawer
               addressListRequest={(val) => {
                 return getLogisticsSelectListReceiverAddress(val)
@@ -134,7 +148,11 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
             />
           </FormItem>
 
-          <FormItem label={DeliveryTimeLabel} name="deliveryRangeTime">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={DeliveryTimeLabel} name="deliveryRangeTime">
             <DatePickerSelect.RangePicker className="w-full" picker='time' />
           </FormItem>
 
@@ -144,11 +162,19 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
         </ContentBox>
 
         <ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
-          <FormItem label={ConsigneeTimeLabel} name="sendTime">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={ConsigneeTimeLabel} name="sendTime">
             <DatePickerSelect className="w-full" />
           </FormItem>
 
-          <FormItem label={ReceivingAddress} name="receiveVO">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={ReceivingAddress} name="receiveVO">
             <AddressDrawer
               disabled={true}
               addressListRequest={(val) => {
@@ -169,7 +195,11 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
 
         <ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>
 
-          <FormItem label={DeliveryTypeLabel} name="deliveryType">
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={DeliveryTypeLabel} name="deliveryType">
             <Radio.Group>
               <Radio value={0}>物流</Radio>
               <Radio value={1}>自提</Radio>
@@ -194,31 +224,21 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
 
 
         <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
-          <DeliveryGoodTableSelect
-            form={form}
-            onChange={(value) => {
-              setTableDataSource(value)
-            }}
-          />
 
-          <HarvestMaterialContextProvider value={{
-            dataSource: tableDataSource
-          }}>
-            <Table
-              rowKey={row => row.orderNo}
-              columns={[
-                ...DeliveryNoticeTableColumn,
-                {
-                  ...DeliveryNumColumn,
-                  dataIndex: 'deliveryCount',
-                  render: (t, rcode, index) => {
-                    return t
-                  }
+          <Table
+            rowKey={row => row.orderNo}
+            columns={[
+              ...DeliveryNoticeTableColumn,
+              {
+                ...DeliveryNumColumn,
+                dataIndex: 'deliveryCount',
+                render: (t, rcode, index) => {
+                  return t
                 }
-              ]}
-              dataSource={tableDataSource}
-            />
-          </HarvestMaterialContextProvider>
+              }
+            ]}
+            dataSource={tableDataSource}
+          />
 
         </ContentBox>
       </Form>