From 9c63e80ca28bfe8933f760b50cfa3eec6355d4a0 Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Tue, 27 Jan 2026 17:04:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=AB=E9=80=92=E5=85=AC=E5=8F=B8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增快递公司选择下拉框，并默认设置 UNIUNI 为初始值。同时修正发货信息中 email_addresses 字段的取值逻辑
---
 src/pages/Order/List/index.tsx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx
index 36fd5cb..d9d14ef 100644
--- a/src/pages/Order/List/index.tsx
+++ b/src/pages/Order/List/index.tsx
@@ -1385,6 +1385,12 @@ 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}
@@ -1438,6 +1444,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
         const a =  {
           shipmentPlatform: 'uniuni',
+          courierCompany: 'UNIUNI',
           ...data,
           // payment_method_id: shipmentInfo?.payment_method_id,
           stockPointId: shipmentInfo?.stockPointId,
@@ -1464,7 +1471,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             },
             origin: {
               name: data?.name,
-              email_addresses: data?.email,
+              email_addresses: shipmentInfo?.email_addresses ,
               contact_name: data?.name,
               phone_number: shipmentInfo?.phone_number,
               address: {
@@ -1541,6 +1548,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,
             }),
           );
 
@@ -1570,6 +1578,14 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         placeholder="请选择发货平台"
         rules={[{ required: true, message: '请选择一个选项' }]}
       />
+      </Col>
+       <Col span={8}>
+       <ProFormSelect
+        name="courierCompany"
+        label="快递公司"
+        options={courierCompany}
+        placeholder="请选择快递公司"
+      />
       </Col>
        </Row>
       <ProFormText label="订单号" readonly name='externalOrderId' />