From 86e8585a317a825edc91ba25b2508825e3ad0056 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 5 Apr 2026 17:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(mes):=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E7=89=A9=E6=96=99=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

清理了不再使用的物料产品相关方法和接口，简化了代码结构，提高了可维护性。
---
 src/api/mes/md/item/index.ts                  |   5 -
 .../mes/md/item/components/MdItemSelect.vue   | 192 +++++++----
 .../md/item/components/MdItemSelectDialog.vue | 249 ++++++++++-----
 .../item/components/MdItemSelectDialogV2.vue  | 302 ------------------
 .../mes/md/item/components/MdItemSelectV2.vue | 170 ----------
 src/views/mes/md/item/index.vue               |   4 +-
 src/views/mes/wm/materialStock/index.vue      |   4 +-
 7 files changed, 319 insertions(+), 607 deletions(-)
 delete mode 100644 src/views/mes/md/item/components/MdItemSelectDialogV2.vue
 delete mode 100644 src/views/mes/md/item/components/MdItemSelectV2.vue

diff --git a/src/api/mes/md/item/index.ts b/src/api/mes/md/item/index.ts
index d80323100..e34a890a2 100644
--- a/src/api/mes/md/item/index.ts
+++ b/src/api/mes/md/item/index.ts
@@ -27,11 +27,6 @@ export const MdItemApi = {
     return await request.get({ url: `/mes/md/item/page`, params })
   },
 
-  // 查询物料产品精简列表
-  getItemSimpleList: async () => {
-    return await request.get({ url: `/mes/md/item/simple-list` })
-  },
-
   // 查询物料产品详情
   getItem: async (id: number) => {
     return await request.get({ url: `/mes/md/item/get?id=` + id })
diff --git a/src/views/mes/md/item/components/MdItemSelect.vue b/src/views/mes/md/item/components/MdItemSelect.vue
index 154c351a3..d5e2fd85f 100644
--- a/src/views/mes/md/item/components/MdItemSelect.vue
+++ b/src/views/mes/md/item/components/MdItemSelect.vue
@@ -1,48 +1,70 @@
-<!-- MES 物料产品选择器：纯下拉，前端过滤（支持 name、code） -->
+<!--
+  MES 物料产品选择器 V2：只读输入框 + 点击弹窗选择
+
+  交互：显示为只读 el-input，点击打开弹窗（单选模式）进行选择
+  Props:
+    modelValue  — 绑定的物料 ID（v-model）
+    disabled    — 是否禁用
+    clearable   — 是否允许清空（鼠标悬停时显示清除图标）
+    placeholder — 占位文字
+  Events:
+    update:modelValue — v-model 更新
+    change(item)      — 选中物料变化时触发，传递完整 MdItemVO（清空时为 undefined）
+-->
 <template>
-  <el-select
-    v-model="selectValue"
-    :placeholder="placeholder"
-    :disabled="disabled"
-    :clearable="clearable"
-    filterable
-    :filter-method="handleFilter"
-    class="!w-1/1"
-    @change="handleChange"
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
   >
-    <el-option v-for="item in filteredList" :key="item.id" :label="item.name" :value="item.id">
-      <div class="flex items-center gap-8px">
-        <span>{{ item.name }}</span>
-        <el-tag v-if="item.code" size="small" type="info" class="ml-4px">
-          编号: {{ item.code }}
-        </el-tag>
-        <el-tag v-if="item.specification" size="small" type="info" class="ml-4px">
-          规格: {{ item.specification }}
-        </el-tag>
-        <el-tag v-if="item.unitMeasureName" size="small" type="info" class="ml-4px">
-          单位: {{ item.unitMeasureName }}
-        </el-tag>
-      </div>
-    </el-option>
-  </el-select>
+    <el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code }}</div>
+          <div>名称：{{ selectedItem.name }}</div>
+          <div>规格：{{ selectedItem.specification || '-' }}</div>
+          <div>单位：{{ selectedItem.unitMeasureName || '-' }}</div>
+        </div>
+      </template>
+      <el-input
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        readonly
+        :suffix-icon="suffixIcon"
+        :class="disabled ? 'is-select-disabled' : 'is-select-clickable'"
+      />
+    </el-tooltip>
+  </div>
+  <!-- 弹窗必须放在 div 外部，否则弹窗内的点击事件会冒泡到 div 触发 handleClick -->
+  <MdItemSelectDialog ref="dialogRef" :multiple="false" @selected="handleSelected" />
 </template>
 
 <script setup lang="ts">
 import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
+import { Search, CircleClose } from '@element-plus/icons-vue'
+import MdItemSelectDialog from './MdItemSelectDialog.vue'
 
