Compare commits
No commits in common. "b04e6954b59524e065b5b4f4c5e89fef6145bb1c" and "9263841890050d946d142748c68c04d9d563154e" have entirely different histories.
b04e6954b5
...
9263841890
|
|
@ -1201,13 +1201,6 @@ const Shipping: React.FC<{
|
||||||
{ label: 'uniuni', value: 'uniuni' },
|
{ label: 'uniuni', value: 'uniuni' },
|
||||||
{ label: 'tms.freightwaves', value: 'freightwaves' },
|
{ label: 'tms.freightwaves', value: 'freightwaves' },
|
||||||
]);
|
]);
|
||||||
const [courierCompany, setCourierCompany] = useState([
|
|
||||||
{ label: '最优物流', value: '' },
|
|
||||||
{ label: 'UNIUNI', value: 'UNIUNI' },
|
|
||||||
{ label: 'PuroYYZ', value: 'PuroYYZ' },
|
|
||||||
{ label: 'CPYYZ', value: 'CPYYZ' },
|
|
||||||
{ label: 'UPSYYZ7000NEW', value: 'UPSYYZ7000NEW' },
|
|
||||||
]);
|
|
||||||
return (
|
return (
|
||||||
<ModalForm
|
<ModalForm
|
||||||
formRef={formRef}
|
formRef={formRef}
|
||||||
|
|
@ -1259,7 +1252,6 @@ const Shipping: React.FC<{
|
||||||
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
|
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
|
||||||
return {
|
return {
|
||||||
shipmentPlatform: 'freightwaves',
|
shipmentPlatform: 'freightwaves',
|
||||||
courierCompany: '最优物流',
|
|
||||||
...data,
|
...data,
|
||||||
// payment_method_id: shipmentInfo?.payment_method_id,
|
// payment_method_id: shipmentInfo?.payment_method_id,
|
||||||
stockPointId: shipmentInfo?.stockPointId,
|
stockPointId: shipmentInfo?.stockPointId,
|
||||||
|
|
@ -1286,7 +1278,7 @@ const Shipping: React.FC<{
|
||||||
},
|
},
|
||||||
origin: {
|
origin: {
|
||||||
name: data?.siteName,
|
name: data?.siteName,
|
||||||
email_addresses: shipmentInfo?.email_addresses,
|
email_addresses: data?.email,
|
||||||
contact_name: data?.siteName,
|
contact_name: data?.siteName,
|
||||||
phone_number: shipmentInfo?.phone_number,
|
phone_number: shipmentInfo?.phone_number,
|
||||||
address: {
|
address: {
|
||||||
|
|
@ -1353,7 +1345,6 @@ const Shipping: React.FC<{
|
||||||
postal_code: details.origin.address.postal_code,
|
postal_code: details.origin.address.postal_code,
|
||||||
address_line_1: details.origin.address.address_line_1,
|
address_line_1: details.origin.address.address_line_1,
|
||||||
phone_number: details.origin.phone_number,
|
phone_number: details.origin.phone_number,
|
||||||
email_addresses: details.origin.email_addresses,
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -1385,14 +1376,6 @@ const Shipping: React.FC<{
|
||||||
rules={[{ required: true, message: '请选择一个选项' }]}
|
rules={[{ required: true, message: '请选择一个选项' }]}
|
||||||
/>
|
/>
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={8}>
|
|
||||||
<ProFormSelect
|
|
||||||
name="courierCompany"
|
|
||||||
label="快递公司"
|
|
||||||
options={courierCompany}
|
|
||||||
placeholder="请选择快递公司"
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
</Row>
|
||||||
<ProFormText
|
<ProFormText
|
||||||
label="订单号"
|
label="订单号"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue