From 58d4be5893f9371d1193595421539a61a6e4468c Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Fri, 5 Jun 2026 19:03:12 +0800
Subject: [PATCH] fix: type

---
 .../src/api/crm/receivable/plan/index.ts      |  4 +++
 .../mes/pro/route/components/color-picker.vue |  6 ++--
 .../mes/pro/task/components/gantt-chart.vue   | 21 +++++++++--
 .../src/views/wms/md/item/category/data.ts    |  4 +--
 .../src/views/wms/md/merchant/data.ts         |  4 +--
 .../src/api/crm/receivable/plan/index.ts      |  4 +++
 .../src/api/crm/receivable/plan/index.ts      |  4 +++
 .../mall/trade/delivery/pickUpOrder/index.vue |  2 +-
 .../mes/pro/task/components/gantt-chart.vue   | 21 +++++++++--
 .../modules/wms-home-order-summary-cards.vue  |  4 +--
 .../src/views/wms/md/item/category/data.ts    |  4 +--
 .../web-ele/src/views/wms/md/merchant/data.ts |  4 +--
 .../effects/plugins/src/echarts/echarts.ts    | 35 -------------------
 packages/effects/plugins/src/echarts/index.ts |  3 +-
 packages/effects/plugins/src/echarts/types.ts |  8 +++++
 15 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/apps/web-antd/src/api/crm/receivable/plan/index.ts b/apps/web-antd/src/api/crm/receivable/plan/index.ts
index c4279d8ca..e192b9808 100644
--- a/apps/web-antd/src/api/crm/receivable/plan/index.ts
+++ b/apps/web-antd/src/api/crm/receivable/plan/index.ts
@@ -29,6 +29,10 @@ export namespace CrmReceivablePlanApi {
       returnTime: Date;
     };
   }
+  export interface PlanPageParam extends PageParam {
+    customerId?: number;
+    contractId?: number;
+  }
 }
 
 /** 查询回款计划列表 */
diff --git a/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue b/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue
index 76623fcb0..f3edab9f5 100644
--- a/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue
+++ b/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue
@@ -51,12 +51,12 @@ function handleColorChange(event: Event) {
 
 <style scoped>
 .route-color-picker__swatch {
+  inline-size: 36px;
   block-size: 28px;
+  padding: 2px;
+  cursor: pointer;
   border: 1px solid var(--ant-color-border, #d9d9d9);
   border-radius: 4px;
-  cursor: pointer;
-  inline-size: 36px;
-  padding: 2px;
 }
 
 .route-color-picker__swatch:disabled {
diff --git a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
index dca1347c9..497cbff51 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
+++ b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
@@ -89,8 +89,20 @@ function initGantt() {
 
   gantt.config.columns = [
     { name: 'text', label: '任务名称', tree: true, width: 180, resize: true },
-    { name: 'workstation', label: '工作站', align: 'center', width: 100, resize: true },
-    { name: 'process', label: '工序', align: 'center', width: 100, resize: true },
+    {
+      name: 'workstation',
+      label: '工作站',
+      align: 'center',
+      width: 100,
+      resize: true,
+    },
+    {
+      name: 'process',
+      label: '工序',
+      align: 'center',
+      width: 100,
+      resize: true,
+    },
     { name: 'start_date', label: '开始时间', align: 'center', width: 130 },
     { name: 'end_date', label: '结束时间', align: 'center', width: 130 },
   ];
@@ -194,7 +206,10 @@ defineExpose({ loadData });
 </script>
 
 <template>
-  <div ref="ganttContainer" :style="{ width: '100%', height: `${height}px` }"></div>
+  <div
+    ref="ganttContainer"
+    :style="{ width: '100%', height: `${height}px` }"
+  ></div>
 </template>
 
 <style>
diff --git a/apps/web-antd/src/views/wms/md/item/category/data.ts b/apps/web-antd/src/views/wms/md/item/category/data.ts
index 3dde41431..3596855dd 100644
--- a/apps/web-antd/src/views/wms/md/item/category/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/category/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsItemCategoryApi } from '#/api/wms/md/item/category';
 
-import { DICT_TYPE, generateWmsCode, h } from 'vue';
+import { h } from 'vue';
 
-import { CommonStatusEnum } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE, generateWmsCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
diff --git a/apps/web-antd/src/views/wms/md/merchant/data.ts b/apps/web-antd/src/views/wms/md/merchant/data.ts
index a860faddb..1fe924959 100644
--- a/apps/web-antd/src/views/wms/md/merchant/data.ts
+++ b/apps/web-antd/src/views/wms/md/merchant/data.ts
@@ -1,9 +1,9 @@
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { generateWmsCode, h } from 'vue';
+import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, generateWmsCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
diff --git a/apps/web-antdv-next/src/api/crm/receivable/plan/index.ts b/apps/web-antdv-next/src/api/crm/receivable/plan/index.ts
index c4279d8ca..e192b9808 100644
--- a/apps/web-antdv-next/src/api/crm/receivable/plan/index.ts
+++ b/apps/web-antdv-next/src/api/crm/receivable/plan/index.ts
@@ -29,6 +29,10 @@ export namespace CrmReceivablePlanApi {
       returnTime: Date;
     };
   }
+  export interface PlanPageParam extends PageParam {
+    customerId?: number;
+    contractId?: number;
+  }
 }
 
 /** 查询回款计划列表 */
diff --git a/apps/web-ele/src/api/crm/receivable/plan/index.ts b/apps/web-ele/src/api/crm/receivable/plan/index.ts
index c4279d8ca..e192b9808 100644
--- a/apps/web-ele/src/api/crm/receivable/plan/index.ts
+++ b/apps/web-ele/src/api/crm/receivable/plan/index.ts
@@ -29,6 +29,10 @@ export namespace CrmReceivablePlanApi {
       returnTime: Date;
     };
   }