-defineOptions({ name: 'MdItemSelect' })
+// 组件有两个根节点（div + Dialog），Vue 不会自动继承 attrs；
+// 手动透传到外层 div，确保父组件传入的 class / style 等生效
+const attrs = useAttrs()
+
+defineOptions({ name: 'MdItemSelect', inheritAttrs: false })
 
 const props = withDefaults(
   defineProps<{
-    modelValue?: number
-    disabled?: boolean
-    clearable?: boolean
-    placeholder?: string
+    modelValue?: number // 绑定的物料 ID
+    disabled?: boolean // 是否禁用
+    clearable?: boolean // 是否允许清空
+    placeholder?: string // 占位文字
   }>(),
   {
     disabled: false,
     clearable: true,
-    placeholder: '请选择产品'
+    placeholder: '请选择产品物料'
   }
 )
 
@@ -51,36 +73,98 @@ const emit = defineEmits<{
   change: [item: MdItemVO | undefined]
 }>()
 
-const allList = ref<MdItemVO[]>([]) // 全量数据
-const filteredList = ref<MdItemVO[]>([]) // 过滤后数据
+const dialogRef = ref() // 弹窗 Ref
+const hovering = ref(false) // 鼠标是否悬停
 
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (val) => emit('update:modelValue', val)
+// ==================== 名称回显 ====================
+const selectedItem = ref<MdItemVO | undefined>() // 当前选中的物料对象
+
+/** 输入框显示文本：只展示物料名称，保持简洁 */
+const displayLabel = computed(() => {
+  return selectedItem.value?.name ?? ''
 })
 
