From 934baa46d47b610fdd128dfaacca76c6fb6c2edc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 6 Apr 2026 20:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(type):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=A0=91=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/dv/machinery/MachineryTypeTree.vue    |  78 -------------
 .../components/DvMachinerySelectDialog.vue    |   2 +-
 src/views/mes/dv/machinery/index.vue          |   2 +-
 .../type/components/MachineryTypeTree.vue     | 104 ++++++++++++++++++
 .../components/MdWorkstationSelectDialog.vue  |   2 +-
 .../batch/components/WmBatchSelectDialog.vue  |   2 +-
 6 files changed, 108 insertions(+), 82 deletions(-)
 delete mode 100644 src/views/mes/dv/machinery/MachineryTypeTree.vue
 create mode 100644 src/views/mes/dv/machinery/type/components/MachineryTypeTree.vue

diff --git a/src/views/mes/dv/machinery/MachineryTypeTree.vue b/src/views/mes/dv/machinery/MachineryTypeTree.vue
deleted file mode 100644
index e366c2b93..000000000
--- a/src/views/mes/dv/machinery/MachineryTypeTree.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div class="head-container">
-    <el-input v-model="filterName" class="mb-20px" clearable placeholder="请输入分类名称">
-      <template #prefix>
-        <Icon icon="ep:search" />
-      </template>
-    </el-input>
-  </div>
-  <div class="head-container">
-    <el-tree
-      ref="treeRef"
-      :data="machineryTypeList"
-      :expand-on-click-node="false"
-      :filter-node-method="filterNode"
-      :props="defaultProps"
-      default-expand-all
-      highlight-current
-      node-key="id"
-      @node-click="handleNodeClick"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ElTree } from 'element-plus'
-import { DvMachineryTypeApi } from '@/api/mes/dv/machinery/type'
-import { defaultProps, handleTree } from '@/utils/tree'
-
-defineOptions({ name: 'MachineryTypeTree' })
-
-const filterName = ref('')
-const machineryTypeList = ref<Tree[]>([])
-const treeRef = ref<InstanceType<typeof ElTree>>()
-
-/** 获得分类树 */
-const getTree = async () => {
-  const res = await DvMachineryTypeApi.getMachineryTypeSimpleList()
-  machineryTypeList.value = []
-  machineryTypeList.value.push(...handleTree(res))
-}
-
-/** 基于名字过滤 */
-const filterNode = (name: string, data: Tree) => {
-  if (!name) {
-    return true
-  }
-  return data.name.includes(name)
-}
-
-/** 处理分类被点击 */
-let currentNode: any = {}
-const handleNodeClick = async (row: { [key: string]: any }, treeNode: any) => {
-  if (currentNode && currentNode.name === row.name) {
-    treeNode.checked = !treeNode.checked
-  } else {
-    treeNode.checked = true
-  }
-  if (treeNode.checked) {
-    currentNode = row
-    emits('node-click', row)
-  } else {
-    treeRef.value!.setCurrentKey(undefined)
-    emits('node-click', undefined)
-    currentNode = null
-  }
-}
-const emits = defineEmits(['node-click'])
-
-/** 监听过滤名称 */
-watch(filterName, (val) => {
-  treeRef.value!.filter(val)
-})
-
-/** 初始化 */
-onMounted(async () => {
-  await getTree()
-})
-</script>
diff --git a/src/views/mes/dv/machinery/components/DvMachinerySelectDialog.vue b/src/views/mes/dv/machinery/components/DvMachinerySelectDialog.vue
index 8538c66e4..7d790aa36 100644
--- a/src/views/mes/dv/machinery/components/DvMachinerySelectDialog.vue
+++ b/src/views/mes/dv/machinery/components/DvMachinerySelectDialog.vue
@@ -128,7 +128,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import { DvMachineryApi, DvMachineryVO } from '@/api/mes/dv/machinery'
 import { MdWorkshopApi, MdWorkshopVO } from '@/api/mes/md/workstation/workshop'
-import MachineryTypeTree from '../MachineryTypeTree.vue'
+import MachineryTypeTree from '../type/components/MachineryTypeTree.vue'
 
 defineOptions({ name: 'DvMachinerySelectDialog' })
 
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
index f2c779997..1f937b25e 100644
--- a/src/views/mes/dv/machinery/index.vue
+++ b/src/views/mes/dv/machinery/index.vue
@@ -182,7 +182,7 @@ import download from '@/utils/download'
 import { DvMachineryApi, DvMachineryVO } from '@/api/mes/dv/machinery'
 import { MdWorkshopApi, MdWorkshopVO } from '@/api/mes/md/workstation/workshop'
 import MachineryForm from './MachineryForm.vue'
-import MachineryTypeTree from './MachineryTypeTree.vue'
+import MachineryTypeTree from './type/components/MachineryTypeTree.vue'
 import MachineryImportForm from './MachineryImportForm.vue'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { BarcodeDetail } from '@/views/mes/wm/barcode/components'
