Compare commits
10 Commits
fba6e4f83a
...
69b5ab72ff
| Author | SHA1 | Date |
|---|---|---|
|
|
69b5ab72ff | |
|
|
a4445362d5 | |
|
|
500151c957 | |
|
|
8190dc92eb | |
|
|
9429df1db7 | |
|
|
128677e9ac | |
|
|
4c23fba5de | |
|
|
84b8097949 | |
|
|
bf41887b6b | |
|
|
139fdf0474 |
|
|
@ -1385,6 +1385,13 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
|
|||
{ label: 'uniuni', value: 'uniuni' },
|
||||
{ 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 (
|
||||
<ModalForm
|
||||
formRef={formRef}
|
||||
|
|
@ -1437,7 +1444,8 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
|
|||
let shipmentInfo = localStorage.getItem('shipmentInfo');
|
||||
if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
|
||||
const a = {
|
||||
shipmentPlatform: 'uniuni',
|
||||
shipmentPlatform: 'freightwaves',
|
||||
courierCompany: '',
|
||||
...data,
|
||||
// payment_method_id: shipmentInfo?.payment_method_id,
|
||||
stockPointId: shipmentInfo?.stockPointId,
|
||||
|
|
@ -1464,7 +1472,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: {
|
||||
|
|
@ -1508,7 +1516,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
|
|||
...data
|
||||
}) => {
|
||||
details.origin.email_addresses =
|
||||
details.origin.email_addresses.split(',');
|
||||
details.origin.email_addresses;
|
||||
details.destination.email_addresses =
|
||||
details.destination.email_addresses.split(',');
|
||||
details.destination.phone_number.number =
|
||||
|
|
@ -1541,6 +1549,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,
|
||||
}),
|
||||
);
|
||||
|
||||
|
|
@ -1571,6 +1580,14 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
|
|||
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" />
|
||||
|
|
@ -2149,7 +2166,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
|
|||
const originEmail = details.origin.email_addresses;
|
||||
const destinationEmail = details.destination.email_addresses;
|
||||
details.origin.email_addresses =
|
||||
details.origin.email_addresses.split(',');
|
||||
details.origin.email_addresses;
|
||||
details.destination.email_addresses =
|
||||
details.destination.email_addresses.split(',');
|
||||
details.destination.phone_number.number =
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import * as order from './order';
|
|||
import * as product from './product';
|
||||
import * as site from './site';
|
||||
import * as siteApi from './siteApi';
|
||||
import * as siteProduct from './siteProduct';
|
||||
import * as statistics from './statistics';
|
||||
import * as stock from './stock';
|
||||
import * as subscription from './subscription';
|
||||
|
|
@ -28,6 +29,7 @@ export default {
|
|||
order,
|
||||
product,
|
||||
siteApi,
|
||||
siteProduct,
|
||||
site,
|
||||
statistics,
|
||||
stock,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
// @ts-ignore
|
||||
/* eslint-disable */
|
||||
import { request } from 'umi';
|
||||
|
||||
/** 此处后端没有提供注释 GET /site-product/list */
|
||||
export async function siteproductcontrollerGetsiteproductlist(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: API.siteproductcontrollerGetsiteproductlistParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<any>('/site-product/list', {
|
||||
method: 'GET',
|
||||
params: {
|
||||
...params,
|
||||
},
|
||||
...(options || {}),
|
||||
});
|
||||
}
|
||||
|
||||
/** 此处后端没有提供注释 POST /site-product/sync */
|
||||
export async function siteproductcontrollerSyncsiteproducts(
|
||||
body: number,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<any>('/site-product/sync', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'text/plain',
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
});
|
||||
}
|
||||
|
|
@ -1103,8 +1103,8 @@ declare namespace API {
|
|||
categoryId?: number;
|
||||
/** 库存组成 */
|
||||
components?: ProductStockComponent[];
|
||||
/** 站点 SKU 列表 */
|
||||
siteSkus?: string[];
|
||||
/** 站点 SKU关联 */
|
||||
siteSkus?: SiteSku[];
|
||||
/** 来源 */
|
||||
source?: number;
|
||||
/** 创建时间 */
|
||||
|
|
@ -1630,10 +1630,12 @@ declare namespace API {
|
|||
stockPointId?: number;
|
||||
orderIds?: number[];
|
||||
shipmentPlatform?: string;
|
||||
courierCompany?: string;
|
||||
};
|
||||
|
||||
type ShipmentFeeBookDTO = {
|
||||
shipmentPlatform?: string;
|
||||
courierCompany?: string;
|
||||
stockPointId?: number;
|
||||
sender?: string;
|
||||
startPhone?: Record<string, any>;
|
||||
|
|
@ -2221,6 +2223,23 @@ declare namespace API {
|
|||
id: string;
|
||||
};
|
||||
|
||||
type siteproductcontrollerGetsiteproductlistParams = {
|
||||
sku?: string;
|
||||
name?: string;
|
||||
siteId?: number;
|
||||
pageSize?: number;
|
||||
current?: number;
|
||||
};
|
||||
|
||||
type SiteSku = {
|
||||
/** sku */
|
||||
sku?: string;
|
||||
/** 商品ID */
|
||||
productId?: number;
|
||||
/** 是否旧版数据 */
|
||||
isOld?: boolean;
|
||||
};
|
||||
|
||||
type SitesResponse = {
|
||||
/** 状态码 */
|
||||
code?: number;
|
||||
|
|
|
|||
Loading…
Reference in New Issue