From 0bc1981675866b45150c7ccc62a0a2894bdfa358 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 19 May 2026 14:46:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BC=98=E5=8C=96=20WMS=20?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8D=A1=E7=89=87=E6=A0=B7=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/wms/home/index.vue | 36 ++++++++++--------- .../wms-home-inventory-chart-options.ts | 14 ++++++-- .../modules/wms-home-inventory-charts.vue | 10 +++--- .../modules/wms-home-order-summary-cards.vue | 4 +-- .../wms-home-order-trend-chart-options.ts | 10 +++++- .../modules/wms-home-order-trend-chart.vue | 23 +++++++----- apps/web-ele/src/views/wms/home/index.vue | 36 ++++++++++--------- .../wms-home-inventory-chart-options.ts | 14 ++++++-- .../modules/wms-home-inventory-charts.vue | 10 +++--- .../modules/wms-home-order-summary-cards.vue | 4 +-- .../wms-home-order-trend-chart-options.ts | 10 +++++- .../modules/wms-home-order-trend-chart.vue | 23 +++++++----- 12 files changed, 124 insertions(+), 70 deletions(-) diff --git a/apps/web-antd/src/views/wms/home/index.vue b/apps/web-antd/src/views/wms/home/index.vue index 85c81d497..2a5114961 100644 --- a/apps/web-antd/src/views/wms/home/index.vue +++ b/apps/web-antd/src/views/wms/home/index.vue @@ -4,7 +4,7 @@ import { onMounted, ref } from 'vue'; import { DocAlert, Page } from '@vben/common-ui'; import { formatDateTime } from '@vben/utils'; -import { Button } from 'ant-design-vue'; +import { Button, Card } from 'ant-design-vue'; import { WmsWarehouseSelect } from '#/views/wms/md/warehouse/components'; @@ -45,26 +45,28 @@ onMounted(() => { -
-
-
-
WMS 首页
-
单据工作台 / 库存概览
+
+ +
+
+
WMS 首页
+
单据工作台 / 库存概览
+
+
+ + +
-
- - -
-
+ -
+
统计时间:{{ statTime }}
diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts b/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts index 3998f40b5..ce4ac4555 100644 --- a/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts +++ b/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts @@ -1,7 +1,13 @@ +import type { useEcharts } from '@vben/plugins/echarts'; + import type { WmsHomeStatisticsApi } from '#/api/wms/home'; import { formatQuantity } from '#/views/wms/utils/format'; +type WmsHomeChartOption = Parameters< + ReturnType['renderEcharts'] +>[0]; + export interface InventoryChartItem { name: string; value: number; @@ -36,7 +42,9 @@ function formatGoodsLegend(name: string, goodsShareList: InventoryChartItem[]) { } /** 货物占比图表配置 */ -export function getGoodsShareChartOptions(goodsShareList: InventoryChartItem[]): any { +export function getGoodsShareChartOptions( + goodsShareList: InventoryChartItem[], +): WmsHomeChartOption { return { color: ['#2f7df6', '#18a058', '#f59e0b', '#7c3aed', '#14b8a6'], legend: { @@ -70,7 +78,7 @@ export function getGoodsShareChartOptions(goodsShareList: InventoryChartItem[]): /** 库存分布图表配置 */ export function getWarehouseDistributionChartOptions( warehouseDistributionList: InventoryChartItem[], -): any { +): WmsHomeChartOption { const sortedList = warehouseDistributionList.toReversed(); return { color: ['#2f7df6'], @@ -80,7 +88,7 @@ export function getWarehouseDistributionChartOptions( barMaxWidth: 16, data: sortedList.map((item) => item.value), label: { - formatter: ({ value }: { value?: number }) => formatQuantityText(Number(value || 0)), + formatter: ({ value }) => formatQuantityText(Number(value || 0)), position: 'right', show: true, }, diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-charts.vue b/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-charts.vue index 6f2d333c3..42908dcda 100644 --- a/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-charts.vue +++ b/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-charts.vue @@ -5,6 +5,8 @@ import { nextTick, ref } from 'vue'; import { EchartsUI, useEcharts } from '@vben/plugins/echarts'; +import { Card } from 'ant-design-vue'; + import { getInventorySummary } from '#/api/wms/home'; import { @@ -68,7 +70,7 @@ defineExpose({ load }); diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue b/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue index 0fe3e92a0..d42a8a843 100644 --- a/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue +++ b/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue @@ -120,11 +120,11 @@ defineExpose({ load });