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

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

@@ -87,7 +87,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
           if (res.code === 1000) {
             handleLeave(false)
             setTimeout(() => {
-              history.go(-1)
+              history.go(-2)
             }, 1000);
           }
         });
@@ -213,7 +213,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               validatorByteObject(20)
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
-            <Input maxLength={20} />
+            <Input type="tel" maxLength={20} />
           </FormItem>
         </ContentBox>
 

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

@@ -176,7 +176,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               { pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
-            <Input placeholder={`请输入${DeliveryPhoneLabel}`} />
+            <Input  type="tel" placeholder={`请输入${DeliveryPhoneLabel}`} />
           </FormItem>
         </ContentBox>
 

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

@@ -177,7 +177,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
               { pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
-            <Input />
+            <Input type="tel" />
           </FormItem>
         </ContentBox>
 

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

@@ -162,7 +162,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               { pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
-            <Input placeholder={`请输入${DeliveryPhoneLabel}`} maxLength={20} />
+            <Input type="tel" placeholder={`请输入${DeliveryPhoneLabel}`} maxLength={20} />
           </FormItem>
         </ContentBox>
 

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

@@ -179,7 +179,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
               { pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
-            <Input />
+            <Input type="tel" />
           </FormItem>
         </ContentBox>
 

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

@@ -130,7 +130,7 @@ function DeliveryNoteAddForm() {
             rules={[
               required()
             ]}
-            label={SupplyMembersLabel}>
+            label={SupplyMembersLabel} name="member">
             <RoleSelect
               disabled={true}
               formatFeils={(e) => {
@@ -169,7 +169,7 @@ function DeliveryNoteAddForm() {
 
             <FormItem
               label={ConsigneePhoneLabel} name="executorVO.phone">
-              <Input placeholder={`请输入${ConsigneePhoneLabel}`} />
+              <Input type="tel" placeholder={`请输入${ConsigneePhoneLabel}`} />
             </FormItem>
           </div>
 
@@ -200,7 +200,7 @@ function DeliveryNoteAddForm() {
           <div>
             <FormItem
               label={DeliverySlefAddrLabel}>
-              {FormatValue(info?.deliveryVO)}
+              {FormatValue(info?.deliveryVO) ?? ''}
             </FormItem>
           </div>
         </ContentBox>