src/pages/Order/List/index.tsx

@@ -927,13 +927,13 @@ const Detail: React.FC<{
             }}
           />
           {/* 显示 related order */}
-<ProDescriptions.Item
+          <ProDescriptions.Item
             label="关联"
             span={3}
             render={(_, record) => {
               return <RelatedOrders data={record?.related} />;
             }}
-/>
+          />
           {/* 订单内容 */}
           <ProDescriptions.Item
             label="订单内容"
@@ -1197,10 +1197,16 @@ const Shipping: React.FC<{
   const [rates, setRates] = useState<API.RateDTO[]>([]);
   const [ratesLoading, setRatesLoading] = useState(false);
   const { message } = App.useApp();
-const [shipmentPlatforms, setShipmentPlatforms] = useState([
+  const [shipmentPlatforms, setShipmentPlatforms] = useState([
     { label: 'uniuni', value: 'uniuni' },
     { label: 'tms.freightwaves', value: 'freightwaves' },
   ]);
+  const [courierCompany, setCourierCompany] = useState([
+    { label: 'UNIUNI', value: 'UNIUNI' },
+    { label: 'PuroYYZ', value: 'PuroYYZ' },
+    { label: 'CPYYZ', value: 'CPYYZ' },
+    { label: 'UPSYYZ7000NEW', value: 'UPSYYZ7000NEW' },
+  ]);
   return (
     <ModalForm
       formRef={formRef}
@@ -1252,6 +1258,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
         return {
           shipmentPlatform: 'freightwaves',
+          courierCompany: 'UNIUNI',
           ...data,
           // payment_method_id: shipmentInfo?.payment_method_id,
           stockPointId: shipmentInfo?.stockPointId,
@@ -1278,7 +1285,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             },
             origin: {
               name: data?.siteName,
-              email_addresses: data?.email,
+              email_addresses: shipmentInfo?.email_addresses,
               contact_name: data?.siteName,
               phone_number: shipmentInfo?.phone_number,
               address: {
@@ -1345,6 +1352,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
               postal_code: details.origin.address.postal_code,
               address_line_1: details.origin.address.address_line_1,
               phone_number: details.origin.phone_number,
+              email_addresses: details.origin.email_addresses,
             }),
           );
 
@@ -1376,6 +1384,14 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             rules={[{ required: true, message: '请选择一个选项' }]}
           />
         </Col>
+        <Col span={8}>
+          <ProFormSelect
+            name="courierCompany"
+            label="快递公司"
+            options={courierCompany}
+            placeholder="请选择快递公司"
+          />
+        </Col>
       </Row>
       <ProFormText
         label="订单号"
@@ -2050,7 +2066,7 @@ const SalesChange: React.FC<{
         //     value: item.sku,
         //   })) || [],
         // );
-        return { ...data};
+        return { ...data };
       }}
       onFinish={async (formData: any) => {
         const { sales } = formData;
@@ -2071,7 +2087,7 @@ const SalesChange: React.FC<{
         <ProForm.Group>
 
           <ProFormSelect
-             params={{ }}
+            params={{}}
             request={async ({ keyWords }) => {
               try {
                 const { data } = await wpproductcontrollerSearchproducts({