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

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

@@ -97,11 +97,6 @@ export class HandleFormSubmit {
         moment().startOf('day'),
         moment().endOf('day')
       ],
-      deliveryVO: {
-        ...data?.deliverVO,
-        shipperName: data?.deliverVO?.consignee,
-        fullAddress: data?.deliverVO?.provinceName ?? '' + data?.deliverVO?.cityName ?? '' + data?.deliverVO?.districtName ?? '' + data?.deliverVO?.streetName ?? ''
-      },
       receiveVO: {
         ...data?.receiverBO,
         receiverName: data?.receiverBO?.consignee,
@@ -126,6 +121,17 @@ export class HandleFormSubmit {
       deliveryNo: data?.deliveryNo
     }
 
+    if (data?.deliveryVO) {
+      formField = Object.assign(
+        formField, {
+        deliveryVO: {
+          ...data?.deliverVO,
+          shipperName: data?.deliverVO?.consignee ?? '',
+          fullAddress: `${data?.deliverVO?.provinceName ?? ''}${data?.deliverVO?.cityName ?? ''}${data?.deliverVO?.districtName ?? ''}${data?.deliverVO?.streetName ?? ''}`
+        },
+      })
+    }
+
     return formField
   }
 

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

@@ -66,6 +66,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
     let formFeils = service.formatField(data)
     
+
     setTableDataSource(data.products)
     handleAnchor(data?.products?.length)