-/** 前端过滤（name + code） */
-const handleFilter = (query: string) => {
-  if (!query) {
-    filteredList.value = allList.value
+/** 是否显示清除图标 */
+const showClear = computed(() => {
+  return props.clearable && !props.disabled && hovering.value && props.modelValue != null
+})
+
+/** 后缀图标：悬停且有值时显示清除，否则显示搜索 */
+const suffixIcon = computed(() => {
+  return showClear.value ? CircleClose : Search
+})
+
+/** 根据 ID 单条查询物料信息（用于编辑回显） */
+const resolveItemById = async (id: number | undefined) => {
+  if (id == null) {
+    selectedItem.value = undefined
     return
   }
-  const keyword = query.toLowerCase()
-  filteredList.value = allList.value.filter(
-    (item) =>
-      item.name?.toLowerCase().includes(keyword) || item.code?.toLowerCase().includes(keyword)
-  )
+  if (selectedItem.value?.id === id) {
+    return
+  }
+  try {
+    selectedItem.value = await MdItemApi.getItem(id)
+  } catch (e) {
+    console.error('[MdItemSelect] resolveItemById failed:', e)
+  }
 }
 
-/** 选中变化 */
-const handleChange = (val: number | undefined) => {
-  const item = allList.value.find((o) => o.id === val)
+/** 监听 modelValue 变化，触发回显 */
+watch(
+  () => props.modelValue,
+  (val) => {
+    resolveItemById(val)
+  },
+  { immediate: true }
+)
+
+// ==================== 点击交互 ====================
+
+/** 点击组件：清除或打开弹窗 */
+const handleClick = (e: MouseEvent) => {
+  if (props.disabled) {
+    return
+  }
+  // 点击清除图标：清空选中
+  const target = e.target as HTMLElement
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    e.stopPropagation()
+    selectedItem.value = undefined
+    emit('update:modelValue', undefined)
+    emit('change', undefined)
+    return
+  }
+  // 打开弹窗，传入当前选中 ID 用于预选高亮
+  const selectedIds = props.modelValue != null ? [props.modelValue] : []
+  dialogRef.value.open(selectedIds)
+}
+
+/** 弹窗选中回调 */
+const handleSelected = (rows: MdItemVO[]) => {
+  if (!rows || rows.length === 0) {
+    return
+  }
+  const item = rows[0]
+  selectedItem.value = item
+  emit('update:modelValue', item.id)
   emit('change', item)
 }
-
-/** 加载物料列表 */
-onMounted(async () => {
-  allList.value = await MdItemApi.getItemSimpleList()
-  filteredList.value = allList.value
-})
 </script>
+
+<style lang="scss" scoped>
+/* :deep 用于穿透 el-input 内部元素的 cursor 样式，UnoCSS 无法直接处理组件内部 DOM */
+.is-select-clickable {
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
+
+.is-select-disabled {
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: not-allowed;
+  }
+}
+</style>
diff --git a/src/views/mes/md/item/components/MdItemSelectDialog.vue b/src/views/mes/md/item/components/MdItemSelectDialog.vue
index ae4cf54f9..ef326231d 100644
--- a/src/views/mes/md/item/components/MdItemSelectDialog.vue
+++ b/src/views/mes/md/item/components/MdItemSelectDialog.vue
@@ -1,26 +1,19 @@
-<!-- MES 物料产品 弹窗选择器 -->
+<!--
+  MES 物料产品弹窗选择器 V2（支持单选/多选）
+
+  Props:
+    multiple — true 多选（checkbox），false 单选（radio）；默认 true
+  Events:
+    selected(rows: MdItemVO[]) — 确认选择后触发，单选时数组长度为 1
+  Expose:
+    open(selectedIds?: number[]) — 打开弹窗，可传入已选 ID 用于预选高亮
+-->
 <template>
   <Dialog title="物料产品选择" v-model="dialogVisible" width="80%">
     <el-row :gutter="20">
       <!-- 左侧：分类树 -->
       <el-col :span="5">
-        <el-input
-          v-model="filterText"
-          placeholder="搜索分类"
-          clearable
-          class="mb-12px"
-          :prefix-icon="iconSearch"
-        />
-        <el-tree
-          ref="treeRef"
-          :data="itemTypeTree"
-          :props="treeProps"
-          :expand-on-click-node="false"
-          :filter-node-method="filterNode"
-          default-expand-all
-          highlight-current
-          @node-click="handleNodeClick"
-        />
+        <MdItemTypeTree ref="typeTreeRef" @node-click="handleNodeClick" />
       </el-col>
       <!-- 右侧：物料表格 -->
       <el-col :span="19">
@@ -51,26 +44,56 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <!-- 数据表格 -->
+        <!-- 数据表格：单选 radio / 多选 checkbox 统一在一个 table 内 -->
         <el-table
+          ref="tableRef"
           v-loading="loading"
           :data="list"
           :stripe="true"
           :show-overflow-tooltip="true"
           border
+          row-key="id"
+          :highlight-current-row="!multiple"
           @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+          @row-dblclick="handleRowDblClick"
         >
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="物料编码" align="center" prop="code" width="120" />
-          <el-table-column label="物料名称" align="center" prop="name" min-width="120" />
-          <el-table-column label="规格型号" align="center" prop="specification" />
+          <!-- 多选：checkbox（reserve-selection 保证跨页勾选不丢失） -->
+          <el-table-column
+            v-if="multiple"
+            type="selection"
+            :reserve-selection="true"
+            width="50"
+            align="center"
+          />
+          <!-- 单选：radio -->
+          <el-table-column v-else width="50" align="center">
+            <template #default="{ row }">
+              <el-radio
+                v-model="selectedRadioId"
+                :value="row.id"
+                class="radio-no-label"
+                @change="handleRadioChange(row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="物料编码" align="center" prop="code" width="200" />
+          <el-table-column label="物料名称" align="left" prop="name" min-width="150" />
+          <el-table-column label="规格型号" align="left" prop="specification" min-width="120" />
           <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
           <el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
             <template #default="scope">
-              {{ getItemOrProductLabel(scope.row.itemOrProduct) }}
+              <dict-tag :type="DICT_TYPE.MES_MD_ITEM_OR_PRODUCT" :value="scope.row.itemOrProduct" />
             </template>
           </el-table-column>
           <el-table-column label="所属分类" align="center" prop="itemTypeName" width="120" />
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            :formatter="dateFormatter"
+            width="180"
+          />
         </el-table>
         <!-- 分页 -->
         <Pagination
@@ -89,109 +112,191 @@
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
 import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
-import { MdItemTypeApi, MdItemTypeVO } from '@/api/mes/md/item/type'
-import { handleTree } from '@/utils/tree'
-import { getItemOrProductLabel } from '@/views/mes/utils/constants'
-import { Search as iconSearch } from '@element-plus/icons-vue'
+import { MdItemTypeVO } from '@/api/mes/md/item/type'
+import MdItemTypeTree from '@/views/mes/md/item/type/components/MdItemTypeTree.vue'
 
 defineOptions({ name: 'MdItemSelectDialog' })
 
-const message = useMessage() // 消息弹窗
+const props = withDefaults(
+  defineProps<{
+    multiple?: boolean // true 多选（checkbox），false 单选（radio）
+  }>(),
+  {
+    multiple: true
+  }
+)
+
+const message = useMessage()
 const emit = defineEmits<{
-  selected: [rows: MdItemVO[]] // 确认选择事件
+  selected: [rows: MdItemVO[]]
 }>()
 
-const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogVisible = ref(false) // 弹窗是否展示
 const loading = ref(false) // 列表加载中
 const list = ref<MdItemVO[]>([]) // 物料列表
 const total = ref(0) // 总条数
-const selectedRows = ref<MdItemVO[]>([]) // 选中行
 
-// ==================== 分类树 ====================
-const treeRef = ref() // 树组件 Ref
-const filterText = ref('') // 分类搜索文本
-const itemTypeTree = ref<MdItemTypeVO[]>([]) // 分类树数据
-const treeProps = { children: 'children', label: 'name' } // 树属性配置
+// ==================== 选中状态 ====================
+const tableRef = ref() // 表格 Ref
+const typeTreeRef = ref() // 分类树 Ref
+const selectedRows = ref<MdItemVO[]>([]) // 多选模式：选中行
+const selectedRadioId = ref<number>() // 单选模式：选中 ID
+const currentRadioRow = ref<MdItemVO>() // 单选模式：选中行对象
+const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 ID
 
-/** 过滤树节点 */
-const filterNode = (value: string, data: MdItemTypeVO) => {
-  if (!value) return true
-  return data.name?.includes(value)
+/** 多选：checkbox 变化 */
+const handleSelectionChange = (rows: MdItemVO[]) => {
+  if (props.multiple) {
+    selectedRows.value = rows
+  }
 }
 
-/** 监听筛选文本变化 */
-watch(filterText, (val) => {
-  treeRef.value?.filter(val)
-})
+/** 单选：radio 变化 */
+const handleRadioChange = (row: MdItemVO) => {
+  currentRadioRow.value = row
+}
 
-/** 点击树节点 */
-const handleNodeClick = (data: MdItemTypeVO) => {
-  queryParams.itemTypeId = data.id
+/** 单击行：单选模式下点击整行即选中（降低操作成本），多选不处理（避免和 dblclick 冲突） */
+const handleRowClick = (row: MdItemVO) => {
+  if (props.multiple) {
+    return
+  }
+  selectedRadioId.value = row.id
+  currentRadioRow.value = row
+}
+
+/** 双击行：多选模式切换勾选，单选模式直接确认 */
+const handleRowDblClick = (row: MdItemVO) => {
+  if (props.multiple) {
+    tableRef.value?.toggleRowSelection(row)
+    return
+  }
+  selectedRadioId.value = row.id
+  currentRadioRow.value = row
+  confirmSelect()
+}
+
+// ==================== 分类树 ====================
+
+/** 点击分类树节点，按分类筛选（支持取消选中） */
+const handleNodeClick = (data: MdItemTypeVO | undefined) => {
+  queryParams.itemTypeId = data?.id
   handleQuery()
 }
 
 // ==================== 物料查询 ====================
 const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  code: undefined as string | undefined,
-  name: undefined as string | undefined,
-  itemTypeId: undefined as number | undefined
+  pageNo: 1, // 页码
+  pageSize: 10, // 每页条数
+  code: undefined as string | undefined, // 物料编码
+  name: undefined as string | undefined, // 物料名称
+  itemTypeId: undefined as number | undefined // 物料分类编号
 })
 
-/** 查询列表 */
+/** 查询物料列表 */
 const getList = async () => {
   loading.value = true
   try {
     const data = await MdItemApi.getItemPage(queryParams)
     list.value = data.list
     total.value = data.total
+    await nextTick()
+    applyPreSelection()
   } finally {
     loading.value = false
   }
 }
 
-/** 搜索 */
+/** 恢复预选状态（当前页可见范围内） */
+const applyPreSelection = () => {
+  if (preSelectedIds.value.length === 0) {
+    return
+  }
+  if (props.multiple) {
+    const table = tableRef.value
+    if (!table) {
+      return
+    }
+    list.value.forEach((row) => {
+      if (preSelectedIds.value.includes(row.id)) {
+        table.toggleRowSelection(row, true)
+      }
+    })
+  } else {
+    const match = list.value.find((row) => preSelectedIds.value.includes(row.id))
+    if (match) {
+      selectedRadioId.value = match.id
+      currentRadioRow.value = match
+    }
+  }
+}
+
+/** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
 }
 
-/** 重置 */
+/** 重置查询条件（同步清除左侧树高亮和搜索词） */
 const resetQuery = () => {
   queryParams.code = undefined
   queryParams.name = undefined
   queryParams.itemTypeId = undefined
+  typeTreeRef.value?.reset()
   handleQuery()
 }
 
-/** 选中变化 */
-const handleSelectionChange = (rows: MdItemVO[]) => {
-  selectedRows.value = rows
-}
-
 /** 确认选择 */
 const confirmSelect = () => {
-  if (selectedRows.value.length === 0) {
-    message.warning('请至少选择一条数据')
-    return
+  if (props.multiple) {
+    if (selectedRows.value.length === 0) {
+      message.warning('请至少选择一条数据')
+      return
+    }
+    emit('selected', selectedRows.value)
+  } else {
+    if (!currentRadioRow.value) {
+      message.warning('请选择一条数据')
+      return
+    }
+    emit('selected', [currentRadioRow.value])
   }
-  emit('selected', selectedRows.value)
   dialogVisible.value = false
 }
 
 // ==================== 打开弹窗 ====================
 
-/** 打开弹窗 */
-const open = async () => {
+/** 打开弹窗，可传入已选 ID 用于预选高亮 */
+const open = async (selectedIds?: number[]) => {
   dialogVisible.value = true
+  // 重置查询条件 + 页码，避免二次打开继承上次过滤上下文
+  queryParams.code = undefined
+  queryParams.name = undefined
+  queryParams.itemTypeId = undefined
+  queryParams.pageNo = 1
+  // 重置分类树（清高亮 + 清搜索词）
+  typeTreeRef.value?.reset()
+  // 清空上一次的选中状态
   selectedRows.value = []
-  // 加载分类树
-  const typeList = await MdItemTypeApi.getItemTypeSimpleList()
-  itemTypeTree.value = handleTree(typeList)
-  // 加载物料列表
+  selectedRadioId.value = undefined
+  currentRadioRow.value = undefined
+  preSelectedIds.value = selectedIds ?? []
+  // 多选模式清空跨页缓存的勾选
+  await nextTick()
+  tableRef.value?.clearSelection()
   await getList()
 }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+defineExpose({ open })
 </script>
+
+<style lang="scss" scoped>
+/* 隐藏 radio 的 label 文字，只保留圆圈 */
+.radio-no-label {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/mes/md/item/components/MdItemSelectDialogV2.vue b/src/views/mes/md/item/components/MdItemSelectDialogV2.vue
deleted file mode 100644
index 23bf5495d..000000000
--- a/src/views/mes/md/item/components/MdItemSelectDialogV2.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<!--
-  MES 物料产品弹窗选择器 V2（支持单选/多选）
-
-  Props:
-    multiple — true 多选（checkbox），false 单选（radio）；默认 true
-  Events:
-    selected(rows: MdItemVO[]) — 确认选择后触发，单选时数组长度为 1
-  Expose:
-    open(selectedIds?: number[]) — 打开弹窗，可传入已选 ID 用于预选高亮
--->
-<template>
-  <Dialog title="物料产品选择" v-model="dialogVisible" width="80%">
-    <el-row :gutter="20">
-      <!-- 左侧：分类树 -->
-      <el-col :span="5">
-        <MdItemTypeTree ref="typeTreeRef" @node-click="handleNodeClick" />
-      </el-col>
-      <!-- 右侧：物料表格 -->
-      <el-col :span="19">
-        <!-- 搜索表单 -->
-        <el-form :inline="true" :model="queryParams" class="mb-10px" label-width="80px">
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="queryParams.code"
-              placeholder="请输入物料编码"
-              clearable
-              @keyup.enter="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入物料名称"
-              clearable
-              @keyup.enter="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="handleQuery">
-              <Icon icon="ep:search" class="mr-5px" /> 搜索
-            </el-button>
-            <el-button @click="resetQuery">
-              <Icon icon="ep:refresh" class="mr-5px" /> 重置
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <!-- 数据表格：单选 radio / 多选 checkbox 统一在一个 table 内 -->
-        <el-table
-          ref="tableRef"
-          v-loading="loading"
-          :data="list"
-          :stripe="true"
-          :show-overflow-tooltip="true"
-          border
-          row-key="id"
-          :highlight-current-row="!multiple"
-          @selection-change="handleSelectionChange"
-          @row-click="handleRowClick"
-          @row-dblclick="handleRowDblClick"
-        >
-          <!-- 多选：checkbox（reserve-selection 保证跨页勾选不丢失） -->
-          <el-table-column
-            v-if="multiple"
-            type="selection"
-            :reserve-selection="true"
-            width="50"
-            align="center"
-          />
-          <!-- 单选：radio -->
-          <el-table-column v-else width="50" align="center">
-            <template #default="{ row }">
-              <el-radio
-                v-model="selectedRadioId"
-                :value="row.id"
-                class="radio-no-label"
-                @change="handleRadioChange(row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="物料编码" align="center" prop="code" width="200" />
-          <el-table-column label="物料名称" align="left" prop="name" min-width="150" />
-          <el-table-column label="规格型号" align="left" prop="specification" min-width="120" />
-          <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
-          <el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
-            <template #default="scope">
-              <dict-tag :type="DICT_TYPE.MES_MD_ITEM_OR_PRODUCT" :value="scope.row.itemOrProduct" />
-            </template>
-          </el-table-column>
-          <el-table-column label="所属分类" align="center" prop="itemTypeName" width="120" />
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            :formatter="dateFormatter"
-            width="180"
-          />
-        </el-table>
-        <!-- 分页 -->
-        <Pagination
-          :total="total"
-          v-model:page="queryParams.pageNo"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-    <template #footer>
-      <el-button type="primary" @click="confirmSelect">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-
-<script setup lang="ts">
-import { DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
-import { MdItemTypeVO } from '@/api/mes/md/item/type'
-import MdItemTypeTree from '@/views/mes/md/item/type/components/MdItemTypeTree.vue'
-
-defineOptions({ name: 'MdItemSelectDialogV2' })
-
-const props = withDefaults(
-  defineProps<{
-    multiple?: boolean // true 多选（checkbox），false 单选（radio）
-  }>(),
-  {
-    multiple: true
-  }
-)
-
-const message = useMessage()
-const emit = defineEmits<{
-  selected: [rows: MdItemVO[]]
-}>()
-
-const dialogVisible = ref(false) // 弹窗是否展示
-const loading = ref(false) // 列表加载中
-const list = ref<MdItemVO[]>([]) // 物料列表
-const total = ref(0) // 总条数
-
-// ==================== 选中状态 ====================
-const tableRef = ref() // 表格 Ref
-const typeTreeRef = ref() // 分类树 Ref
-const selectedRows = ref<MdItemVO[]>([]) // 多选模式：选中行
-const selectedRadioId = ref<number>() // 单选模式：选中 ID
-const currentRadioRow = ref<MdItemVO>() // 单选模式：选中行对象
-const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 ID
-
-/** 多选：checkbox 变化 */
-const handleSelectionChange = (rows: MdItemVO[]) => {
-  if (props.multiple) {
-    selectedRows.value = rows
-  }
-}
-
-/** 单选：radio 变化 */
-const handleRadioChange = (row: MdItemVO) => {
-  currentRadioRow.value = row
-}
-
-/** 单击行：单选模式下点击整行即选中（降低操作成本），多选不处理（避免和 dblclick 冲突） */
-const handleRowClick = (row: MdItemVO) => {
-  if (props.multiple) {
-    return
-  }
-  selectedRadioId.value = row.id
-  currentRadioRow.value = row
-}
-
-/** 双击行：多选模式切换勾选，单选模式直接确认 */
-const handleRowDblClick = (row: MdItemVO) => {
-  if (props.multiple) {
-    tableRef.value?.toggleRowSelection(row)
-    return
-  }
-  selectedRadioId.value = row.id
-  currentRadioRow.value = row
-  confirmSelect()
-}
-
-// ==================== 分类树 ====================
-
-/** 点击分类树节点，按分类筛选（支持取消选中） */
-const handleNodeClick = (data: MdItemTypeVO | undefined) => {
-  queryParams.itemTypeId = data?.id
-  handleQuery()
-}
-
-// ==================== 物料查询 ====================
-const queryParams = reactive({
-  pageNo: 1, // 页码
-  pageSize: 10, // 每页条数
-  code: undefined as string | undefined, // 物料编码
-  name: undefined as string | undefined, // 物料名称
-  itemTypeId: undefined as number | undefined // 物料分类编号
-})
-
-/** 查询物料列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await MdItemApi.getItemPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-    await nextTick()
-    applyPreSelection()
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 恢复预选状态（当前页可见范围内） */
-const applyPreSelection = () => {
-  if (preSelectedIds.value.length === 0) {
-    return
-  }
-  if (props.multiple) {
-    const table = tableRef.value
-    if (!table) {
-      return
-    }
-    list.value.forEach((row) => {
-      if (preSelectedIds.value.includes(row.id)) {
-        table.toggleRowSelection(row, true)
-      }
-    })
-  } else {
-    const match = list.value.find((row) => preSelectedIds.value.includes(row.id))
-    if (match) {
-      selectedRadioId.value = match.id
-      currentRadioRow.value = match
-    }
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置查询条件（同步清除左侧树高亮和搜索词） */
-const resetQuery = () => {
-  queryParams.code = undefined
-  queryParams.name = undefined
-  queryParams.itemTypeId = undefined
-  typeTreeRef.value?.reset()
-  handleQuery()
-}
-
-/** 确认选择 */
-const confirmSelect = () => {
-  if (props.multiple) {
-    if (selectedRows.value.length === 0) {
-      message.warning('请至少选择一条数据')
-      return
-    }
-    emit('selected', selectedRows.value)
-  } else {
-    if (!currentRadioRow.value) {
-      message.warning('请选择一条数据')
-      return
-    }
-    emit('selected', [currentRadioRow.value])
-  }
-  dialogVisible.value = false
-}
-
-// ==================== 打开弹窗 ====================
-
-/** 打开弹窗，可传入已选 ID 用于预选高亮 */
-const open = async (selectedIds?: number[]) => {
-  dialogVisible.value = true
-  // 重置查询条件 + 页码，避免二次打开继承上次过滤上下文
-  queryParams.code = undefined
-  queryParams.name = undefined
-  queryParams.itemTypeId = undefined
-  queryParams.pageNo = 1
-  // 重置分类树（清高亮 + 清搜索词）
-  typeTreeRef.value?.reset()
-  // 清空上一次的选中状态
-  selectedRows.value = []
-  selectedRadioId.value = undefined
-  currentRadioRow.value = undefined
-  preSelectedIds.value = selectedIds ?? []
-  // 多选模式清空跨页缓存的勾选
-  await nextTick()
-  tableRef.value?.clearSelection()
-  await getList()
-}
-defineExpose({ open })
-</script>
-
-<style lang="scss" scoped>
-/* 隐藏 radio 的 label 文字，只保留圆圈 */
-.radio-no-label {
-  :deep(.el-radio__label) {
-    display: none;
-  }
-}
-</style>
diff --git a/src/views/mes/md/item/components/MdItemSelectV2.vue b/src/views/mes/md/item/components/MdItemSelectV2.vue
deleted file mode 100644
index e7d18304a..000000000
--- a/src/views/mes/md/item/components/MdItemSelectV2.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<!--
-  MES 物料产品选择器 V2：只读输入框 + 点击弹窗选择
-
-  交互：显示为只读 el-input，点击打开弹窗（单选模式）进行选择
-  Props:
-    modelValue  — 绑定的物料 ID（v-model）
-    disabled    — 是否禁用
-    clearable   — 是否允许清空（鼠标悬停时显示清除图标）
-    placeholder — 占位文字
-  Events:
-    update:modelValue — v-model 更新
-    change(item)      — 选中物料变化时触发，传递完整 MdItemVO（清空时为 undefined）
--->
-<template>
-  <div
-    v-bind="attrs"
-    class="w-full"
-    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
-    @click="handleClick"
-    @mouseenter="hovering = true"
-    @mouseleave="hovering = false"
-  >
-    <el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
-      <template #content>
-        <div v-if="selectedItem" class="leading-6">
-          <div>编码：{{ selectedItem.code }}</div>
-          <div>名称：{{ selectedItem.name }}</div>
-          <div>规格：{{ selectedItem.specification || '-' }}</div>
-          <div>单位：{{ selectedItem.unitMeasureName || '-' }}</div>
-        </div>
-      </template>
-      <el-input
-        :model-value="displayLabel"
-        :placeholder="placeholder"
-        :disabled="disabled"
-        readonly
-        :suffix-icon="suffixIcon"
-        :class="disabled ? 'is-select-disabled' : 'is-select-clickable'"
-      />
-    </el-tooltip>
-  </div>
-  <!-- 弹窗必须放在 div 外部，否则弹窗内的点击事件会冒泡到 div 触发 handleClick -->
-  <MdItemSelectDialogV2 ref="dialogRef" :multiple="false" @selected="handleSelected" />
-</template>
-
-<script setup lang="ts">
-import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
-import { Search, CircleClose } from '@element-plus/icons-vue'
-import MdItemSelectDialogV2 from './MdItemSelectDialogV2.vue'
-
-// 组件有两个根节点（div + Dialog），Vue 不会自动继承 attrs；
-// 手动透传到外层 div，确保父组件传入的 class / style 等生效
-const attrs = useAttrs()
-
-defineOptions({ name: 'MdItemSelectV2', inheritAttrs: false })
-
-const props = withDefaults(
-  defineProps<{
-    modelValue?: number // 绑定的物料 ID
-    disabled?: boolean // 是否禁用
-    clearable?: boolean // 是否允许清空
-    placeholder?: string // 占位文字
-  }>(),
-  {
-    disabled: false,
-    clearable: true,
-    placeholder: '请选择产品物料'
-  }
-)
-
-const emit = defineEmits<{
-  'update:modelValue': [value: number | undefined]
-  change: [item: MdItemVO | undefined]
-}>()
-
-const dialogRef = ref() // 弹窗 Ref
-const hovering = ref(false) // 鼠标是否悬停
-
-// ==================== 名称回显 ====================
-const selectedItem = ref<MdItemVO | undefined>() // 当前选中的物料对象
-
-/** 输入框显示文本：只展示物料名称，保持简洁 */
-const displayLabel = computed(() => {
-  return selectedItem.value?.name ?? ''
-})
-
-/** 是否显示清除图标 */
-const showClear = computed(() => {
-  return props.clearable && !props.disabled && hovering.value && props.modelValue != null
-})
-
-/** 后缀图标：悬停且有值时显示清除，否则显示搜索 */
-const suffixIcon = computed(() => {
-  return showClear.value ? CircleClose : Search
-})
-
-/** 根据 ID 单条查询物料信息（用于编辑回显） */
-const resolveItemById = async (id: number | undefined) => {
-  if (id == null) {
-    selectedItem.value = undefined
-    return
-  }
-  if (selectedItem.value?.id === id) {
-    return
-  }
-  try {
-    selectedItem.value = await MdItemApi.getItem(id)
-  } catch (e) {
-    console.error('[MdItemSelectV2] resolveItemById failed:', e)
-  }
-}
-
-/** 监听 modelValue 变化，触发回显 */
-watch(
-  () => props.modelValue,
-  (val) => {
-    resolveItemById(val)
-  },
-  { immediate: true }
-)
-
-// ==================== 点击交互 ====================
-
-/** 点击组件：清除或打开弹窗 */
-const handleClick = (e: MouseEvent) => {
-  if (props.disabled) {
-    return
-  }
-  // 点击清除图标：清空选中
-  const target = e.target as HTMLElement
-  if (showClear.value && target.closest('.el-input__suffix')) {
-    e.stopPropagation()
-    selectedItem.value = undefined
-    emit('update:modelValue', undefined)
-    emit('change', undefined)
-    return
-  }
-  // 打开弹窗，传入当前选中 ID 用于预选高亮
-  const selectedIds = props.modelValue != null ? [props.modelValue] : []
-  dialogRef.value.open(selectedIds)
-}
-
-/** 弹窗选中回调 */
-const handleSelected = (rows: MdItemVO[]) => {
-  if (!rows || rows.length === 0) {
-    return
-  }
-  const item = rows[0]
-  selectedItem.value = item
-  emit('update:modelValue', item.id)
-  emit('change', item)
-}
-</script>
-
-<style lang="scss" scoped>
-/* :deep 用于穿透 el-input 内部元素的 cursor 样式，UnoCSS 无法直接处理组件内部 DOM */
-.is-select-clickable {
-  :deep(.el-input__wrapper),
-  :deep(.el-input__inner) {
-    cursor: pointer;
-  }
-}
-
-.is-select-disabled {
-  :deep(.el-input__wrapper),
-  :deep(.el-input__inner) {
-    cursor: not-allowed;
-  }
-}
-</style>
diff --git a/src/views/mes/md/item/index.vue b/src/views/mes/md/item/index.vue
index 0783e14f0..a4c1922a2 100644
--- a/src/views/mes/md/item/index.vue
+++ b/src/views/mes/md/item/index.vue
@@ -4,7 +4,7 @@
     <!-- 左侧分类树 -->
     <el-col :span="4" :xs="24">
       <ContentWrap class="h-1/1">
-        <ItemTypeTree @node-click="handleTypeNodeClick" />
+        <MdItemTypeTree @node-click="handleTypeNodeClick" />
       </ContentWrap>
     </el-col>
     <el-col :span="20" :xs="24">
@@ -186,7 +186,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
 import MdItemForm from './MdItemForm.vue'
 import MdItemImportForm from './MdItemImportForm.vue'
-import ItemTypeTree from './ItemTypeTree.vue'
+import MdItemTypeTree from './type/components/MdItemTypeTree.vue'
 import { getItemOrProductLabel, BarcodeBizTypeEnum } from '@/views/mes/utils/constants'
 import { BarcodeDetail } from '@/views/mes/wm/barcode/components'
 
diff --git a/src/views/mes/wm/materialStock/index.vue b/src/views/mes/wm/materialStock/index.vue
index 3ebeb9879..52de8606c 100644
--- a/src/views/mes/wm/materialStock/index.vue
+++ b/src/views/mes/wm/materialStock/index.vue
@@ -4,7 +4,7 @@
     <!-- 左侧分类树 -->
     <el-col :span="4" :xs="24">
       <ContentWrap class="h-1/1">
-        <ItemTypeTree @node-click="handleTypeNodeClick" />
+        <MdItemTypeTree @node-click="handleTypeNodeClick" />
       </ContentWrap>
     </el-col>
     <el-col :span="20" :xs="24">
@@ -146,7 +146,7 @@
 import { dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { WmMaterialStockApi, WmMaterialStockVO } from '@/api/mes/wm/materialstock'
-import ItemTypeTree from '@/views/mes/md/item/ItemTypeTree.vue'
+import MdItemTypeTree from '@/views/mes/md/item/type/components/MdItemTypeTree.vue'
 import AreaForm from '@/views/mes/wm/warehouse/area/AreaForm.vue'
 import BatchForm from '@/views/mes/wm/batch/BatchForm.vue'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'