div #54

Merged
longbot merged 4 commits from zhuotianyuan/WEB:div into stable 2026-01-28 08:45:42 +00:00
1 changed files with 47 additions and 31 deletions
Showing only changes of commit 2d0f12d0cd - Show all commits

View File

@ -1201,6 +1201,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}
@ -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="订单号"