From 67723c55ebbecdef238df152148e170a6fd3ce85 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 6 Nov 2023 10:14:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B8=82=E5=9C=BA>=E8=AE=A2=E5=8D=95:?= =?UTF-8?q?=20=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- package.json | 2 +- src/views/Orders.jsx | 12 ++++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index df3c21d..2ff1b3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "haina-dashboard", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "haina-dashboard", - "version": "2.2.0", + "version": "2.2.1", "dependencies": { "@ant-design/charts": "^1.4.2", "@ant-design/pro-components": "^2.6.16", diff --git a/package.json b/package.json index b7d4f8c..4569904 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haina-dashboard", - "version": "2.2.0", + "version": "2.2.1", "private": true, "dependencies": { "@ant-design/charts": "^1.4.2", diff --git a/src/views/Orders.jsx b/src/views/Orders.jsx index 060179f..2b87f7e 100644 --- a/src/views/Orders.jsx +++ b/src/views/Orders.jsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; import { Row, Col, Tabs, Table, Divider, Spin } from "antd"; -import { ContainerOutlined, BlockOutlined, SmileOutlined, TagsOutlined, GlobalOutlined, FullscreenOutlined, DingtalkOutlined } from "@ant-design/icons"; +import { ContainerOutlined, BlockOutlined, SmileOutlined, TagsOutlined, GlobalOutlined, FullscreenOutlined, DingtalkOutlined, CarryOutOutlined } from "@ant-design/icons"; import { stores_Context } from "../config"; import { Line, Pie } from "@ant-design/charts"; import { observer } from "mobx-react"; @@ -330,7 +330,7 @@ class Orders extends Component { shows: ['DateType', 'DepartmentList', 'WebCode', 'IncludeTickets', 'dates'], fieldProps: { DepartmentList: { show_all: false, mode: 'multiple' }, - WebCode: { show_all: true }, + WebCode: { show_all: false, mode: 'multiple' }, years: { hide_vs: true }, }, }} @@ -374,6 +374,14 @@ class Orders extends Component { ), }, + { + key: 'Product', + label: ( + + + 产品类型 + ), + }, { key: 'Country', label: (