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

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

@@ -98,9 +98,9 @@ export class HandleFormSubmit {
         moment().endOf('day')
       ],
       receiveVO: {
-        ...data?.receiverBO,
-        receiverName: data?.receiverBO?.consignee,
-        fullAddress: `${data?.receiverBO?.provinceName ?? ''}${data?.receiverBO?.cityName ?? ''}${data?.receiverBO?.districtName ?? ''}${data?.receiverBO?.streetName ?? ''}`
+        ...data?.receiveVO,
+        receiverName: data?.receiveVO?.consignee,
+        fullAddress: `${data?.receiveVO?.provinceName ?? ''}${data?.receiveVO?.cityName ?? ''}${data?.receiveVO?.districtName ?? ''}${data?.receiveVO?.streetName ?? ''}`
       },
       executorVO: {
         ...data?.executorVO,
@@ -110,7 +110,7 @@ export class HandleFormSubmit {
       "executorVO.phone": data?.executorVO?.phone,
       sendTime: data?.sendTime ? moment(data?.sendTime) : moment().startOf('day'),
       "executorVO.carNumbers": data?.executorVO?.carNumbers,
-      "receiverBO.phone": data?.receiverBO?.phone,
+      "receiveVO.phone": data?.receiveVO?.phone,
       logisticsNo: data?.logisticsNo,
       logisticsCompanyInt: {
         label: data?.logisticsCompany,
@@ -332,15 +332,15 @@ export class ReceiveOrderCreate extends DeliveryNoteAddService {
         fullAddress: data.deliverVO?.provinceName ?? '' + data.deliverVO?.cityName ?? '' + data.deliverVO?.districtName ?? '' + data.deliverVO?.streetName ?? ''
       },
       receiveVO: {
-        ...data.receiverBO,
-        receiverName: data.receiverBO?.consignee,
-        fullAddress: data?.receiverBO?.provinceName ?? '' + data?.receiverBO?.cityName ?? '' + data?.receiverBO?.districtName ?? '' + data?.receiverBO?.streetName ?? ''
+        ...data.receiveVO,
+        receiverName: data.receiveVO?.consignee,
+        fullAddress: data?.receiveVO?.provinceName ?? '' + data?.receiveVO?.cityName ?? '' + data?.receiveVO?.districtName ?? '' + data?.receiveVO?.streetName ?? ''
       },
       "executorVO.phone": data.executorVO.phone,
       sendTime: moment(data.sendTime),
       receiveTime: moment(data.receiveTime),
       "executorVO.carNumbers": data.executorVO.carNumbers,
-      "receiverBO.phone": data.receiverBO.phone,
+      "receiveVO.phone": data.receiveVO.phone,
       logisticsNo: data.logisticsNo,
       logisticsCompanyInt: {
         label: data.logisticsCompany,
@@ -402,7 +402,7 @@ export class DeliveryNoticeOrderAddService extends DeliveryNoteAddService {
           receiverName: data.receiveVO.consignee,
           fullAddress: data.receiveVO.provinceName + data.receiveVO.cityName + data.receiveVO.districtName + data.receiveVO.streetName ?? '' + data.receiveVO.address
         },
-        "receiverBO.phone": data.receiveVO.phone,
+        "receiveVO.phone": data.receiveVO.phone,
         products: data.products,
         orderType: data.orderType,
         sourceNo: data.sourceNo

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

@@ -65,7 +65,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
     const data = DELIVERY_NOTICE_PATH[time]
 
     let formFeils = service.formatField(data)
-    
+
 
     setTableDataSource(data.products)
     handleAnchor(data?.products?.length)
@@ -198,7 +198,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               validatorByteObject(16)
             ]}
             label={DeliveryNameLabel} name="executorVO.consignee">
-            <Input maxLength={16} />
+            <Input maxLength={16} placeholder={`请输入${DeliveryNameLabel}`} />
           </FormItem>
 
           <FormItem
@@ -215,7 +215,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               validatorByteObject(20)
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
-            <Input type="tel" maxLength={20} />
+            <Input type="tel" maxLength={20} placeholder={`请输入${DeliveryPhoneLabel}`} />
           </FormItem>
         </ContentBox>
 
@@ -236,7 +236,10 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             // ]}
             label={ReceivingAddressLabel} name="receiveVO">
 
-            <ReceiverAddress />
+            <ReceiverAddress
+              hiddenBtn={true}
+              disabled={true}
+            />
 
           </FormItem>