From 858011bfabb4be0872687670cfec8e15e8470aa1 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 24 May 2026 20:00:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes)=EF=BC=9A=E9=87=8D=E6=9E=84=20tm-tool-?= =?UTF-8?q?type-tree.vue=20=E4=B8=BA=20list.vue=20=E6=9B=B4=E5=90=88?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/mes/tm/tool/index.vue | 8 ++++---- .../src/views/mes/tm/tool/type/components/index.ts | 2 +- ...tm-tool-type-tree.vue => tm-tool-type-list.vue} | 14 +++++++------- apps/web-ele/src/views/mes/tm/tool/index.vue | 8 ++++---- .../src/views/mes/tm/tool/type/components/index.ts | 2 +- ...tm-tool-type-tree.vue => tm-tool-type-list.vue} | 14 +++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) rename apps/web-antd/src/views/mes/tm/tool/type/components/{tm-tool-type-tree.vue => tm-tool-type-list.vue} (89%) rename apps/web-ele/src/views/mes/tm/tool/type/components/{tm-tool-type-tree.vue => tm-tool-type-list.vue} (89%) diff --git a/apps/web-antd/src/views/mes/tm/tool/index.vue b/apps/web-antd/src/views/mes/tm/tool/index.vue index 2998e3f75..9225e52d0 100644 --- a/apps/web-antd/src/views/mes/tm/tool/index.vue +++ b/apps/web-antd/src/views/mes/tm/tool/index.vue @@ -13,7 +13,7 @@ import { Button, Card, message } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteTool, exportTool, getToolPage } from '#/api/mes/tm/tool'; import { $t } from '#/locales'; -import { TmToolTypeTree } from '#/views/mes/tm/tool/type/components'; +import { TmToolTypeList } from '#/views/mes/tm/tool/type/components'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; @@ -66,8 +66,8 @@ async function handleExport() { downloadFileFromBlobPart({ fileName: '工具.xls', source: data }); } -/** 工具类型树点击 */ -function handleToolTypeNodeClick(row: MesTmToolTypeApi.ToolType | undefined) { +/** 工具类型选中变化 */ +function handleToolTypeSelect(row: MesTmToolTypeApi.ToolType | undefined) { selectedToolTypeId.value = row?.id; handleRefresh(); } @@ -116,7 +116,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
- +
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts b/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts index 8b3fe0741..7d68a5c4d 100644 --- a/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts +++ b/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts @@ -1,2 +1,2 @@ +export { default as TmToolTypeList } from './tm-tool-type-list.vue'; export { default as TmToolTypeSelect } from './tm-tool-type-select.vue'; -export { default as TmToolTypeTree } from './tm-tool-type-tree.vue'; diff --git a/apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-tree.vue b/apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue similarity index 89% rename from apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-tree.vue rename to apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue index 7fc64c91f..6e6365c0e 100644 --- a/apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-tree.vue +++ b/apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue @@ -11,10 +11,10 @@ import { Input } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getToolTypeSimpleList } from '#/api/mes/tm/tool/type'; -defineOptions({ name: 'TmToolTypeTree' }); +defineOptions({ name: 'TmToolTypeList' }); const emit = defineEmits<{ - nodeClick: [row?: MesTmToolTypeApi.ToolType]; + select: [row?: MesTmToolTypeApi.ToolType]; }>(); const selectedId = ref(); // 当前选中工具类型编号 const filterText = ref(''); // 工具类型搜索关键字 @@ -47,15 +47,15 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, gridEvents: { cellClick: ({ row }: { row: MesTmToolTypeApi.ToolType }) => { - // 再次点击同一节点：取消选中 + // 再次点击同一项：取消选中 if (selectedId.value === row.id) { selectedId.value = undefined; gridApi.grid.clearCurrentRow(); - emit('nodeClick', undefined); + emit('select', undefined); return; } selectedId.value = row.id; - emit('nodeClick', row); + emit('select', row); }, }, }); @@ -71,12 +71,12 @@ async function loadList() { refreshGridData(); } -/** 重置工具类型树 */ +/** 重置工具类型列表 */ function reset() { selectedId.value = undefined; filterText.value = ''; gridApi.grid.clearCurrentRow(); - emit('nodeClick', undefined); + emit('select', undefined); refreshGridData(); } diff --git a/apps/web-ele/src/views/mes/tm/tool/index.vue b/apps/web-ele/src/views/mes/tm/tool/index.vue index 005453dd8..9031f261f 100644 --- a/apps/web-ele/src/views/mes/tm/tool/index.vue +++ b/apps/web-ele/src/views/mes/tm/tool/index.vue @@ -13,7 +13,7 @@ import { ElButton, ElCard, ElLoading, ElMessage } from 'element-plus'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteTool, exportTool, getToolPage } from '#/api/mes/tm/tool'; import { $t } from '#/locales'; -import { TmToolTypeTree } from '#/views/mes/tm/tool/type/components'; +import { TmToolTypeList } from '#/views/mes/tm/tool/type/components'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; @@ -63,8 +63,8 @@ async function handleExport() { downloadFileFromBlobPart({ fileName: '工具.xls', source: data }); } -/** 工具类型树点击 */ -function handleToolTypeNodeClick(row: MesTmToolTypeApi.ToolType | undefined) { +/** 工具类型选中变化 */ +function handleToolTypeSelect(row: MesTmToolTypeApi.ToolType | undefined) { selectedToolTypeId.value = row?.id; handleRefresh(); } @@ -113,7 +113,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
- +
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts b/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts index 8b3fe0741..7d68a5c4d 100644 --- a/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts +++ b/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts @@ -1,2 +1,2 @@ +export { default as TmToolTypeList } from './tm-tool-type-list.vue'; export { default as TmToolTypeSelect } from './tm-tool-type-select.vue'; -export { default as TmToolTypeTree } from './tm-tool-type-tree.vue'; diff --git a/apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-tree.vue b/apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue similarity index 89% rename from apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-tree.vue rename to apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue index 19010b069..e9874f2ba 100644 --- a/apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-tree.vue +++ b/apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue @@ -11,10 +11,10 @@ import { ElInput } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getToolTypeSimpleList } from '#/api/mes/tm/tool/type'; -defineOptions({ name: 'TmToolTypeTree' }); +defineOptions({ name: 'TmToolTypeList' }); const emit = defineEmits<{ - nodeClick: [row?: MesTmToolTypeApi.ToolType]; + select: [row?: MesTmToolTypeApi.ToolType]; }>(); const selectedId = ref(); // 当前选中工具类型编号 const filterText = ref(''); // 工具类型搜索关键字 @@ -47,15 +47,15 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, gridEvents: { cellClick: ({ row }: { row: MesTmToolTypeApi.ToolType }) => { - // 再次点击同一节点：取消选中 + // 再次点击同一项：取消选中 if (selectedId.value === row.id) { selectedId.value = undefined; gridApi.grid.clearCurrentRow(); - emit('nodeClick', undefined); + emit('select', undefined); return; } selectedId.value = row.id; - emit('nodeClick', row); + emit('select', row); }, }, }); @@ -71,12 +71,12 @@ async function loadList() { refreshGridData(); } -/** 重置工具类型树 */ +/** 重置工具类型列表 */ function reset() { selectedId.value = undefined; filterText.value = ''; gridApi.grid.clearCurrentRow(); - emit('nodeClick', undefined); + emit('select', undefined); refreshGridData(); }