Compare commits
No commits in common. "bf41887b6b5ac5f5e6aa4fef5070d21628aae75b" and "db5486ffab848ed98e56af6bccd296e2c3eff34a" have entirely different histories.
bf41887b6b
...
db5486ffab
|
|
@ -1385,12 +1385,6 @@ const Shipping: React.FC<{
|
|||
{ 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}
|
||||
|
|
@ -1444,7 +1438,6 @@ const Shipping: React.FC<{
|
|||
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
|
||||
const a = {
|
||||
shipmentPlatform: 'uniuni',
|
||||
courierCompany: 'UNIUNI',
|
||||
...data,
|
||||
// payment_method_id: shipmentInfo?.payment_method_id,
|
||||
stockPointId: shipmentInfo?.stockPointId,
|
||||
|
|
@ -1471,7 +1464,7 @@ const Shipping: React.FC<{
|
|||
},
|
||||
origin: {
|
||||
name: data?.name,
|
||||
email_addresses: shipmentInfo?.email_addresses,
|
||||
email_addresses: data?.email,
|
||||
contact_name: data?.name,
|
||||
phone_number: shipmentInfo?.phone_number,
|
||||
address: {
|
||||
|
|
@ -1548,7 +1541,6 @@ const Shipping: React.FC<{
|
|||
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,
|
||||
}),
|
||||
);
|
||||
|
||||
|
|
@ -1579,14 +1571,6 @@ const Shipping: React.FC<{
|
|||
rules={[{ required: true, message: '请选择一个选项' }]}
|
||||
/>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<ProFormSelect
|
||||
name="courierCompany"
|
||||
label="快递公司"
|
||||
options={courierCompany}
|
||||
placeholder="请选择快递公司"
|
||||
/>
|
||||
</Col>
|
||||
</Row>
|
||||
<ProFormText label="订单号" readonly name='externalOrderId' />
|
||||
<ProFormText label="客户备注" readonly name="customer_note" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue