销售统计增加了筛选内容
This commit is contained in:
parent
46202d602e
commit
f030e6c334
|
|
@ -23,7 +23,6 @@ const Page = () => {
|
||||||
try {
|
try {
|
||||||
const { data, success, code, message: msg } = await usercontrollerLogin({...values, deviceId});
|
const { data, success, code, message: msg } = await usercontrollerLogin({...values, deviceId});
|
||||||
if (success) {
|
if (success) {
|
||||||
|
|
||||||
message.success('登录成功');
|
message.success('登录成功');
|
||||||
localStorage.setItem('token', data?.token as string);
|
localStorage.setItem('token', data?.token as string);
|
||||||
const { data: user } = await usercontrollerGetuser();
|
const { data: user } = await usercontrollerGetuser();
|
||||||
|
|
|
||||||
|
|
@ -499,6 +499,7 @@ const Detail: React.FC<{
|
||||||
orderId,
|
orderId,
|
||||||
});
|
});
|
||||||
if (!success || !data) return { data: {} };
|
if (!success || !data) return { data: {} };
|
||||||
|
// 合并订单中相同的sku,只显示一次记录总数
|
||||||
data.sales = data.sales?.reduce(
|
data.sales = data.sales?.reduce(
|
||||||
(acc: API.OrderSale[], cur: API.OrderSale) => {
|
(acc: API.OrderSale[], cur: API.OrderSale) => {
|
||||||
let idx = acc.findIndex((v: any) => v.productId === cur.productId);
|
let idx = acc.findIndex((v: any) => v.productId === cur.productId);
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,12 @@ const ListPage: React.FC = () => {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '排除套装',
|
||||||
|
dataIndex: 'exceptPackage',
|
||||||
|
valueType: 'switch',
|
||||||
|
hideInTable: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '产品名称',
|
title: '产品名称',
|
||||||
dataIndex: 'name',
|
dataIndex: 'name',
|
||||||
|
|
|
||||||
|
|
@ -501,7 +501,7 @@ declare namespace API {
|
||||||
/** sku */
|
/** sku */
|
||||||
sku?: string;
|
sku?: string;
|
||||||
quantity?: number;
|
quantity?: number;
|
||||||
isPackage?: boolean;
|
exceptPackage?: boolean;
|
||||||
isYoone?: boolean;
|
isYoone?: boolean;
|
||||||
isZex?: boolean;
|
isZex?: boolean;
|
||||||
size?: number;
|
size?: number;
|
||||||
|
|
@ -522,7 +522,7 @@ declare namespace API {
|
||||||
/** sku */
|
/** sku */
|
||||||
sku?: string;
|
sku?: string;
|
||||||
quantity?: number;
|
quantity?: number;
|
||||||
isPackage?: boolean;
|
exceptPackage?: boolean;
|
||||||
isYoone?: boolean;
|
isYoone?: boolean;
|
||||||
isZex?: boolean;
|
isZex?: boolean;
|
||||||
size?: number;
|
size?: number;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue