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

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

@@ -29,6 +29,8 @@ import { useLocation } from 'umi';
 import { SourceTypeEnum } from '../../constants/SourceTypeEnum';
 
 import { ShipperAddress, ReceiverAddress } from '@/components/AddressDrawer'
+import { checkRegExp } from '@/utils/regExp';
+import { PATTERN_MAPS } from '@/constants/regExp';
 
 
 const DeliveryNoticeManageSRMDetails: React.FC = () => {
@@ -167,7 +169,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required(`${DeliveryPhoneLabel}不能为空`)
+              required(`${DeliveryPhoneLabel}不能为空`),
+              {pattern:PATTERN_MAPS.phone,message:"手机号是否正确"}
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
@@ -255,7 +258,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
                         <HarvestMaterialInput
                           value={rcode[OrderNumColumn.key]}
                           index={index}
-                          keyUp="deliveryCount"
+                          keyup="deliveryCount"
                         />
                       )
                     }

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

@@ -22,6 +22,7 @@ import { DeliveryNumColumn, OrderNumColumn } from '../../constants/table-column'
 import moment from 'moment';
 import { addrFormatValue } from '../../assets/format/addrValue';
 import DeliveryGoodTableSelectB2B from '../../components/DeliveryGoodTableSelect/DeliveryGoodTableSelectB2B';
+import { PATTERN_MAPS } from '@/constants/regExp';
 
 const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
@@ -150,7 +151,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required('请出入正确的手机号'),
+              {pattern:PATTERN_MAPS.phone,message:"手机号是否正确"}
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
@@ -266,7 +268,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
                         <HarvestMaterialInput
                           value={rcode[OrderNumColumn.key]}
                           index={index}
-                          keyUp="deliveryCount"
+                          keyup="deliveryCount"
                         />
                       )
                     }

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

@@ -155,7 +155,12 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
             <Input />
           </FormItem>
 
-          <FormItem label={DeliveryPhoneLabel} name="executorVO.phone">
+          <FormItem
+          rules={[
+            required('请出入正确的手机号'),
+              {pattern:PATTERN_MAPS.phone,message:"手机号是否正确"}
+          ]}
+          label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
           </FormItem>
         </ContentBox>

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

@@ -147,7 +147,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required('请出入正确的手机号'),
+              {pattern:PATTERN_MAPS.phone,message:"手机号是否正确"}
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
@@ -261,7 +262,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
                         <HarvestMaterialInput
                           value={rcode[OrderNumColumn.key]}
                           index={index}
-                          keyUp="deliveryCount"
+                          keyup="deliveryCount"
                         />
                       )
                     }

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

@@ -24,6 +24,7 @@ import LogisticsCompanyMerchantsSelect from '@/components/LogisticsCompanySelect
 import { useLocation } from 'umi';
 import { DeliveryNumColumn } from '../../constants/table-column';
 import { addrFormatValue } from '../../assets/format/addrValue';
+import { PATTERN_MAPS } from '@/constants/regExp';
 
 
 const ContentBoxItem = ContentBox.BaseInfoItem;
@@ -154,7 +155,12 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
             <DatePickerSelect.RangePicker disabled={true} className="w-full" picker='time' />
           </FormItem>
 
-          <FormItem label={DeliveryPhoneLabel} name="executorVO.phone">
+          <FormItem
+            rules={[
+              required('请出入正确的手机号'),
+              { pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
+            ]}
+            label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
           </FormItem>
         </ContentBox>

src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitB2B/components/AddEditContent/index.tsx

@@ -200,7 +200,7 @@ const DeliveryNoticeManagementAwaitB2BDetails: React.FC<PropsType> = ({ type, id
             disabled={!!planData}
             value={rcode['planCount']}
             index={index}
-            keyUp="planCount"
+            keyup="planCount"
           />
         )
       }

src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitSRM/components/AddEditContent/index.tsx

@@ -198,7 +198,7 @@ const DeliveryNoticeManagementAwaitSRMDetails: React.FC<PropsType> = ({ type, id
             disabled={!!planData}
             value={rcode['planCount']}
             index={index}
-            keyUp="planCount"
+            keyup="planCount"
           />
         )
       }

src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx

@@ -254,7 +254,7 @@ function DeliveryNoticeFromCreate() {
                         <HarvestMaterialInput
                           value={rcode[OrderNumColumn.key]}
                           index={index}
-                          keyUp="deliveryCount"
+                          keyup="deliveryCount"
                         />
                       )
                     }

src/pages/order/receivingNote/deliveryNoteManage/add.tsx

@@ -57,9 +57,7 @@ function DeliveryNoteAddForm() {
     service.getDetailById(id).then(res => {
       form.setFieldsValue({
         deliveryOrderId: id,
-        // ...res,
-        deliveryTime: moment(res.deliveryTime),
-        deliveryRangeTime: [moment(res.deliveryStartTime, 'HH:mm:ss'),moment(res.deliveryEndTime, 'HH:mm:ss')]
+        ...noteService.formatField(res)
       })
       setOuterHistoryList(res.outerHistoryList)
     })

src/pages/order/receivingNote/deliveryNoteQuery/edit.tsx

@@ -237,7 +237,7 @@ function DeliveryNoteAddForm() {
                         <HarvestMaterialInput
                           value={rcode[OrderNumColumn.key]}
                           index={index}
-                          keyUp="deliveryCount"
+                          keyup="deliveryCount"
                         />
                       )
                     }