修复一些问题

src/pages/order/assets/handles/HandleFormSubmit.ts

@@ -103,7 +103,7 @@ export class HandleFormSubmit {
       receiveVO: {
         ...data?.receiverBO,
         receiverName: data?.receiverBO?.consignee,
-        fullAddress: `${data?.receiverBO?.provinceName ?? ''}${data?.receiverBO?.cityName ?? ''}${data?.receiverBO?.districtName??''}${data?.receiverBO?.streetName ?? ''}`
+        fullAddress: `${data?.receiverBO?.provinceName ?? ''}${data?.receiverBO?.cityName ?? ''}${data?.receiverBO?.districtName ?? ''}${data?.receiverBO?.streetName ?? ''}`
       },
       executorVO: {
         ...data?.executorVO,
@@ -123,7 +123,7 @@ export class HandleFormSubmit {
       deliveryNo: data?.deliveryNo
     }
     console.log(formField);
-    
+
     return formField
   }
 
@@ -372,7 +372,8 @@ export class DeliveryNoticeOrderAddService extends DeliveryNoteAddService {
         },
         "receiverBO.phone": data.receiveVO.phone,
         products: data.products,
-        orderType: data.orderType
+        orderType: data.orderType,
+        sourceNo: data.sourceNo
       }
       return formField
     })

src/pages/order/constants/label.ts

@@ -2,6 +2,8 @@ export const ReceiptAddLabel = '新增收货单';
 
 export const ReceiptAbstractLabel = '收货单摘要';
 export const DeliveryAbstractLabel = '送货单摘要';
+export const DeliveryAbstractNoLabel = '送货通知编号';
+export const DeliveryPanleNoLabel = '送货计划编号'
 export const SupplyMembersLabel = '供应会员';
 export const NoteLabel = '备注';
 

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

@@ -7,7 +7,7 @@ import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
 import React, { useCallback, useEffect, useState, useContext } from 'react'
 import {
   BaseInfo, BuyerLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryDate,
-  DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryPhoneLabel, DeliveryTime,
+  DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryPanleNoLabel, DeliveryPhoneLabel, DeliveryTime,
   DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel,
   LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, ReceivingAddress as ReceivingAddressLabel
 } from '../../constants'
@@ -28,7 +28,7 @@ import { DeliveryAddFactory } from '../../assets/factory/DeliveryAddFactory';
 import { useLocation } from 'umi';
 import { SourceTypeEnum } from '../../constants/SourceTypeEnum';
 
-import { ShipperAddress, ReceivingAddress } from '@/components/AddressDrawer'
+import { ShipperAddress, ReceiverAddress } from '@/components/AddressDrawer'
 
 
 const DeliveryNoticeManageSRMDetails: React.FC = () => {
@@ -103,6 +103,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
         </FormItem>
 
         <ContentBox title={BaseInfo.name} id={BaseInfo.key}>
+
+          <FormItem label={DeliveryPanleNoLabel} name="sourceNo">
+            <Input disabled />
+          </FormItem>
+
           <FormItem
             rules={[
               required()
@@ -190,8 +195,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               required()
             ]}
             label={ReceivingAddressLabel} name="receiveVO">
-              
-            <ReceivingAddress />
+
+            <ReceiverAddress />
 
           </FormItem>
 

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

@@ -91,6 +91,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
         </FormItem>
 
         <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
+          
           <FormItem
             rules={[
               required()

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

@@ -9,7 +9,7 @@ import { history } from 'umi'
 import BaseInfo from '@/components/BaseInfo/BaseInfo'
 import { Button, DatePicker, Form, Input, message, Steps, Table, TimePicker } from 'antd'
 import { PlusOutlined } from '@ant-design/icons'
-import { AddressDrawer } from '@/components/AddressDrawer'
+import { AddressDrawer, ReceiverAddress } from '@/components/AddressDrawer'
 import AuthButton from '@/components/AuthButton'
 import { RoleSelect } from '@/components/RoleSelect'
 import StandardTable from '@/components/StandardTable'
@@ -283,14 +283,9 @@ const DeliveryNoticeManagementAwaitSRMDetails: React.FC<PropsType> = ({ type, id
             rules={[
               { required: true, message: `请选择${ReceivingAddress}` }
             ]}
-          >
-            <AddressDrawer
-              disabled
-              rows={1}
-              addressListRequest={(val) => {
-                return getLogisticsSelectListReceiverAddress(val)
-              }}
-            />
+          > 
+            <ReceiverAddress disabled />
+            
           </Form.Item>
 
           <Form.Item

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

@@ -2,7 +2,7 @@ import AnchorPage, { AnchorsItem } from "@/components/AnchorPage";
 import { Button, Form, Input, message, Radio, Table } from "antd";
 import { useCallback, useEffect, useState } from "react";
 import { DeliveryNoticeOrderAddService } from "../../assets/handles/HandleFormSubmit";
-import { BillsInfo, BuyerLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryPhoneLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, ReceivingAddress } from "../../constants";
+import { BillsInfo, BuyerLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAbstractNoLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryPhoneLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, ReceivingAddress } from "../../constants";
 import { BaseInfo } from '@/components/BaseInfo';
 import { required, FormItem } from "@/components/FormItem";
 import { RoleSelect } from "@/components/RoleSelect";
@@ -74,7 +74,7 @@ function DeliveryNoticeFromCreate() {
   }
 
   return (
-    <AnchorPage title="送货单管理详情"
+    <AnchorPage title="送货单管理新增"
       anchors={anchors}
       extra={
         <AuthButton btnCode='deliveryNoticeQuery.submit'>
@@ -90,6 +90,15 @@ function DeliveryNoticeFromCreate() {
         </FormItem>
 
         <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
+
+          <FormItem
+            rules={[
+              required()
+            ]}
+            label={DeliveryAbstractNoLabel} name="sourceNo">
+            <Input />
+          </FormItem>
+
           <FormItem
             rules={[
               required()