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

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

@@ -105,6 +105,11 @@ export class HandleFormSubmit {
         receiverName: data?.receiverBO.consignee,
         fullAddress: data?.receiverBO.provinceName + data?.receiverBO.cityName + data?.receiverBO.districtName + data?.receiverBO.streetName ?? ''
       },
+      executorVO: {
+        ...data?.executorVO,
+        receiverName: data?.executorVO.consignee,
+        fullAddress: data?.executorVO.provinceName + data?.executorVO.cityName + data?.executorVO.districtName + data?.executorVO.streetName ?? ''
+      },
       "executorVO.phone": data?.executorVO.phone,
       sendTime: moment(data?.sendTime),
       "executorVO.carNumbers": data?.executorVO.carNumbers,

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

@@ -133,7 +133,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             rules={[
               required()
             ]}
-            label={DeliveryNameLabel} name="deliveryVO">
+            label={DeliveryNameLabel} name="executorVO">
             <AddressDrawer
               showDefault={true}
               formatValue={addrFormatValue}

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

@@ -140,7 +140,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
             rules={[
               required()
             ]}
-            label={DeliveryNameLabel} name="deliveryVO">
+            label={DeliveryNameLabel} name="executorVO">
             <AddressDrawer
               formatValue={addrFormatValue}
               addressListRequest={(val) => {

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

@@ -132,7 +132,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             rules={[
               required()
             ]}
-            label={DeliveryNameLabel} name="deliveryVO">
+            label={DeliveryNameLabel} name="executorVO">
             <AddressDrawer
               showDefault={true}
               formatValue={addrFormatValue}

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

@@ -142,7 +142,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
             rules={[
               required()
             ]}
-            label={DeliveryNameLabel} name="deliveryVO">
+            label={DeliveryNameLabel} name="executorVO">
             <AddressDrawer
               formatValue={addrFormatValue}
               addressListRequest={(val) => {