diff --git a/src/views/mes/dv/machinery/type/components/MachineryTypeTree.vue b/src/views/mes/dv/machinery/type/components/MachineryTypeTree.vue
new file mode 100644
index 000000000..6aa80bfe9
--- /dev/null
+++ b/src/views/mes/dv/machinery/type/components/MachineryTypeTree.vue
@@ -0,0 +1,104 @@
+<!--
+  MES 设备类型树面板
+
+  功能：加载设备类型树 + 关键字过滤 + 点击节点通知父组件
+  用法：<MachineryTypeTree @node-click="handleTypeClick" />
+  说明：
+    - 组件 mount 后自动加载数据，也可通过 ref 调用 loadTree() 手动刷新
+    - 支持 toggle：点击已选中节点会取消选中（emit undefined）
+  Events:
+    nodeClick(data: DvMachineryTypeVO | undefined) — 点击树节点时触发；取消选中时为 undefined
+  Expose:
+    loadTree() — 手动刷新分类树
+    clearCurrent() — 清除当前选中节点高亮
+    reset() — 重置整个树状态（清高亮 + 清搜索词）
+-->
+<template>
+  <el-input
+    v-model="filterText"
+    placeholder="搜索分类"
+    clearable
+    class="mb-12px"
+    :prefix-icon="iconSearch"
+  />
+  <el-tree
+    ref="treeRef"
+    :data="treeData"
+    :props="treeProps"
+    :expand-on-click-node="false"
+    :filter-node-method="filterNode"
+    default-expand-all
+    highlight-current
+    node-key="id"
+    @node-click="handleNodeClick"
+  />
+</template>
+
+<script setup lang="ts">
+import { DvMachineryTypeApi, DvMachineryTypeVO } from '@/api/mes/dv/machinery/type'
+import { handleTree } from '@/utils/tree'
+import { Search as iconSearch } from '@element-plus/icons-vue'
+
+defineOptions({ name: 'MachineryTypeTree' })
+
+const emit = defineEmits<{
+  nodeClick: [data: DvMachineryTypeVO | undefined]
+}>()
+
+const treeRef = ref() // 树组件 Ref
+const filterText = ref('') // 搜索关键字
+const treeData = ref<DvMachineryTypeVO[]>([]) // 树形数据
+const treeProps = { children: 'children', label: 'name' } // 树属性映射
+let currentNodeId: number | undefined // 当前选中节点 ID（用于 toggle 判断）
+
+/** 过滤树节点（按名称匹配） */
+const filterNode = (value: string, data: DvMachineryTypeVO) => {
+  if (!value) {
+    return true
+  }
+  return data.name?.includes(value)
+}
+
+/** 监听搜索关键字变化，触发树过滤 */
+watch(filterText, (val) => {
+  treeRef.value?.filter(val)
+})
+
+/** 点击树节点：支持 toggle（再次点击同一节点取消选中） */
+const handleNodeClick = (data: DvMachineryTypeVO) => {
+  if (currentNodeId === data.id) {
+    // 再次点击同一节点：取消选中
+    treeRef.value?.setCurrentKey(undefined)
+    currentNodeId = undefined
+    emit('nodeClick', undefined)
+  } else {
+    // 选中新节点
+    currentNodeId = data.id
+    emit('nodeClick', data)
+  }
+}
+
+/** 加载分类树数据 */
+const loadTree = async () => {
+  const list = await DvMachineryTypeApi.getMachineryTypeSimpleList()
+  treeData.value = handleTree(list)
+}
+
+onMounted(() => {
+  loadTree()
+})
+
+/** 清除当前选中节点高亮 */
+const clearCurrent = () => {
+  treeRef.value?.setCurrentKey(undefined)
+  currentNodeId = undefined
+}
+
+/** 重置整个树状态（清高亮 + 清搜索词） */
+const reset = () => {
+  clearCurrent()
+  filterText.value = ''
+}
+
+defineExpose({ loadTree, clearCurrent, reset })
+</script>
diff --git a/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue b/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue
index 99d3ba78a..7854fcfdc 100644
--- a/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue
+++ b/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue
@@ -1,7 +1,7 @@
 <!--
   MES 工作站弹窗选择器（支持单选/多选）
 
-  搜索字段：工作站编码、所属工序、所在车间（对齐 KTG simpletableSingle.vue）
+  搜索字段：工作站编码、所属工序、所在车间
   表格列：工作站编码、工作站名称、工作站地点、所在车间、所属工序、备注
 
   Props:
diff --git a/src/views/mes/wm/batch/components/WmBatchSelectDialog.vue b/src/views/mes/wm/batch/components/WmBatchSelectDialog.vue
index 9067a820c..a5e2e9733 100644
--- a/src/views/mes/wm/batch/components/WmBatchSelectDialog.vue
+++ b/src/views/mes/wm/batch/components/WmBatchSelectDialog.vue
@@ -161,7 +161,7 @@
         </el-form-item>
       </el-form>
     </ContentWrap>
-    <!-- 数据表格：对齐 KTG 展示字段 -->
+    <!-- 数据表格 -->
     <ContentWrap>
       <el-table
         ref="tableRef"