yoone
/
WEB
1
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yoone:af1cebe29de44ed5cc67c6ff9acaff5e550f5feb
Branches Tags
yoone:main
yoone:stable
yoone:v1.0
..
compare: yoone:80ba76aacc3bf7802ad76b96a59524a18c7dc0da
Branches Tags
yoone:main
yoone:stable
yoone:v1.0

2 Commits
af1cebe29d ... 80ba76aacc

Author SHA1 Message Date
zhuotianyuan 80ba76aacc fix(订单同步): 修复订单同步功能并添加日期范围选择 
修复订单同步接口调用参数错误
在同步表单中添加日期范围选择器
调整订单来源统计接口名称拼写错误
 2026-01-13 19:26:51 +08:00
zhuotianyuan d372f72935 feat: 添加webhook地址字段和区域选择功能 
在站点列表和编辑表单中添加webhook地址字段
在订单列表中添加付款日期字段
在统计页面添加国家/区域选择功能，支持多选和搜索
引入i18n-iso-countries库实现国家名称本地化
 2026-01-09 14:59:19 +08:00
26 changed files with 367 additions and 2066 deletions
Show Stats Expand all files Collapse all files

7
.umirc.ts
View File

@ -164,11 +164,6 @@ export default defineConfig({
path: '/product/attribute', path: '/product/attribute',
component: './Product/Attribute', component: './Product/Attribute',
}, },
{
name: '产品品牌空间',
path: '/product/brandspace',
component: './Product/BrandSpace',
},
// sync // sync
{ {
name: '同步产品', name: '同步产品',
@ -179,7 +174,7 @@ export default defineConfig({
name: '产品CSV 工具', name: '产品CSV 工具',
path: '/product/csvtool', path: '/product/csvtool',
component: './Product/CsvTool', component: './Product/CsvTool',
}, }
], ],
}, },
{ {

2
src/hooks/useSites.ts
View File

@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
import { sitecontrollerAll } from '@/servers/api/site'; import { sitecontrollerAll } from '@/servers/api/site';
import { useEffect, useState } from 'react';
// 站点数据的类型定义 // 站点数据的类型定义
interface Site { interface Site {

18
src/pages/Customer/List/index.tsx
View File

@ -116,6 +116,7 @@ const CustomerList: React.FC = () => {
const { message } = App.useApp(); const { message } = App.useApp();
const [syncModalVisible, setSyncModalVisible] = useState(false); const [syncModalVisible, setSyncModalVisible] = useState(false);
const columns: ProColumns<API.GetCustomerDTO>[] = [ const columns: ProColumns<API.GetCustomerDTO>[] = [
{ {
title: 'ID', title: 'ID',
@ -317,27 +318,25 @@ const CustomerList: React.FC = () => {
actionRef={actionRef} actionRef={actionRef}
columns={columns} columns={columns}
rowKey="id" rowKey="id"
request={async (params, sorter, filter) => { request={async (params, sorter,filter) => {
console.log('custoemr request', params, sorter, filter); console.log('custoemr request',params, sorter,filter)
const { current, pageSize, ...restParams } = params; const { current, pageSize, ...restParams } = params;
const orderBy: any = {}; const orderBy:any = {}
Object.entries(sorter).forEach(([key, value]) => { Object.entries(sorter).forEach(([key, value]) => {
orderBy[key] = value === 'ascend' ? 'asc' : 'desc'; orderBy[key] = value === 'ascend' ? 'asc' : 'desc';
}); })
// 构建查询参数 // 构建查询参数
const queryParams: any = { const queryParams: any = {
page: current || 1, page: current || 1,
per_page: pageSize || 20, per_page: pageSize || 20,
where: { where: {
...filter, ...filter,
...restParams, ...restParams
}, },
orderBy, orderBy
}; };
const result = await customercontrollerGetcustomerlist({ const result = await customercontrollerGetcustomerlist({params: queryParams});
params: queryParams,
});
console.log(queryParams, result); console.log(queryParams, result);
return { return {
total: result?.data?.total || 0, total: result?.data?.total || 0,
@ -345,6 +344,7 @@ const CustomerList: React.FC = () => {
success: true, success: true,
}; };
}} }}
search={{ search={{
labelWidth: 'auto', labelWidth: 'auto',
span: 6, span: 6,

3
src/pages/Customer/Statistic/index.tsx
View File

@ -137,8 +137,7 @@ const ListPage: React.FC = () => {
{ {
title: '账单地址', title: '账单地址',
dataIndex: 'billing', dataIndex: 'billing',
render: (_, record) => render: (_, record) => JSON.stringify(record?.billing || record?.shipping),
JSON.stringify(record?.billing || record?.shipping),
}, },
{ {
title: '标签', title: '标签',

23
src/pages/Order/List/index.tsx
View File

@ -56,7 +56,6 @@ import {
ProFormTextArea, ProFormTextArea,
ProTable, ProTable,
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { request } from '@umijs/max';
import { import {
App, App,
Button, Button,
@ -77,6 +76,7 @@ import {
} from 'antd'; } from 'antd';
import React, { useMemo, useRef, useState } from 'react'; import React, { useMemo, useRef, useState } from 'react';
import RelatedOrders from '../../Subscription/Orders/RelatedOrders'; import RelatedOrders from '../../Subscription/Orders/RelatedOrders';
import { request } from '@umijs/max';
const ListPage: React.FC = () => { const ListPage: React.FC = () => {
const actionRef = useRef<ActionType>(); const actionRef = useRef<ActionType>();
@ -191,7 +191,7 @@ const ListPage: React.FC = () => {
request: async () => { request: async () => {
try { try {
const result = await sitecontrollerAll(); const result = await sitecontrollerAll();
const { success, data } = result; const {success, data}= result
if (success && data) { if (success && data) {
return data.map((site: any) => ({ return data.map((site: any) => ({
label: site.name, label: site.name,
@ -281,13 +281,7 @@ const ListPage: React.FC = () => {
{(record as any)?.fulfillments?.map((item: any) => { {(record as any)?.fulfillments?.map((item: any) => {
if (!item) return; if (!item) return;
return ( return (
<div <div style={{ display:"flex", alignItems:"center",'flexDirection':'column' }}>
style={{
display: 'flex',
alignItems: 'center',
flexDirection: 'column',
}}
>
<span>物流供应商: {item.shipping_provider}</span> <span>物流供应商: {item.shipping_provider}</span>
<span>物流单号: {item.tracking_number}</span> <span>物流单号: {item.tracking_number}</span>
</div> </div>
@ -525,12 +519,10 @@ const ListPage: React.FC = () => {
method: 'POST', method: 'POST',
data: { data: {
ids: selectedRowKeys, ids: selectedRowKeys,
}, }
}); });
if (res?.success && res.data) { if (res?.success && res.data) {
const blob = new Blob([res.data], { const blob = new Blob([res.data], { type: 'text/csv;charset=utf-8;' });
type: 'text/csv;charset=utf-8;',
});
const url = URL.createObjectURL(blob); const url = URL.createObjectURL(blob);
const a = document.createElement('a'); const a = document.createElement('a');
a.href = url; a.href = url;
@ -547,7 +539,10 @@ const ListPage: React.FC = () => {
} }
}} }}
> >
<Button type="primary" ghost> <Button
type="primary"
ghost
>
批量导出 批量导出
</Button> </Button>
</Popconfirm>, </Popconfirm>,

35
src/pages/Product/Attribute/index.tsx
View File

@ -2,7 +2,6 @@ import * as dictApi from '@/servers/api/dict';
import { import {
ActionType, ActionType,
PageContainer, PageContainer,
ProColumns,
ProTable, ProTable,
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { request } from '@umijs/max'; import { request } from '@umijs/max';
@ -220,35 +219,11 @@ const AttributePage: React.FC = () => {
]; ];
// 右侧字典项列表列定义(紧凑样式) // 右侧字典项列表列定义(紧凑样式)
const dictItemColumns: ProColumns<any>[] = [ const dictItemColumns: any[] = [
{ { title: '名称', dataIndex: 'name', key: 'name', copyable: true },
title: '名称', { title: '标题', dataIndex: 'title', key: 'title', copyable: true },
dataIndex: 'name', { title: '中文标题', dataIndex: 'titleCN', key: 'titleCN', copyable: true },
key: 'name', { title: '简称', dataIndex: 'shortName', key: 'shortName', copyable: true },
copyable: true,
sorter: true,
},
{
title: '标题',
dataIndex: 'title',
key: 'title',
copyable: true,
sorter: true,
},
{
title: '中文标题',
dataIndex: 'titleCN',
key: 'titleCN',
copyable: true,
sorter: true,
},
{
title: '简称',
dataIndex: 'shortName',
key: 'shortName',
copyable: true,
sorter: true,
},
{ {
title: '图片', title: '图片',
dataIndex: 'image', dataIndex: 'image',

452
src/pages/Product/BrandSpace/index.tsx
View File

@ -1,452 +0,0 @@
import { PageContainer } from '@ant-design/pro-components';
import { request } from '@umijs/max';
import {
Card,
Col,
Image,
Layout,
Row,
Select,
Space,
Typography,
message,
} from 'antd';
import React, { useEffect, useState } from 'react';
const { Sider, Content } = Layout;
const { Title, Text } = Typography;
const { Option } = Select;
// Define interfaces
interface Brand {
id: number;
name: string;
shortName?: string;
image?: string;
}
interface Attribute {
id: number;
name: string;
title: string;
}
interface AttributeValue {
id: number;
name: string;
title: string;
titleCN?: string;
value?: string;
image?: string;
}
interface Product {
id: number;
sku: string;
name: string;
image?: string;
brandId: number;
brandName: string;
attributes: { [key: string]: any };
}
const BrandSpace: React.FC = () => {
// State management
const [brands, setBrands] = useState<Brand[]>([]);
const [selectedBrand, setSelectedBrand] = useState<number | null>(null);
const [attributes, setAttributes] = useState<Attribute[]>([]);
const [selectedAttribute, setSelectedAttribute] = useState<string | null>(
null,
);
const [attributeValues, setAttributeValues] = useState<AttributeValue[]>([]);
const [selectedAttributeValue, setSelectedAttributeValue] = useState<
number | null
>(null);
const [products, setProducts] = useState<Product[]>([]);
const [loading, setLoading] = useState(false);
// Fetch brands list
const fetchBrands = async () => {
try {
const response = await request('/dict/items', {
params: { dictId: 'brand' }, // Assuming brand is a dict
});
const brandList = Array.isArray(response)
? response
: response?.data || [];
setBrands(brandList);
// Set default brand to "yoone" if exists
const defaultBrand = brandList.find((brand) => brand.name === 'yoone');
if (defaultBrand) {
setSelectedBrand(defaultBrand.id);
}
} catch (error) {
console.error('Failed to fetch brands:', error);
message.error('获取品牌列表失败');
}
};
// Fetch attributes list
const fetchAttributes = async () => {
try {
// Get all dicts that are attributes (excluding non-attribute dicts)
const response = await request('/dict/list');
const dictList = Array.isArray(response)
? response
: response?.data || [];
// Filter out non-attribute dicts (assuming attributes are specific dicts)
const attributeDicts = dictList.filter((dict: any) =>
['strength', 'flavor', 'humidity', 'size', 'version'].includes(
dict.name,
),
);
setAttributes(attributeDicts);
// Set default attribute to strength if exists
const defaultAttribute = attributeDicts.find(
(attr) => attr.name === 'strength',
);
if (defaultAttribute) {
setSelectedAttribute(defaultAttribute.name);
}
} catch (error) {
console.error('Failed to fetch attributes:', error);
message.error('获取属性列表失败');
}
};
// Fetch attribute values based on selected attribute
const fetchAttributeValues = async (attributeName: string) => {
try {
const response = await request('/dict/items', {
params: { dictId: attributeName },
});
const values = Array.isArray(response) ? response : response?.data || [];
setAttributeValues(values);
} catch (error) {
console.error('Failed to fetch attribute values:', error);
message.error('获取属性值列表失败');
}
};
// Fetch products based on filters
const fetchProducts = async () => {
if (!selectedBrand) return;
setLoading(true);
try {
const params: any = {
brandId: selectedBrand,
};
// Add attribute filter if selected
if (selectedAttribute) {
// If attribute value is selected, filter by both attribute and value
if (selectedAttributeValue) {
params[selectedAttribute] = selectedAttributeValue;
} else {
// If only attribute is selected, filter by attribute presence
params[selectedAttribute] = 'hasValue';
}
}
const response = await request('/product/list', {
params,
});
const productList = Array.isArray(response)
? response
: response?.data || [];
setProducts(productList);
} catch (error) {
console.error('Failed to fetch products:', error);
message.error('获取产品列表失败');
} finally {
setLoading(false);
}
};
// Initial data fetch
useEffect(() => {
fetchBrands();
fetchAttributes();
}, []);
// Fetch attribute values when attribute changes
useEffect(() => {
if (selectedAttribute) {
fetchAttributeValues(selectedAttribute);
setSelectedAttributeValue(null); // Reset selected value when attribute changes
}
}, [selectedAttribute]);
// Fetch products when filters change
useEffect(() => {
fetchProducts();
}, [selectedBrand, selectedAttribute, selectedAttributeValue]);
// Handle brand selection change
const handleBrandChange = (value: number) => {
setSelectedBrand(value);
};
// Handle attribute selection change
const handleAttributeChange = (value: string) => {
setSelectedAttribute(value);
};
// Handle attribute value selection change
const handleAttributeValueChange = (value: number) => {
setSelectedAttributeValue(value);
};
return (
<PageContainer title="品牌空间">
<Layout style={{ minHeight: 'calc(100vh - 64px)', background: '#fff' }}>
{/* Top Brand Selection */}
<div style={{ padding: '16px', borderBottom: '1px solid #f0f0f0' }}>
<Space direction="vertical" style={{ width: '100%' }}>
<Title level={4} style={{ margin: 0 }}>
选择品牌
</Title>
<Select
placeholder="请选择品牌"
style={{ width: 300 }}
value={selectedBrand}
onChange={handleBrandChange}
allowClear
>
{brands.map((brand) => (
<Option key={brand.id} value={brand.id}>
{brand.name}
</Option>
))}
</Select>
</Space>
</div>
<Layout>
{/* Left Attribute Selection */}
<Sider
width={240}
style={{ background: '#fafafa', borderRight: '1px solid #f0f0f0' }}
>
<div style={{ padding: '16px' }}>
<Space direction="vertical" style={{ width: '100%' }}>
<Title level={5} style={{ margin: 0 }}>
选择属性
</Title>
<Select
placeholder="请选择属性类型"
style={{ width: '100%' }}
value={selectedAttribute}
onChange={handleAttributeChange}
allowClear
>
{attributes.map((attr) => (
<Option key={attr.id} value={attr.name}>
{attr.title}
</Option>
))}
</Select>
{selectedAttribute && (
<>
<Title level={5} style={{ margin: '16px 0 8px 0' }}>
属性值
</Title>
<Select
placeholder={`请选择${
attributes.find((a) => a.name === selectedAttribute)
?.title
}`}
style={{ width: '100%' }}
value={selectedAttributeValue}
onChange={handleAttributeValueChange}
allowClear
>
{attributeValues.map((value) => (
<Option key={value.id} value={value.id}>
<Space>
{value.image && (
<Image
src={value.image}
style={{
width: 24,
height: 24,
objectFit: 'cover',
borderRadius: 4,
}}
/>
)}
<span>
{value.titleCN || value.title || value.name}
</span>
</Space>
</Option>
))}
</Select>
</>
)}
{/* Filter Summary */}
{selectedBrand && (
<div
style={{
marginTop: 24,
padding: 12,
background: '#fff',
borderRadius: 8,
}}
>
<Text strong>当前筛选条件:</Text>
<div style={{ marginTop: 8 }}>
<Text type="secondary">品牌: </Text>
<Text>
{brands.find((b) => b.id === selectedBrand)?.name}
</Text>
</div>
{selectedAttribute && (
<div style={{ marginTop: 4 }}>
<Text type="secondary">
{
attributes.find((a) => a.name === selectedAttribute)
?.title
}
:
</Text>
<Text>
{selectedAttributeValue
? attributeValues.find(
(v) => v.id === selectedAttributeValue,
)?.titleCN ||
attributeValues.find(
(v) => v.id === selectedAttributeValue,
)?.title
: '所有值'}
</Text>
</div>
)}
</div>
)}
</Space>
</div>
</Sider>
{/* Main Content - Product List */}
<Content style={{ padding: '16px' }}>
<div style={{ marginBottom: 16 }}>
<Title level={4} style={{ margin: 0 }}>
产品列表
<Text type="secondary" style={{ fontSize: 16, marginLeft: 8 }}>
({products.length} 个产品)
</Text>
</Title>
</div>
{loading ? (
<div style={{ textAlign: 'center', padding: '64px' }}>
<Text>加载中...</Text>
</div>
) : products.length > 0 ? (
<Row gutter={[16, 16]}>
{products.map((product) => (
<Col xs={24} sm={12} md={8} lg={6} key={product.id}>
<Card
hoverable
style={{
height: '100%',
display: 'flex',
flexDirection: 'column',
}}
>
<div
style={{
height: 200,
overflow: 'hidden',
marginBottom: 12,
}}
>
<Image
src={
product.image ||
'https://via.placeholder.com/200x200?text=No+Image'
}
alt={product.name}
style={{
width: '100%',
height: '100%',
objectFit: 'cover',
}}
/>
</div>
<div
style={{
flex: 1,
display: 'flex',
flexDirection: 'column',
}}
>
<Text
type="secondary"
style={{ fontSize: 12, marginBottom: 4 }}
>
{product.sku}
</Text>
<Title
level={5}
style={{
margin: '4px 0',
fontSize: 16,
height: 48,
overflow: 'hidden',
}}
>
{product.name}
</Title>
<div
style={{
marginTop: 'auto',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}
>
<Text
strong
style={{ fontSize: 18, color: '#ff4d4f' }}
>
¥{product.price || '--'}
</Text>
</div>
</div>
</Card>
</Col>
))}
</Row>
) : (
<div
style={{
textAlign: 'center',
padding: '64px',
background: '#fafafa',
borderRadius: 8,
}}
>
<Text type="secondary">暂无符合条件的产品</Text>
</div>
)}
</Content>
</Layout>
</Layout>
</PageContainer>
);
};
export default BrandSpace;

9
src/pages/Product/Category/index.tsx
View File

@ -246,7 +246,7 @@ const CategoryPage: React.FC = () => {
> >
<List.Item.Meta <List.Item.Meta
title={`${item.title}(${item.titleCN ?? '-'})`} title={`${item.title}(${item.titleCN ?? '-'})`}
description={`${item.name} | ${item.shortName ?? '-'}`} description={item.name}
/> />
</List.Item> </List.Item>
)} )}
@ -255,9 +255,7 @@ const CategoryPage: React.FC = () => {
<Content style={{ padding: '24px' }}> <Content style={{ padding: '24px' }}>
{selectedCategory ? ( {selectedCategory ? (
<Card <Card
title={`分类:${selectedCategory.title} (${ title={`分类:${selectedCategory.title} (${selectedCategory.name})`}
selectedCategory.shortName ?? selectedCategory.name
})`}
extra={ extra={
<Button type="primary" onClick={handleAddAttribute}> <Button type="primary" onClick={handleAddAttribute}>
添加关联属性 添加关联属性
@ -321,9 +319,6 @@ const CategoryPage: React.FC = () => {
<Form.Item name="titleCN" label="中文名称"> <Form.Item name="titleCN" label="中文名称">
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item name="shortName" label="短名称">
<Input />
</Form.Item>
<Form.Item name="name" label="标识 (Code)"> <Form.Item name="name" label="标识 (Code)">
<Input /> <Input />
</Form.Item> </Form.Item>

906
src/pages/Product/CsvTool/index.tsx
View File

@ -1,905 +1,7 @@
import { productcontrollerGetcategoriesall } from '@/servers/api/product'; export default function CsvTool() {
import { UploadOutlined } from '@ant-design/icons';
import {
PageContainer,
ProForm,
ProFormSelect,
} from '@ant-design/pro-components';
import { request } from '@umijs/max';
import { Button, Card, Checkbox, Col, Input, message, Row, Upload } from 'antd';
import React, { useEffect, useState } from 'react';
import * as XLSX from 'xlsx';
// 定义站点接口
interface Site {
id: number;
name: string;
skuPrefix?: string;
isDisabled?: boolean;
}
// 定义选项接口，用于下拉选择框的选项
interface Option {
name: string; // 显示名称
shortName: string; // 短名称，用于生成SKU
}
// 定义配置接口
interface SkuConfig {
brands: Option[];
categories: Option[];
flavors: Option[];
strengths: Option[];
humidities: Option[];
versions: Option[];
sizes: Option[];
quantities: Option[];
}
// 定义通用属性映射接口，用于存储属性名称和shortName的对应关系
interface AttributeMapping {
[attributeName: string]: string; // key: 属性名称, value: 属性shortName
}
// 定义所有属性映射的接口
interface AttributeMappings {
brands: AttributeMapping;
categories: AttributeMapping;
flavors: AttributeMapping;
strengths: AttributeMapping;
humidities: AttributeMapping;
versions: AttributeMapping;
sizes: AttributeMapping;
quantities: AttributeMapping;
}
/**
* @description 产品CSV工具页面，用于批量生成SKU
*/
const CsvTool: React.FC = () => {
// 状态管理
const [form] = ProForm.useForm();
const [file, setFile] = useState<File | null>(null);
const [csvData, setCsvData] = useState<any[]>([]);
const [processedData, setProcessedData] = useState<any[]>([]);
const [isProcessing, setIsProcessing] = useState(false);
const [sites, setSites] = useState<Site[]>([]);
const [selectedSites, setSelectedSites] = useState<Site[]>([]); // 现在使用多选
const [generateBundleSkuForSingle, setGenerateBundleSkuForSingle] =
useState(true); // 是否为type为single的记录生成包含quantity的bundle SKU
const [config, setConfig] = useState<SkuConfig>({
brands: [],
categories: [],
flavors: [],
strengths: [],
humidities: [],
versions: [],
sizes: [],
quantities: [],
});
// 所有属性名称到shortName的映射
const [attributeMappings, setAttributeMappings] = useState<AttributeMappings>(
{
brands: {},
categories: {},
flavors: {},
strengths: {},
humidities: {},
versions: {},
sizes: {},
quantities: {},
},
);
// 在组件加载时获取站点列表和字典数据
useEffect(() => {
const fetchAllData = async () => {
try {
message.loading({ content: '正在加载数据...', key: 'loading' });
// 1. 获取站点列表
const sitesResponse = await request('/site/all');
const siteList = sitesResponse?.data || sitesResponse || [];
setSites(siteList);
// 默认选择所有站点
setSelectedSites(siteList);
// 2. 获取字典数据
const dictListResponse = await request('/dict/list');
const dictList = dictListResponse?.data || dictListResponse || [];
// 3. 根据字典名称获取字典项，返回包含name和shortName的完整对象数组
const getDictItems = async (dictName: string) => {
try {
const dict = dictList.find((d: any) => d.name === dictName);
if (!dict) {
console.warn(`Dictionary ${dictName} not found`);
return { options: [], mapping: {} };
}
const itemsResponse = await request('/dict/items', {
params: { dictId: dict.id },
});
const items = itemsResponse?.data || itemsResponse || [];
// 创建完整的选项数组
const options = items.map((item: any) => ({
name: item.name,
shortName: item.shortName || item.name,
}));
// 创建name到shortName的映射
const mapping = items.reduce((acc: AttributeMapping, item: any) => {
acc[item.name] = item.shortName || item.name;
return acc;
}, {});
return { options, mapping };
} catch (error) {
console.error(`Failed to fetch items for ${dictName}:`, error);
return { options: [], mapping: {} };
}
};
// 4. 获取所有字典项（品牌、口味、强度、湿度、版本、尺寸、数量）
const [
brandResult,
flavorResult,
strengthResult,
humidityResult,
versionResult,
sizeResult,
quantityResult,
] = await Promise.all([
getDictItems('brand'),
getDictItems('flavor'),
getDictItems('strength'),
getDictItems('humidity'),
getDictItems('version'),
getDictItems('size'),
getDictItems('quantity'),
]);
// 5. 获取商品分类列表
const categoriesResponse = await productcontrollerGetcategoriesall();
const categoryOptions =
categoriesResponse?.data?.map((category: any) => ({
name: category.name,
shortName: category.shortName || category.name,
})) || [];
// 商品分类的映射（如果分类有shortName的话）
const categoryMapping =
categoriesResponse?.data?.reduce(
(acc: AttributeMapping, category: any) => {
acc[category.name] = category.shortName || category.name;
return acc;
},
{},
) || {};
// 6. 设置所有属性映射
setAttributeMappings({
brands: brandResult.mapping,
categories: categoryMapping,
flavors: flavorResult.mapping,
strengths: strengthResult.mapping,
humidities: humidityResult.mapping,
versions: versionResult.mapping,
sizes: sizeResult.mapping,
quantities: quantityResult.mapping,
});
// 更新配置状态
const newConfig = {
brands: brandResult.options,
categories: categoryOptions,
flavors: flavorResult.options,
strengths: strengthResult.options,
humidities: humidityResult.options,
versions: versionResult.options,
sizes: sizeResult.options,
quantities: quantityResult.options,
};
setConfig(newConfig);
// 设置表单值时只需要name数组
form.setFieldsValue({
brands: brandResult.options.map((opt) => opt.name),
categories: categoryOptions.map((opt) => opt.name),
flavors: flavorResult.options.map((opt) => opt.name),
strengths: strengthResult.options.map((opt) => opt.name),
humidities: humidityResult.options.map((opt) => opt.name),
versions: versionResult.options.map((opt) => opt.name),
sizes: sizeResult.options.map((opt) => opt.name),
quantities: quantityResult.options.map((opt) => opt.name),
generateBundleSkuForSingle: true,
});
message.success({ content: '数据加载成功', key: 'loading' });
} catch (error) {
console.error('Failed to fetch data:', error);
message.error({
content: '数据加载失败，请刷新页面重试',
key: 'loading',
});
}
};
fetchAllData();
}, [form]);
/**
* @description 处理文件上传
*/
const handleFileUpload = (uploadedFile: File) => {
// 检查文件类型
if (!uploadedFile.name.match(/\.(csv|xlsx|xls)$/)) {
message.error('请上传 CSV 或 Excel 格式的文件!');
return false;
}
setFile(uploadedFile);
const reader = new FileReader();
// 检查是否为CSV文件
const isCsvFile = uploadedFile.name.match(/\.csv$/i);
if (isCsvFile) {
// 对于CSV文件，使用readAsText并指定UTF-8编码以正确处理中文
reader.onload = (e) => {
try {
const textData = e.target?.result as string;
// 使用XLSX.read处理CSV文本数据，指定type为'csv'并设置编码
const workbook = XLSX.read(textData, {
type: 'string',
codepage: 65001, // UTF-8 encoding
cellText: true,
cellDates: true,
});
const sheetName = workbook.SheetNames[0];
const worksheet = workbook.Sheets[sheetName];
const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
if (jsonData.length < 2) {
message.error('文件为空或缺少表头!');
setCsvData([]);
return;
}
// 将数组转换为对象数组
const headers = jsonData[0] as string[];
const rows = jsonData.slice(1).map((rowArray: any) => {
const rowData: { [key: string]: any } = {};
headers.forEach((header, index) => {
rowData[header] = rowArray[index];
});
return rowData;
});
message.success(`成功解析 ${rows.length} 条数据.`);
setCsvData(rows);
setProcessedData([]); // 清空旧的处理结果
} catch (error) {
message.error('CSV文件解析失败,请检查文件格式和编码!');
console.error('CSV Parse Error:', error);
setCsvData([]);
}
};
reader.readAsText(uploadedFile, 'UTF-8');
} else {
// 对于Excel文件，继续使用readAsArrayBuffer
reader.onload = (e) => {
try {
const data = e.target?.result;
// 如果是ArrayBuffer，使用type: 'array'来处理
const workbook = XLSX.read(data, { type: 'array' });
const sheetName = workbook.SheetNames[0];
const worksheet = workbook.Sheets[sheetName];
const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
if (jsonData.length < 2) {
message.error('文件为空或缺少表头!');
setCsvData([]);
return;
}
// 将数组转换为对象数组
const headers = jsonData[0] as string[];
const rows = jsonData.slice(1).map((rowArray: any) => {
const rowData: { [key: string]: any } = {};
headers.forEach((header, index) => {
rowData[header] = rowArray[index];
});
return rowData;
});
message.success(`成功解析 ${rows.length} 条数据.`);
setCsvData(rows);
setProcessedData([]); // 清空旧的处理结果
} catch (error) {
message.error('Excel文件解析失败,请检查文件格式!');
console.error('Excel Parse Error:', error);
setCsvData([]);
}
};
reader.readAsArrayBuffer(uploadedFile);
}
reader.onerror = (error) => {
message.error('文件读取失败!');
console.error('File Read Error:', error);
};
return false; // 阻止antd Upload组件的默认上传行为
};
/**
* @description 将数据转换回CSV并触发下载
*/
const downloadData = (data: any[]) => {
if (data.length === 0) return;
const workbook = XLSX.utils.book_new();
const worksheet = XLSX.utils.json_to_sheet(data);
XLSX.utils.book_append_sheet(workbook, worksheet, 'Products with SKU');
const fileName = `products_with_sku_${Date.now()}.xlsx`;
XLSX.writeFile(workbook, fileName);
message.success('下载任务已开始!');
};
/**
* @description 根据配置生成SKU（不包含站点前缀）
* @param {string} brand - 品牌
* @param {string} category - 分类
* @param {string} flavor - 口味
* @param {string} strength - 强度
* @param {string} humidity - 湿度
* @param {string} version - 版本
* @param {string} type - 产品类型
* @returns {string} 生成的SKU
*/
const generateSku = (
brand: string,
version: string,
category: string,
flavor: string,
strength: string,
humidity: string,
size: string,
quantity?: any,
type?: string,
): string => {
// 构建SKU组件，不包含站点前缀
const skuComponents: string[] = [];
// 按顺序添加SKU组件，所有属性都使用shortName
if (brand) {
// 使用品牌的shortName，如果没有则使用品牌名称
const brandShortName = attributeMappings.brands[brand] || brand;
skuComponents.push(brandShortName);
}
if (version) {
// 使用版本的shortName，如果没有则使用版本名称
const versionShortName = attributeMappings.versions[version] || version;
skuComponents.push(versionShortName);
}
if (category) {
// 使用分类的shortName，如果没有则使用分类名称
const categoryShortName =
attributeMappings.categories[category] || category;
skuComponents.push(categoryShortName);
}
if (flavor) {
// 使用口味的shortName，如果没有则使用口味名称
const flavorShortName = attributeMappings.flavors[flavor] || flavor;
skuComponents.push(flavorShortName);
}
if (strength) {
// 使用强度的shortName，如果没有则使用强度名称
const strengthShortName =
attributeMappings.strengths[strength] || strength;
skuComponents.push(strengthShortName);
}
if (humidity) {
// 使用湿度的shortName，如果没有则使用湿度名称
const humidityShortName =
attributeMappings.humidities[humidity] || humidity;
skuComponents.push(humidityShortName);
}
if (size) {
// 使用尺寸的shortName，如果没有则使用尺寸名称
const sizeShortName = attributeMappings.sizes[size] || size;
skuComponents.push(sizeShortName);
}
// 如果type为single且启用了生成bundle SKU，则添加quantity
if (
quantity
) {
console.log(quantity, attributeMappings.quantities[quantity])
// 使用quantity的shortName，如果没有则使用quantity但匹配 4 个零
const quantityShortName = attributeMappings.quantities[quantity] || Number(quantity).toString().padStart(4, '0');
skuComponents.push(quantityShortName);
}
// 合并所有组件，使用短横线分隔
return skuComponents.join('-').toUpperCase();
};
/**
* @description 根据配置生成产品名称（使用属性的完整名称，空格分隔）
* @param {string} brand - 品牌
* @param {string} version - 版本
* @param {string} category - 分类
* @param {string} flavor - 口味
* @param {string} strength - 强度
* @param {string} humidity - 湿度
* @param {string} size - 型号
* @param {any} quantity - 数量
* @param {string} type - 产品类型
* @returns {string} 生成的产品名称
*/
const generateName = (
brand: string,
version: string,
category: string,
flavor: string,
strength: string,
humidity: string,
size: string,
quantity?: any,
type?: string,
): string => {
// 构建产品名称组件数组
const nameComponents: string[] = [];
// 按顺序添加组件：品牌 -> 版本 -> 品类 -> 风味 -> 毫克数（强度） -> 湿度 -> 型号 -> 数量
if (brand) nameComponents.push(brand);
if (version) nameComponents.push(version);
if (category) nameComponents.push(category);
if (flavor) nameComponents.push(flavor);
if (strength) nameComponents.push(strength);
if (humidity) nameComponents.push(humidity);
if (size) nameComponents.push(size);
// 如果有数量且类型为bundle或者生成bundle的single产品，则添加数量
if (
type==='bundle' && quantity
) {
nameComponents.push(String(quantity));
}
// 使用空格连接所有组件
return nameComponents.join(' ');
};
/**
* @description 为所有站点生成带前缀的siteSkus
* @param {string} baseSku - 基础SKU（不包含站点前缀）
* @returns {string} 所有站点的siteSkus，以分号分隔
*/
const generateSiteSkus = (baseSku: string): string => {
// 如果没有站点或基础SKU为空，返回空字符串
if (selectedSites.length === 0 || !baseSku) return '';
// 为每个站点生成siteSku
const siteSkus = selectedSites.map((site) => {
// 如果站点有shortName，则添加前缀，否则使用基础SKU
if (site.skuPrefix) {
return `${site.skuPrefix}-${baseSku}`;
}
return baseSku;
});
// 使用分号分隔所有站点的siteSkus
return [baseSku, ...siteSkus].join(';').toUpperCase();
};
/**
* @description 核心逻辑:根据配置处理CSV数据并生成SKU
*/
const handleProcessData = async () => {
if (csvData.length === 0) {
message.warning('请先上传并成功解析一个CSV文件.');
return;
}
if (selectedSites.length === 0) {
message.warning('没有可用的站点.');
return;
}
setIsProcessing(true);
message.loading({ content: '正在生成SKU...', key: 'processing' });
try {
// 获取表单中的最新配置
await form.validateFields();
// 处理每条数据，生成SKU和siteSkus
const dataWithSku = csvData.map((row) => {
const brand = row.attribute_brand || '';
const category = row.category || '';
const flavor = row.attribute_flavor || '';
const strength = row.attribute_strength || '';
const humidity = row.attribute_humidity || '';
const version = row.attribute_version || '';
const size = row.attribute_size || row.size || '';
// 将quantity保存到attribute_quantity字段
const quantity = row.attribute_quantity || row.quantity;
// 获取产品类型
const type = row.type || '';
// 生成基础SKU（不包含站点前缀）
const baseSku = generateSku(
brand,
version,
category,
flavor,
strength,
humidity,
size,
quantity,
type,
);
const name = generateName(
brand,
version,
category,
flavor,
strength,
humidity,
size,
quantity,
type,
);
// 为所有站点生成带前缀的siteSkus
const siteSkus = generateSiteSkus(baseSku);
// 返回包含新SKU和siteSkus的行数据，将SKU直接保存到sku栏
return {
...row,
sku: baseSku, // 直接生成在sku栏
generatedName: name,
// name: name, // 生成的产品名称
siteSkus,
attribute_quantity: quantity, // 确保quantity保存到attribute_quantity
};
});
// Determine which data to use for processing and download
let finalData = dataWithSku;
// If generateBundleSkuForSingle is enabled, generate bundle products for single products
if (generateBundleSkuForSingle) {
// Filter out single records
const singleRecords = dataWithSku.filter(
(row) => row.type === 'single',
);
// Get quantity values from the config (same source as other attributes like brand)
const quantityValues = config.quantities.map(quantity=>quantity.name)
// Generate bundle products for each single record and quantity
const generatedBundleRecords = singleRecords.flatMap((singleRecord) => {
return quantityValues.map((quantity) => {
// Extract all necessary attributes from the single record
const brand = singleRecord.attribute_brand || '';
const version = singleRecord.attribute_version || '';
const category = singleRecord.category || '';
const flavor = singleRecord.attribute_flavor || '';
const strength = singleRecord.attribute_strength || '';
const humidity = singleRecord.attribute_humidity || '';
const size = singleRecord.attribute_size || singleRecord.size || '';
// Generate bundle SKU with the quantity
const bundleSku = generateSku(
brand,
version,
category,
flavor,
strength,
humidity,
size,
quantity,
'bundle',
);
// Generate bundle name with the quantity
const bundleName = generateName(
brand,
version,
category,
flavor,
strength,
humidity,
size,
quantity,
'bundle',
);
// Generate siteSkus for the bundle
const bundleSiteSkus = generateSiteSkus(bundleSku);
// Create the bundle record
return {
...singleRecord,
type: 'bundle', // Change type to bundle
sku: bundleSku, // Use the new bundle SKU
name: bundleName, // Use the new bundle name
siteSkus: bundleSiteSkus,
attribute_quantity: quantity, // Set the attribute_quantity
component_1_sku: singleRecord.sku, // Set component_1_sku to the single product's sku
component_1_quantity: Number(quantity), // Set component_1_quantity to the same as attribute_quantity
};
});
});
// Combine original dataWithSku with generated bundle records
finalData = [...dataWithSku, ...generatedBundleRecords];
}
// Set the processed data
setProcessedData(finalData);
message.success({
content: 'SKU生成成功!正在自动下载...',
key: 'processing',
});
// 自动下载 the final data (with or without generated bundle products)
downloadData(finalData);
} catch (error) {
message.error({
content: '处理失败,请检查配置或文件.',
key: 'processing',
});
console.error('Processing Error:', error);
} finally {
setIsProcessing(false);
}
};
return ( return (
<PageContainer title="产品SKU批量生成工具"> <div>
<Row gutter={[16, 16]}> <h1>产品CSV 工具</h1>
{/* 左侧:配置表单 */}
<Col xs={24} md={10}>
<Card title="1. 配置SKU生成规则">
<ProForm
form={form}
initialValues={config}
onFinish={handleProcessData}
submitter={false}
>
<ProFormSelect
name="brands"
label="品牌列表"
mode="tags"
placeholder="请输入品牌,按回车确认"
rules={[{ required: true, message: '至少需要一个品牌' }]}
tooltip="品牌名称会作为SKU的第一个组成部分"
options={config.brands.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="categories"
label="商品分类"
mode="tags"
placeholder="请输入分类,按回车确认"
rules={[{ required: true, message: '至少需要一个分类' }]}
tooltip="分类名称会作为SKU的第二个组成部分"
options={config.categories.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="flavors"
label="口味列表"
mode="tags"
placeholder="请输入口味,按回车确认"
rules={[{ required: true, message: '至少需要一个口味' }]}
tooltip="口味名称会作为SKU的第三个组成部分"
options={config.flavors.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="strengths"
label="强度列表"
mode="tags"
placeholder="请输入强度,按回车确认"
tooltip="强度信息会作为SKU的第四个组成部分"
options={config.strengths.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="humidities"
label="湿度列表"
mode="tags"
placeholder="请输入湿度,按回车确认"
tooltip="湿度信息会作为SKU的第五个组成部分"
options={config.humidities.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="versions"
label="版本列表"
mode="tags"
placeholder="请输入版本,按回车确认"
tooltip="版本信息会作为SKU的第六个组成部分"
options={config.versions.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="sizes"
label="尺寸列表"
mode="tags"
placeholder="请输入尺寸,按回车确认"
tooltip="尺寸信息会作为SKU的第七个组成部分"
options={config.sizes.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
/>
<ProFormSelect
name="quantities"
label="数量列表"
mode="tags"
placeholder="请输入数量,按回车确认"
tooltip="数量信息会作为bundle SKU的组成部分"
options={config.quantities.map((opt) => ({
label: `${opt.name} (${opt.shortName})`,
value: opt.name,
}))}
fieldProps={{ allowClear: true }}
/>
<ProForm.Item
name="generateBundleSkuForSingle"
label="为type=single生成bundle产品数据行"
tooltip="为类型为single的记录生成包含quantity的bundle SKU"
valuePropName="checked"
initialValue={true}
>
<Checkbox onChange={setGenerateBundleSkuForSingle}>
启用为single类型生成bundle SKU
</Checkbox>
</ProForm.Item>
</ProForm>
</Card>
{/* 显示所有站点及其shortname */}
<Card title="3. 所有站点信息" style={{ marginTop: '16px' }}>
<div style={{ maxHeight: '200px', overflowY: 'auto' }}>
{sites.length > 0 ? (
<table style={{ width: '100%', borderCollapse: 'collapse' }}>
<thead>
<tr style={{ backgroundColor: '#fafafa' }}>
<th
style={{
padding: '8px',
textAlign: 'left',
borderBottom: '1px solid #e8e8e8',
}}
>
站点名称
</th>
<th
style={{
padding: '8px',
textAlign: 'left',
borderBottom: '1px solid #e8e8e8',
}}
>
ShortName
</th>
</tr>
</thead>
<tbody>
{sites.map((site) => (
<tr key={site.id}>
<td
style={{
padding: '8px',
borderBottom: '1px solid #e8e8e8',
}}
>
{site.name}
</td>
<td
style={{
padding: '8px',
borderBottom: '1px solid #e8e8e8',
fontWeight: 'bold',
}}
>
{site.skuPrefix}
</td>
</tr>
))}
</tbody>
</table>
) : (
<p style={{ textAlign: 'center', color: '#999' }}>
暂无站点信息
</p>
)}
</div> </div>
<div style={{ marginTop: '10px', fontSize: '12px', color: '#666' }}>
<p>
说明：所有站点的shortName将作为前缀添加到生成的SKU中，以分号分隔。
</p>
</div>
</Card>
</Col>
{/* 右侧:文件上传与操作 */}
<Col xs={24} md={14}>
<Card title="2. 上传文件并操作">
<Upload
beforeUpload={handleFileUpload}
maxCount={1}
showUploadList={!!file}
onRemove={() => {
setFile(null);
setCsvData([]);
setProcessedData([]);
}}
>
<Button icon={<UploadOutlined />}>选择 CSV 文件</Button>
</Upload>
<div style={{ marginTop: 16 }}>
<label style={{ display: 'block', marginBottom: 8 }}>
已上传文件
</label>
<Input value={file ? file.name : '暂未选择文件'} readOnly />
</div>
<Button
type="primary"
onClick={handleProcessData}
disabled={
csvData.length === 0 ||
isProcessing ||
selectedSites.length === 0
}
loading={isProcessing}
style={{ marginTop: '20px' }}
>
生成并下载SKU
</Button>
{/* 显示处理结果摘要 */}
{processedData.length > 0 && (
<div
style={{
marginTop: '20px',
padding: '10px',
backgroundColor: '#f0f9eb',
borderRadius: '4px',
}}
>
<p style={{ margin: 0, color: '#52c41a' }}>
已成功为 {processedData.length} 条产品记录生成SKU！
</p>
</div>
)}
</Card>
</Col>
</Row>
</PageContainer>
); );
}; }
export default CsvTool;

15
src/pages/Product/List/CreateForm.tsx
View File

@ -77,7 +77,7 @@ const CreateForm: React.FC<{
const strengthName: string = String(strengthValues?.[0] || ''); const strengthName: string = String(strengthValues?.[0] || '');
const flavorName: string = String(flavorValues?.[0] || ''); const flavorName: string = String(flavorValues?.[0] || '');
const humidityName: string = String(humidityValues?.[0] || ''); const humidityName: string = String(humidityValues?.[0] || '');
console.log(formValues); console.log(formValues)
// 调用模板渲染API来生成SKU // 调用模板渲染API来生成SKU
const { const {
data: rendered, data: rendered,
@ -89,22 +89,22 @@ const CreateForm: React.FC<{
category: formValues.category, category: formValues.category,
attributes: [ attributes: [
{ {
dict: { name: 'brand' }, dict: {name: "brand"},
shortName: brandName || '', shortName: brandName || '',
}, },
{ {
dict: { name: 'flavor' }, dict: {name: "flavor"},
shortName: flavorName || '', shortName: flavorName || '',
}, },
{ {
dict: { name: 'strength' }, dict: {name: "strength"},
shortName: strengthName || '', shortName: strengthName || '',
}, },
{ {
dict: { name: 'humidity' }, dict: {name: "humidity"},
shortName: humidityName ? capitalize(humidityName) : '', shortName: humidityName ? capitalize(humidityName) : '',
}, },
], ]
}, },
); );
if (!success) { if (!success) {
@ -219,8 +219,7 @@ const CreateForm: React.FC<{
// 根据产品类型决定是否组装 attributes // 根据产品类型决定是否组装 attributes
// 如果产品类型为 bundle，则 attributes 为空数组 // 如果产品类型为 bundle，则 attributes 为空数组
// 如果产品类型为 single，则根据 activeAttributes 动态组装 attributes // 如果产品类型为 single，则根据 activeAttributes 动态组装 attributes
const attributes = const attributes = values.type === 'bundle'
values.type === 'bundle'
? [] ? []
: activeAttributes.flatMap((attr: any) => { : activeAttributes.flatMap((attr: any) => {
const dictName = attr.name; const dictName = attr.name;

35
src/pages/Product/List/EditForm.tsx
View File

@ -4,6 +4,7 @@ import {
productcontrollerGetcategoryattributes, productcontrollerGetcategoryattributes,
productcontrollerGetproductcomponents, productcontrollerGetproductcomponents,
productcontrollerGetproductlist, productcontrollerGetproductlist,
productcontrollerGetproductsiteskus,
productcontrollerUpdateproduct, productcontrollerUpdateproduct,
} from '@/servers/api/product'; } from '@/servers/api/product';
import { sitecontrollerAll } from '@/servers/api/site'; import { sitecontrollerAll } from '@/servers/api/site';
@ -35,6 +36,7 @@ const EditForm: React.FC<{
const [stockStatus, setStockStatus] = useState< const [stockStatus, setStockStatus] = useState<
'in-stock' | 'out-of-stock' | null 'in-stock' | 'out-of-stock' | null
>(null); >(null);
const [siteSkuCodes, setSiteSkuCodes] = useState<string[]>([]);
const [sites, setSites] = useState<any[]>([]); const [sites, setSites] = useState<any[]>([]);
const [categories, setCategories] = useState<any[]>([]); const [categories, setCategories] = useState<any[]>([]);
@ -98,6 +100,15 @@ const EditForm: React.FC<{
const { data: componentsData } = const { data: componentsData } =
await productcontrollerGetproductcomponents({ id: record.id }); await productcontrollerGetproductcomponents({ id: record.id });
setComponents(componentsData || []); setComponents(componentsData || []);
// 获取站点SKU详细信息
const { data: siteSkusData } = await productcontrollerGetproductsiteskus({
id: record.id,
});
// 只提取code字段组成字符串数组
const codes = siteSkusData
? siteSkusData.map((item: any) => item.code)
: [];
setSiteSkuCodes(codes);
})(); })();
}, [record]); }, [record]);
@ -119,10 +130,10 @@ const EditForm: React.FC<{
type: type, type: type,
categoryId: (record as any).categoryId || (record as any).category?.id, categoryId: (record as any).categoryId || (record as any).category?.id,
// 初始化站点SKU为字符串数组 // 初始化站点SKU为字符串数组
// 修改后代码： siteSkus: siteSkuCodes,
siteSkus: (record.siteSkus || []).map((code) => ({ code })),
}; };
}, [record, components, type]); }, [record, components, type, siteSkuCodes]);
return ( return (
<DrawerForm<any> <DrawerForm<any>
title="编辑" title="编辑"
@ -187,7 +198,7 @@ const EditForm: React.FC<{
attributes, attributes,
type: values.type, // 直接使用 type type: values.type, // 直接使用 type
categoryId: values.categoryId, categoryId: values.categoryId,
siteSkus: values.siteSkus.map((v: { code: string }) => v.code) || [], // 直接传递字符串数组 siteSkus: values.siteSkus || [], // 直接传递字符串数组
// 连带更新 components // 连带更新 components
components: components:
values.type === 'bundle' values.type === 'bundle'
@ -210,8 +221,6 @@ const EditForm: React.FC<{
return false; return false;
}} }}
> >
{/* {JSON.stringify(record)}
{JSON.stringify(initialValues)} */}
<ProForm.Group> <ProForm.Group>
<ProFormText <ProFormText
name="sku" name="sku"
@ -315,17 +324,9 @@ const EditForm: React.FC<{
rules={[{ required: true, message: '请输入单品SKU' }]} rules={[{ required: true, message: '请输入单品SKU' }]}
request={async ({ keyWords }) => { request={async ({ keyWords }) => {
const params = keyWords const params = keyWords
? { ? { where: {sku: keyWords, name: keyWords, type: 'single'} }
where: { : { 'per_page': 9999 , where: {type: 'single'} };
sku: keyWords, const { data } = await productcontrollerGetproductlist(params);
name: keyWords,
type: 'single',
},
}
: { per_page: 9999, where: { type: 'single' } };
const { data } = await productcontrollerGetproductlist(
params,
);
if (!data || !data.items) { if (!data || !data.items) {
return []; return [];
} }

50
src/pages/Product/List/SyncToSiteModal/index.tsx
View File

@ -1,11 +1,11 @@
import { productcontrollerBatchsynctosite } from '@/servers/api/product'; import { showBatchOperationResult } from '@/utils/showResult';
import { sitecontrollerAll } from '@/servers/api/site'; import { sitecontrollerAll } from '@/servers/api/site';
import { templatecontrollerRendertemplate } from '@/servers/api/template'; import { templatecontrollerRendertemplate } from '@/servers/api/template';
import { showBatchOperationResult } from '@/utils/showResult'; import { productcontrollerBatchsynctosite } from '@/servers/api/product';
import { import {
ModalForm, ModalForm,
ProFormDependency,
ProFormSelect, ProFormSelect,
ProFormDependency,
ProFormText, ProFormText,
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { App, Button, Tag } from 'antd'; import { App, Button, Tag } from 'antd';
@ -36,14 +36,12 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
product: API.Product, product: API.Product,
): Promise<string> => { ): Promise<string> => {
try { try {
console.log('site', currentSite); console.log('site', currentSite)
const { data: renderedSku } = await templatecontrollerRendertemplate( const { data: renderedSku } = await templatecontrollerRendertemplate(
{ name: 'site.product.sku' }, { name: 'site.product.sku' },
{ site: currentSite, product }, { site: currentSite, product },
); );
return ( return renderedSku || `${currentSite.skuPrefix || ''}${product.sku || ''}`;
renderedSku || `${currentSite.skuPrefix || ''}${product.sku || ''}`
);
} catch (error) { } catch (error) {
return `${currentSite.skuPrefix || ''}${product.sku || ''}`; return `${currentSite.skuPrefix || ''}${product.sku || ''}`;
} }
@ -97,16 +95,15 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
} }
}} }}
onFinish={async (values) => { onFinish={async (values) => {
console.log(`values`, values); console.log(`values`,values)
if (!values.siteId) return false; if (!values.siteId) return false;
try { try {
const siteSkusMap = values.siteSkus || {}; const siteSkusMap = values.siteSkus || {};
const data = products.map((product) => ({ const data = products.map((product) => ({
productId: product.id, productId: product.id,
siteSku: siteSku: siteSkusMap[product.id] || `${values.siteId}-${product.sku}`,
siteSkusMap[product.id] || `${values.siteId}-${product.sku}`,
})); }));
console.log(`data`, data); console.log(`data`,data)
const result = await productcontrollerBatchsynctosite({ const result = await productcontrollerBatchsynctosite({
siteId: values.siteId, siteId: values.siteId,
data, data,
@ -131,14 +128,7 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
<ProFormDependency key={row.id} name={['siteId']}> <ProFormDependency key={row.id} name={['siteId']}>
{({ siteId }) => ( {({ siteId }) => (
<div style={{ marginBottom: 16 }}> <div style={{ marginBottom: 16 }}>
<div <div style={{ display: 'flex', gap: 8, alignItems: 'center', marginBottom: 8 }}>
style={{
display: 'flex',
gap: 8,
alignItems: 'center',
marginBottom: 8,
}}
>
<div style={{ minWidth: 220 }}>原始SKU: {row.sku || '-'}</div> <div style={{ minWidth: 220 }}>原始SKU: {row.sku || '-'}</div>
<div style={{ minWidth: 150 }}> <div style={{ minWidth: 150 }}>
已有商品SKU:{' '} 已有商品SKU:{' '}
@ -160,12 +150,9 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
fieldProps={{ fieldProps={{
onChange: (e) => { onChange: (e) => {
// 手动输入时更新表单值 // 手动输入时更新表单值
const currentValues = const currentValues = formRef.current?.getFieldValue('siteSkus') || {};
formRef.current?.getFieldValue('siteSkus') || {};
currentValues[row.id] = e.target.value; currentValues[row.id] = e.target.value;
formRef.current?.setFieldsValue({ formRef.current?.setFieldsValue({ siteSkus: currentValues });
siteSkus: currentValues,
});
}, },
}} }}
/> />
@ -175,18 +162,11 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
size="small" size="small"
onClick={async () => { onClick={async () => {
if (siteId) { if (siteId) {
const currentSite = const currentSite = sites.find((s: any) => s.id === siteId) || {};
sites.find((s: any) => s.id === siteId) || {}; const siteSku = await generateSingleSiteSku(currentSite, row);
const siteSku = await generateSingleSiteSku( const currentValues = formRef.current?.getFieldValue('siteSkus') || {};
currentSite,
row,
);
const currentValues =
formRef.current?.getFieldValue('siteSkus') || {};
currentValues[row.id] = siteSku; currentValues[row.id] = siteSku;
formRef.current?.setFieldsValue({ formRef.current?.setFieldsValue({ siteSkus: currentValues });
siteSkus: currentValues,
});
} }
}} }}
> >

26
src/pages/Product/List/index.tsx
View File

@ -3,8 +3,9 @@ import {
productcontrollerBatchupdateproduct, productcontrollerBatchupdateproduct,
productcontrollerDeleteproduct, productcontrollerDeleteproduct,
productcontrollerGetcategoriesall, productcontrollerGetcategoriesall,
productcontrollerGetproductcomponents,
productcontrollerGetproductlist, productcontrollerGetproductlist,
productcontrollerUpdatenamecn, productcontrollerUpdatenamecn
} from '@/servers/api/product'; } from '@/servers/api/product';
import { import {
ActionType, ActionType,
@ -13,7 +14,7 @@ import {
ProColumns, ProColumns,
ProFormSelect, ProFormSelect,
ProFormText, ProFormText,
ProTable, ProTable
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { request } from '@umijs/max'; import { request } from '@umijs/max';
import { App, Button, Modal, Popconfirm, Tag, Upload } from 'antd'; import { App, Button, Modal, Popconfirm, Tag, Upload } from 'antd';
@ -153,18 +154,13 @@ const BatchEditModal: React.FC<{
</ModalForm> </ModalForm>
); );
}; };
const ProductList = ({ const ProductList = ({ filter, columns }: { filter: { skus: string[] }, columns: any[] }) => {
filter,
columns,
}: {
filter: { skus: string[] };
columns: any[];
}) => {
return ( return (
<ProTable <ProTable
request={async (pag) => { request={async (pag) => {
const { data, success } = await productcontrollerGetproductlist({ const { data, success } = await productcontrollerGetproductlist({
where: filter, where: filter
}); });
if (!success) return []; if (!success) return [];
return data || []; return data || [];
@ -174,7 +170,7 @@ const ProductList = ({
rowKey="id" rowKey="id"
bordered bordered
size="small" size="small"
scroll={{ x: 'max-content' }} scroll={{ x: "max-content" }}
headerTitle={null} headerTitle={null}
toolBarRender={false} toolBarRender={false}
/> />
@ -223,7 +219,6 @@ const List: React.FC = () => {
{ {
title: '关联商品', title: '关联商品',
dataIndex: 'siteSkus', dataIndex: 'siteSkus',
width: 200,
render: (_, record) => ( render: (_, record) => (
<> <>
{record.siteSkus?.map((siteSku, index) => ( {record.siteSkus?.map((siteSku, index) => (
@ -249,6 +244,7 @@ const List: React.FC = () => {
}, },
}, },
{ {
title: '价格', title: '价格',
dataIndex: 'price', dataIndex: 'price',
@ -447,6 +443,7 @@ const List: React.FC = () => {
onError?.(error); onError?.(error);
} }
}} }}
> >
<Button>批量导入</Button> <Button>批量导入</Button>
</Upload>, </Upload>,
@ -509,8 +506,8 @@ const List: React.FC = () => {
sortField = field; sortField = field;
sortOrder = sort[field]; sortOrder = sort[field];
} }
const { current, pageSize, ...where } = params; const { current, pageSize, ...where } = params
console.log(`params`, params); console.log(`params`, params)
const { data, success } = await productcontrollerGetproductlist({ const { data, success } = await productcontrollerGetproductlist({
where, where,
page: current || 1, page: current || 1,
@ -576,4 +573,5 @@ const List: React.FC = () => {
); );
}; };
export default List; export default List;

0
src/pages/Product/OrderStatistic/index.tsx
View File

1
src/pages/Product/Sync/index.tsx
View File

@ -1,3 +1,4 @@
import { showBatchOperationResult } from '@/utils/showResult';
import { import {
productcontrollerBatchsynctosite, productcontrollerBatchsynctosite,
productcontrollerGetproductlist, productcontrollerGetproductlist,

30
src/pages/Site/List/index.tsx
View File

@ -5,29 +5,14 @@ import {
sitecontrollerList, sitecontrollerList,
sitecontrollerUpdate, sitecontrollerUpdate,
} from '@/servers/api/site'; } from '@/servers/api/site';
import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
import { subscriptioncontrollerSync } from '@/servers/api/subscription'; import { subscriptioncontrollerSync } from '@/servers/api/subscription';
import { import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
ActionType, import { ActionType, ProColumns, ProTable, DrawerForm, ProFormSelect, ProFormSwitch } from '@ant-design/pro-components';
DrawerForm, import { Button, message, notification, Popconfirm, Space, Tag, Form } from 'antd';
ProColumns, import React, { useRef, useState, useEffect } from 'react';
ProFormSelect, import EditSiteForm from '../Shop/EditSiteForm'; // 引入重构后的表单组件
ProFormSwitch,
ProTable,
} from '@ant-design/pro-components';
import {
Button,
Form,
message,
notification,
Popconfirm,
Space,
Tag,
} from 'antd';
import * as countries from 'i18n-iso-countries'; import * as countries from 'i18n-iso-countries';
import zhCN from 'i18n-iso-countries/langs/zh'; import zhCN from 'i18n-iso-countries/langs/zh';
import React, { useEffect, useRef, useState } from 'react';
import EditSiteForm from '../Shop/EditSiteForm'; // 引入重构后的表单组件
// 区域数据项类型 // 区域数据项类型
interface AreaItem { interface AreaItem {
@ -64,6 +49,7 @@ const SiteList: React.FC = () => {
const [batchEditForm] = Form.useForm(); const [batchEditForm] = Form.useForm();
countries.registerLocale(zhCN); countries.registerLocale(zhCN);
const handleSync = async (ids: number[]) => { const handleSync = async (ids: number[]) => {
if (!ids.length) return; if (!ids.length) return;
const hide = message.loading('正在同步...', 0); const hide = message.loading('正在同步...', 0);
@ -220,8 +206,8 @@ const SiteList: React.FC = () => {
}, },
{ {
// 地区列配置 // 地区列配置
title: '地区', title: "地区",
dataIndex: 'areas', dataIndex: "areas",
hideInSearch: true, hideInSearch: true,
render: (_, row) => { render: (_, row) => {
// 如果没有关联地区，显示"全局"标签 // 如果没有关联地区，显示"全局"标签

6
src/pages/Site/Shop/Customers/index.tsx
View File

@ -465,11 +465,7 @@ const CustomerPage: React.FC = () => {
<ProTable <ProTable
rowKey="id" rowKey="id"
search={false} search={false}
pagination={{ pagination={{ pageSize: 20 ,showSizeChanger: true, showQuickJumper: true,}}
pageSize: 20,
showSizeChanger: true,
showQuickJumper: true,
}}
columns={[ columns={[
{ title: '订单号', dataIndex: 'number', copyable: true }, { title: '订单号', dataIndex: 'number', copyable: true },
{ {

6
src/pages/Site/Shop/EditSiteForm.tsx
View File

@ -1,3 +1,4 @@
import { areacontrollerGetarealist } from '@/servers/api/area';
import { stockcontrollerGetallstockpoints } from '@/servers/api/stock'; import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
import { import {
DrawerForm, DrawerForm,
@ -8,9 +9,9 @@ import {
ProFormTextArea, ProFormTextArea,
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { Form } from 'antd'; import { Form } from 'antd';
import React, { useEffect } from 'react';
import * as countries from 'i18n-iso-countries'; import * as countries from 'i18n-iso-countries';
import zhCN from 'i18n-iso-countries/langs/zh'; import zhCN from 'i18n-iso-countries/langs/zh';
import React, { useEffect } from 'react';
// 定义组件的 props 类型 // 定义组件的 props 类型
interface EditSiteFormProps { interface EditSiteFormProps {
@ -40,8 +41,7 @@ const EditSiteForm: React.FC<EditSiteFormProps> = ({
// 如果是编辑模式并且有初始值 // 如果是编辑模式并且有初始值
if (isEdit && initialValues) { if (isEdit && initialValues) {
// 编辑模式下, 设置表单值为初始值 // 编辑模式下, 设置表单值为初始值
const { token, consumerKey, consumerSecret, ...safeInitialValues } = const { token, consumerKey, consumerSecret, ...safeInitialValues } = initialValues;
initialValues;
// 清空敏感字段, 让用户输入最新的数据 // 清空敏感字段, 让用户输入最新的数据
form.setFieldsValue({ form.setFieldsValue({
...safeInitialValues, ...safeInitialValues,

12
src/pages/Site/Shop/Orders/index.tsx
View File

@ -68,7 +68,7 @@ const OrdersPage: React.FC = () => {
dataIndex: 'id', dataIndex: 'id',
}, },
{ {
title: '订单号', title:'订单号',
dataIndex: 'number', dataIndex: 'number',
}, },
{ {
@ -384,7 +384,8 @@ const OrdersPage: React.FC = () => {
setSelectedRowKeys={setSelectedRowKeys} setSelectedRowKeys={setSelectedRowKeys}
siteId={siteId} siteId={siteId}
/>, />,
<Button disabled>批量发货</Button>, <Button disabled>批量发货</Button>
,
<Button <Button
title="批量删除" title="批量删除"
danger danger
@ -540,12 +541,9 @@ const OrdersPage: React.FC = () => {
return { status: key, count: 0 }; return { status: key, count: 0 };
} }
try { try {
const res = await request( const res = await request(`/site-api/${siteId}/orders/count`, {
`/site-api/${siteId}/orders/count`,
{
params: { ...baseWhere, status: rawStatus }, params: { ...baseWhere, status: rawStatus },
}, });
);
const totalCount = Number(res?.data?.total || 0); const totalCount = Number(res?.data?.total || 0);
return { status: key, count: totalCount }; return { status: key, count: totalCount };
} catch (err) { } catch (err) {

11
src/pages/Statistics/Order/index.tsx
View File

@ -20,10 +20,11 @@ import {
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { Button, Space, Tag } from 'antd'; import { Button, Space, Tag } from 'antd';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import weekOfYear from 'dayjs/plugin/weekOfYear';
import ReactECharts from 'echarts-for-react'; import ReactECharts from 'echarts-for-react';
import { useEffect, useMemo, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import weekOfYear from 'dayjs/plugin/weekOfYear';
import zhCN from 'i18n-iso-countries/langs/zh';
countries.registerLocale(zhCN);
dayjs.extend(weekOfYear); dayjs.extend(weekOfYear);
const highlightText = (text: string, keyword: string) => { const highlightText = (text: string, keyword: string) => {
if (!keyword) return text; if (!keyword) return text;
@ -150,12 +151,10 @@ const ListPage: React.FC = () => {
const format = formatMap[params.grouping] || 'YYYY-MM-DD'; const format = formatMap[params.grouping] || 'YYYY-MM-DD';
if (params.grouping === 'week') { if (params.grouping === 'week') {
setXAxis( setXAxis(res?.map((v) => {
res?.map((v) => {
const [year, week] = v.order_date.split('-'); const [year, week] = v.order_date.split('-');
return `${year}年第${week}周`; return `${year}年第${week}周`;
}), }));
);
} else { } else {
setXAxis(res?.map((v) => dayjs(v.order_date).format(format))); setXAxis(res?.map((v) => dayjs(v.order_date).format(format)));
} }

39
src/pages/Statistics/OrderSource/index.tsx
View File

@ -51,15 +51,9 @@ const ListPage: React.FC = () => {
show: true, show: true,
formatter: function (params) { formatter: function (params) {
if (!params.value) return ''; if (!params.value) return '';
return ( return Math.abs(params.value)
Math.abs(params.value) + + '\n'
'\n' + + Math.abs(data?.inactiveRes?.find((item) => item.order_month === params.name)?.new_user_total || 0);
Math.abs(
data?.inactiveRes?.find(
(item) => item.order_month === params.name,
)?.new_user_total || 0,
)
);
}, },
color: '#000000', color: '#000000',
}, },
@ -77,15 +71,9 @@ const ListPage: React.FC = () => {
show: true, show: true,
formatter: function (params) { formatter: function (params) {
if (!params.value) return ''; if (!params.value) return '';
return ( return Math.abs(params.value)
Math.abs(params.value) + + '\n'
'\n' + + Math.abs(data?.inactiveRes?.find((item) => item.order_month === params.name)?.old_user_total || 0);
Math.abs(
data?.inactiveRes?.find(
(item) => item.order_month === params.name,
)?.old_user_total || 0,
)
);
}, },
color: '#000000', color: '#000000',
}, },
@ -105,17 +93,10 @@ const ListPage: React.FC = () => {
show: true, show: true,
formatter: function (params) { formatter: function (params) {
if (!params.value) return ''; if (!params.value) return '';
return ( return Math.abs(params.value)
Math.abs(params.value) + + '\n' +
'\n' + +Math.abs(data?.res?.find((item) => item.order_month === params.name &&
+Math.abs( item.first_order_month_group === v)?.total || 0);
data?.res?.find(
(item) =>
item.order_month === params.name &&
item.first_order_month_group === v,
)?.total || 0,
)
);
}, },
color: '#000000', color: '#000000',
}, },

249
src/pages/Statistics/Sales/index copy.tsx
View File

@ -1,249 +0,0 @@
import { ordercontrollerGetordersales } from '@/servers/api/order';
import { sitecontrollerAll } from '@/servers/api/site';
import {
ActionType,
PageContainer,
ProColumns,
ProFormSwitch,
ProTable,
} from '@ant-design/pro-components';
import { Button } from 'antd';
import dayjs from 'dayjs';
import { saveAs } from 'file-saver';
import { useRef, useState } from 'react';
import * as XLSX from 'xlsx';
const ListPage: React.FC = () => {
const actionRef = useRef<ActionType>();
const formRef = useRef();
const [total, setTotal] = useState(0);
const [isSource, setIsSource] = useState(false);
const [yooneTotal, setYooneTotal] = useState({});
const columns: ProColumns<API.OrderSaleDTO>[] = [
{
title: '时间段',
dataIndex: 'dateRange',
valueType: 'dateTimeRange',
hideInTable: true,
formItemProps: {
rules: [
{
required: true,
message: '请选择时间段',
},
],
},
},
{
title: '排除套装',
dataIndex: 'exceptPackage',
valueType: 'switch',
hideInTable: true,
},
{
title: '产品名称',
dataIndex: 'sku',
},
{
title: '产品名称',
dataIndex: 'name',
},
{
title: '站点',
dataIndex: 'siteId',
valueType: 'select',
request: async () => {
const { data = [] } = await sitecontrollerAll();
return data.map((item) => ({
label: item.name,
value: item.id,
}));
},
hideInTable: true,
},
// {
// title: '分类',
// dataIndex: 'categoryName',
// hideInSearch: true,
// hideInTable: isSource,
// },
{
title: '数量',
dataIndex: 'totalQuantity',
hideInSearch: true,
},
{
title: '一单订单数',
dataIndex: 'firstOrderCount',
hideInSearch: true,
render(_, record) {
if (isSource) return record.firstOrderCount;
return `${record.firstOrderCount}(${record.firstOrderYOONEBoxCount})`;
},
},
{
title: '两单订单数',
dataIndex: 'secondOrderCount',
hideInSearch: true,
render(_, record) {
if (isSource) return record.secondOrderCount;
return `${record.secondOrderCount}(${record.secondOrderYOONEBoxCount})`;
},
},
{
title: '三单订单数',
dataIndex: 'thirdOrderCount',
hideInSearch: true,
render(_, record) {
if (isSource) return record.thirdOrderCount;
return `${record.thirdOrderCount}(${record.thirdOrderYOONEBoxCount})`;
},
},
{
title: '三单以上订单数',
dataIndex: 'moreThirdOrderCount',
hideInSearch: true,
render(_, record) {
if (isSource) return record.moreThirdOrderCount;
return `${record.moreThirdOrderCount}(${record.moreThirdOrderYOONEBoxCount})`;
},
},
{
title: '订单数',
dataIndex: 'totalOrders',
hideInSearch: true,
},
];
return (
<PageContainer ghost>
<ProTable
headerTitle="查询表格"
actionRef={actionRef}
formRef={formRef}
rowKey="id"
params={{ isSource }}
form={{
// ignoreRules: false,
initialValues: {
dateRange: [dayjs().startOf('month'), dayjs().endOf('month')],
},
}}
request={async ({ dateRange, ...param }) => {
const [startDate, endDate] = dateRange.values();
const { data, success } = await ordercontrollerGetordersales({
startDate,
endDate,
...param,
});
if (success) {
setTotal(data?.totalQuantity || 0);
setYooneTotal({
yoone3Quantity: data?.yoone3Quantity || 0,
yoone6Quantity: data?.yoone6Quantity || 0,
yoone9Quantity: data?.yoone9Quantity || 0,
yoone12Quantity: data?.yoone12Quantity || 0,
yoone12QuantityNew: data?.yoone12QuantityNew || 0,
yoone15Quantity: data?.yoone15Quantity || 0,
yoone18Quantity: data?.yoone18Quantity || 0,
zexQuantity: data?.zexQuantity || 0,
});
return {
total: data?.total || 0,
data: data?.items || [],
};
}
setTotal(0);
setYooneTotal({});
return {
data: [],
};
}}
columns={columns}
dateFormatter="number"
footer={() => `总计: ${total}`}
toolBarRender={() => [
<Button
type="primary"
onClick={async () => {
const { dateRange, param } = formRef.current?.getFieldsValue();
const [startDate, endDate] = dateRange.values();
const { data, success } = await ordercontrollerGetordersales({
startDate: dayjs(startDate).valueOf(),
endDate: dayjs(endDate).valueOf(),
...param,
current: 1,
pageSize: 20000,
});
if (!success) return;
// 表头
const headers = ['产品名', '数量'];
// 数据行
const rows = (data?.items || []).map((item) => {
return [item.name, item.totalQuantity];
});
// 导出
const sheet = XLSX.utils.aoa_to_sheet([headers, ...rows]);
const book = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(book, sheet, '销售');
const buffer = XLSX.write(book, {
bookType: 'xlsx',
type: 'array',
});
const blob = new Blob([buffer], {
type: 'application/octet-stream',
});
saveAs(blob, '销售.xlsx');
}}
>
导出
</Button>,
<ProFormSwitch
label="原产品"
fieldProps={{
value: isSource,
onChange: () => setIsSource(!isSource),
}}
/>,
]}
/>
<div
style={{
background: '#fff',
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-between',
padding: '10px',
marginTop: '20px',
}}
>
<div>
YOONE:{' '}
{(yooneTotal.yoone3Quantity || 0) +
(yooneTotal.yoone6Quantity || 0) +
(yooneTotal.yoone9Quantity || 0) +
(yooneTotal.yoone12Quantity || 0) +
(yooneTotal.yoone15Quantity || 0) +
(yooneTotal.yoone18Quantity || 0) +
(yooneTotal.zexQuantity || 0)}
</div>
<div>YOONE 3MG: {yooneTotal.yoone3Quantity || 0}</div>
<div>YOONE 6MG: {yooneTotal.yoone6Quantity || 0}</div>
<div>YOONE 9MG: {yooneTotal.yoone9Quantity || 0}</div>
<div>YOONE 12MG新: {yooneTotal.yoone12QuantityNew || 0}</div>
<div>
YOONE 12MG白:{' '}
{(yooneTotal.yoone12Quantity || 0) -
(yooneTotal.yoone12QuantityNew || 0)}
</div>
<div>YOONE 15MG: {yooneTotal.yoone15Quantity || 0}</div>
<div>YOONE 18MG: {yooneTotal.yoone18Quantity || 0}</div>
<div>ZEX: {yooneTotal.zexQuantity || 0}</div>
</div>
</PageContainer>
);
};
export default ListPage;

30
src/pages/Statistics/Sales/index.tsx
View File

@ -41,10 +41,6 @@ const ListPage: React.FC = () => {
valueType: 'switch', valueType: 'switch',
hideInTable: true, hideInTable: true,
}, },
{
title: '产品名称',
dataIndex: 'sku',
},
{ {
title: '产品名称', title: '产品名称',
dataIndex: 'name', dataIndex: 'name',
@ -77,31 +73,37 @@ const ListPage: React.FC = () => {
title: '一单订单数', title: '一单订单数',
dataIndex: 'firstOrderCount', dataIndex: 'firstOrderCount',
hideInSearch: true, hideInSearch: true,
render(_, record) {
if (isSource) return record.firstOrderCount;
return `${record.firstOrderCount}(${record.firstOrderYOONEBoxCount})`;
}, },
{
title: '一单YOONE盒数',
dataIndex: 'firstOrderYOONEBoxCount',
hideInSearch: true,
}, },
{ {
title: '两单订单数', title: '两单订单数',
dataIndex: 'secondOrderCount', dataIndex: 'secondOrderCount',
hideInSearch: true, hideInSearch: true,
render(_, record) {
if (isSource) return record.secondOrderCount;
return `${record.secondOrderCount}(${record.secondOrderYOONEBoxCount})`;
}, },
{
title: '两单YOONE盒数',
dataIndex: 'secondOrderYOONEBoxCount',
hideInSearch: true,
}, },
{ {
title: '三单订单数', title: '三单订单数',
dataIndex: 'thirdOrderCount', dataIndex: 'thirdOrderCount',
hideInSearch: true, hideInSearch: true,
render(_, record) {
if (isSource) return record.thirdOrderCount;
return `${record.thirdOrderCount}(${record.thirdOrderYOONEBoxCount})`;
},
}, },
{ {
title: '三单YOONE盒数', title: '三单以上订单数',
dataIndex: 'thirdOrderYOONEBoxCount', dataIndex: 'moreThirdOrderCount',
hideInSearch: true, hideInSearch: true,
render(_, record) {
if (isSource) return record.moreThirdOrderCount;
return `${record.moreThirdOrderCount}(${record.moreThirdOrderYOONEBoxCount})`;
},
}, },
{ {
title: '订单数', title: '订单数',

2
src/pages/Stock/Warehouse/index.tsx
View File

@ -16,9 +16,9 @@ import {
ProTable, ProTable,
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { App, Button, Divider, Popconfirm, Space, Tag } from 'antd'; import { App, Button, Divider, Popconfirm, Space, Tag } from 'antd';
import { useRef } from 'react';
import * as countries from 'i18n-iso-countries'; import * as countries from 'i18n-iso-countries';
import zhCN from 'i18n-iso-countries/langs/zh'; import zhCN from 'i18n-iso-countries/langs/zh';
import { useRef } from 'react';
// 初始化中文语言包 // 初始化中文语言包
countries.registerLocale(zhCN); countries.registerLocale(zhCN);