+  export interface PlanPageParam extends PageParam {
+    customerId?: number;
+    contractId?: number;
+  }
 }
 
 /** 查询回款计划列表 */
diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue
index c4f704cf5..552f8ef13 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue
@@ -21,7 +21,7 @@ import {
 import { useGridColumns, useGridFormSchema } from './data';
 
 // TODO @芋艿：风格和 antd 不一致；
-const summary = ref<MallOrderApi.OrderSummary>();
+const summary = ref<MallOrderApi.OrderSummaryRespVO>();
 
 /** 刷新表格 */
 function handleRefresh() {
diff --git a/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
index dca1347c9..497cbff51 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
+++ b/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
@@ -89,8 +89,20 @@ function initGantt() {
 
   gantt.config.columns = [
     { name: 'text', label: '任务名称', tree: true, width: 180, resize: true },
-    { name: 'workstation', label: '工作站', align: 'center', width: 100, resize: true },
-    { name: 'process', label: '工序', align: 'center', width: 100, resize: true },
+    {
+      name: 'workstation',
+      label: '工作站',
+      align: 'center',
+      width: 100,
+      resize: true,
+    },
+    {
+      name: 'process',
+      label: '工序',
+      align: 'center',
+      width: 100,
+      resize: true,
+    },
     { name: 'start_date', label: '开始时间', align: 'center', width: 130 },
     { name: 'end_date', label: '结束时间', align: 'center', width: 130 },
   ];
@@ -194,7 +206,10 @@ defineExpose({ loadData });
 </script>
 
 <template>
-  <div ref="ganttContainer" :style="{ width: '100%', height: `${height}px` }"></div>
+  <div
+    ref="ganttContainer"
+    :style="{ width: '100%', height: `${height}px` }"
+  ></div>
 </template>
 
 <style>
diff --git a/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue b/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue
index fa5927912..99bdeb5fc 100644
--- a/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue
+++ b/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
-import { OrderStatusEnum, OrderTypeEnum, ref } from 'vue';
+import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, OrderStatusEnum, OrderTypeEnum } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 
 import { ElButton, ElCard, ElMessage, ElSkeleton } from 'element-plus';
diff --git a/apps/web-ele/src/views/wms/md/item/category/data.ts b/apps/web-ele/src/views/wms/md/item/category/data.ts
index 54909673c..36ed81330 100644
--- a/apps/web-ele/src/views/wms/md/item/category/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/category/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsItemCategoryApi } from '#/api/wms/md/item/category';
 
-import { DICT_TYPE, generateWmsCode, h } from 'vue';
+import { h } from 'vue';
 
-import { CommonStatusEnum } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE, generateWmsCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
diff --git a/apps/web-ele/src/views/wms/md/merchant/data.ts b/apps/web-ele/src/views/wms/md/merchant/data.ts
index 0d198cf4a..62c90262a 100644
--- a/apps/web-ele/src/views/wms/md/merchant/data.ts
+++ b/apps/web-ele/src/views/wms/md/merchant/data.ts
@@ -1,9 +1,9 @@
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { generateWmsCode, h } from 'vue';
+import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, generateWmsCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
diff --git a/packages/effects/plugins/src/echarts/echarts.ts b/packages/effects/plugins/src/echarts/echarts.ts
index 2eb05ea59..4888685a7 100644
--- a/packages/effects/plugins/src/echarts/echarts.ts
+++ b/packages/effects/plugins/src/echarts/echarts.ts
@@ -1,22 +1,3 @@
-import type {
-  // 系列类型的定义后缀都为 SeriesOption
-  BarSeriesOption,
-  GaugeSeriesOption,
-  LineSeriesOption,
-  MapSeriesOption,
-} from 'echarts/charts';
-import type {
-  DatasetComponentOption,
-  DataZoomComponentOption,
-  GeoComponentOption,
-  GridComponentOption,
-  // 组件类型的定义后缀都为 ComponentOption
-  TitleComponentOption,
-  TooltipComponentOption,
-  VisualMapComponentOption,
-} from 'echarts/components';
-import type { ComposeOption } from 'echarts/core';
-
 import {
   BarChart,
   FunnelChart,
@@ -48,21 +29,6 @@ import {
 } from 'echarts/features';
 import { CanvasRenderer } from 'echarts/renderers';
 
-// 通过 ComposeOption 来组合出一个只有必须组件和图表的 Option 类型
-export type ECOption = ComposeOption<
-  | BarSeriesOption
-  | DatasetComponentOption
-  | DataZoomComponentOption
-  | GaugeSeriesOption
-  | GeoComponentOption
-  | GridComponentOption
-  | LineSeriesOption
-  | MapSeriesOption
-  | TitleComponentOption
-  | TooltipComponentOption
-  | VisualMapComponentOption
->;
-
 // 注册必须的组件
 echarts.use([
   TitleComponent,
@@ -89,6 +55,5 @@ echarts.use([
   MapChart,
   GeoComponent,
 ]);
-export type { ECOption } from './types';
 
 export default echarts;
diff --git a/packages/effects/plugins/src/echarts/index.ts b/packages/effects/plugins/src/echarts/index.ts
index dbc5e2e11..2f80fb9d4 100644
--- a/packages/effects/plugins/src/echarts/index.ts
+++ b/packages/effects/plugins/src/echarts/index.ts
@@ -1,5 +1,6 @@
+export * from './echarts';
 export { default as EchartsUI } from './echarts-ui.vue';
-export type { ECOption } from './types';
+export * from './types';
 export * from './use-echarts';
 
 // add by 芋艿：额外透出 echarts 原生 EChartsOption 类型，方便业务模块（如 mes/home 图表配置）声明 option 返回值类型，避免业务侧直接依赖 echarts 包（apps 未把 echarts 列为直接依赖）
diff --git a/packages/effects/plugins/src/echarts/types.ts b/packages/effects/plugins/src/echarts/types.ts
index bebafb871..e81ff7e96 100644
--- a/packages/effects/plugins/src/echarts/types.ts
+++ b/packages/effects/plugins/src/echarts/types.ts
@@ -1,28 +1,36 @@
 import type {
   BarSeriesOption,
   LineSeriesOption,
+  MapSeriesOption,
   PieSeriesOption,
   RadarSeriesOption,
 } from 'echarts/charts';
 import type {
   DatasetComponentOption,
+  DataZoomComponentOption,
+  GeoComponentOption,
   GridComponentOption,
   LegendComponentOption,
   TitleComponentOption,
   ToolboxComponentOption,
   TooltipComponentOption,
+  VisualMapComponentOption,
 } from 'echarts/components';
 import type { ComposeOption } from 'echarts/core';
 
 export type ECOption = ComposeOption<
   | BarSeriesOption
   | DatasetComponentOption
+  | DataZoomComponentOption
+  | GeoComponentOption
   | GridComponentOption
   | LegendComponentOption
   | LineSeriesOption
+  | MapSeriesOption
   | PieSeriesOption
   | RadarSeriesOption
   | TitleComponentOption
   | ToolboxComponentOption
   | TooltipComponentOption
+  | VisualMapComponentOption
 >;