From 0e4e5be9eee94bc530ae22529eb36a3424042385 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 7 Apr 2026 09:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(package):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E5=B9=B6=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增装箱单和盘点方案的状态字段，优化装箱单选择器的交互方式，支持通过弹窗选择装箱单。移除不再使用的接口和方法，提升代码整洁性和可维护性。
---
 src/api/mes/wm/packages/index.ts              |  10 -
 src/views/mes/wm/barcode/BarcodeForm.vue      |   4 +-
 .../components/BarcodePackageSelect.vue       |  82 -----
 src/views/mes/wm/packages/SubPackageList.vue  |  82 ++---
 .../packages/components/WmPackageSelect.vue   | 217 ++++++++----
 .../components/WmPackageSelectDialog.vue      | 315 ++++++++++++++++++
 6 files changed, 488 insertions(+), 222 deletions(-)
 delete mode 100644 src/views/mes/wm/barcode/components/BarcodePackageSelect.vue
 create mode 100644 src/views/mes/wm/packages/components/WmPackageSelectDialog.vue

diff --git a/src/api/mes/wm/packages/index.ts b/src/api/mes/wm/packages/index.ts
index e964f2e6c..7f9e904a2 100644
--- a/src/api/mes/wm/packages/index.ts
+++ b/src/api/mes/wm/packages/index.ts
@@ -71,15 +71,5 @@ export const WmPackageApi = {
   // 移除子箱
   removeChildPackage: async (childId: number) => {
     return await request.put({ url: '/mes/wm/package/remove-child-package?childId=' + childId })
-  },
-
-  // 可添加为子箱的装箱单精简列表（无父箱 + 已完成状态，用于选择父箱）
-  getChildablePackageSimpleList: async () => {
-    return await request.get<WmPackageVO[]>({ url: '/mes/wm/package/childable-simple-list' })
-  },
-
-  // 获取装箱单精简列表
-  getPackageSimpleList: async () => {
-    return await request.get<WmPackageVO[]>({ url: '/mes/wm/package/simple-list' })
   }
 }
diff --git a/src/views/mes/wm/barcode/BarcodeForm.vue b/src/views/mes/wm/barcode/BarcodeForm.vue
index 0c6c80d1d..b4e5c5431 100644
--- a/src/views/mes/wm/barcode/BarcodeForm.vue
+++ b/src/views/mes/wm/barcode/BarcodeForm.vue
@@ -142,7 +142,7 @@
         label="装箱单"
         prop="bizId"
       >
-        <BarcodePackageSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
+        <WmPackageSelect v-model="formData.bizId" @change="handleBizSelect" class="!w-1/1" />
       </el-form-item>
       <el-form-item
         v-else-if="formData.bizType === BarcodeBizTypeEnum.STOCK"
@@ -222,7 +222,7 @@ import MdWorkshopSelect from '@/views/mes/md/workstation/components/MdWorkshopSe
 import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
 import TmToolSelect from '@/views/mes/tm/tool/components/TmToolSelect.vue'
 import UserSelect from '@/views/system/user/components/UserSelect.vue'
-import BarcodePackageSelect from './components/BarcodePackageSelect.vue'
+import WmPackageSelect from '@/views/mes/wm/packages/components/WmPackageSelect.vue'
 import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
 import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
 import ProCardSelect from '@/views/mes/pro/card/components/ProCardSelect.vue'
diff --git a/src/views/mes/wm/barcode/components/BarcodePackageSelect.vue b/src/views/mes/wm/barcode/components/BarcodePackageSelect.vue
deleted file mode 100644
index 045fbabc0..000000000
--- a/src/views/mes/wm/barcode/components/BarcodePackageSelect.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- MES 装箱单选择器（条码用）：一次加载全量，前端过滤（支持 code） -->
-<template>
-  <el-select
-    v-model="selectValue"
-    :placeholder="placeholder"
-    :disabled="disabled"
-    :clearable="clearable"
-    filterable
-    :filter-method="handleFilter"
-    class="!w-1/1"
-    @change="handleChange"
-  >
-    <el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id">
-      <div class="flex items-center gap-8px">
-        <span>{{ item.code }}</span>
-        <el-tag v-if="item.clientName" size="small" type="info" class="ml-4px">
-          {{ item.clientName }}
-        </el-tag>
-      </div>
-    </el-option>
-  </el-select>
-</template>
-
-<script setup lang="ts">
-import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
-
-defineOptions({ name: 'BarcodePackageSelect' })
-
-const props = withDefaults(
-  defineProps<{
-    modelValue?: number
-    disabled?: boolean
-    clearable?: boolean
-    placeholder?: string
-  }>(),
-  {
-    disabled: false,
-    clearable: true,
-    placeholder: '请选择装箱单'
-  }
-)
-
-const emit = defineEmits<{
-  'update:modelValue': [value: number | undefined]
-  change: [item: WmPackageVO | undefined]
-}>()
-
-const allList = ref<WmPackageVO[]>([])
-const filteredList = ref<WmPackageVO[]>([])
-
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (val) => emit('update:modelValue', val)
-})
-
-/** 前端过滤（code + clientName） */
-const handleFilter = (query: string) => {
-  if (!query) {
-    filteredList.value = allList.value
-    return
-  }
-  const keyword = query.toLowerCase()
-  filteredList.value = allList.value.filter(
-    (item) =>
-      item.code?.toLowerCase().includes(keyword) ||
-      item.clientName?.toLowerCase().includes(keyword)
-  )
-}
-
-/** 选中变化 */
-const handleChange = (val: number | undefined) => {
-  const item = allList.value.find((o) => o.id === val)
-  emit('change', item)
-}
-
-/** 加载装箱单列表 */
-onMounted(async () => {
-  const data = await WmPackageApi.getPackageSimpleList()
-  allList.value = Array.isArray(data) ? data : []
-  filteredList.value = allList.value
-})
-</script>
diff --git a/src/views/mes/wm/packages/SubPackageList.vue b/src/views/mes/wm/packages/SubPackageList.vue
index 30be7d9cf..c52163c90 100644
--- a/src/views/mes/wm/packages/SubPackageList.vue
+++ b/src/views/mes/wm/packages/SubPackageList.vue
@@ -1,7 +1,7 @@
 <!-- MES 子箱列表子组件 -->
 <template>
   <div class="overflow-hidden">
-    <el-button v-if="isEditable" type="primary" plain @click="openForm('create')" class="mb-10px">
+    <el-button v-if="isEditable" type="primary" plain @click="handleAddChild" class="mb-10px">
       <Icon icon="ep:plus" class="mr-5px" /> 添加子箱
     </el-button>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
@@ -36,12 +36,7 @@
       </el-table-column>
       <el-table-column v-if="isEditable" label="操作" align="center" width="120">
         <template #default="scope">
-          <el-button
-            link
-            type="danger"
-            @click="handleRemoveChild(scope.row.id)"
-            v-if="scope.row.status === MesWmPackageStatusEnum.PREPARE"
-          >
+          <el-button link type="danger" @click="handleRemoveChild(scope.row.id)">
             移除
           </el-button>
         </template>
@@ -55,36 +50,21 @@
     />
   </div>
 
-  <!-- 添加子箱弹窗：选择已有装箱单作为子箱 -->
-  <Dialog title="添加子箱" v-model="dialogVisible" width="500px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="选择装箱单" prop="childId">
-        <WmPackageSelect
-          v-model="formData.childId"
-          :exclude-id="props.packageId"
-          placeholder="请选择要作为子箱的装箱单"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+  <!-- 添加子箱：直接打开装箱单选择弹窗（单选） -->
+  <WmPackageSelectDialog
+    ref="dialogRef"
+    :multiple="false"
+    :exclude-id="props.packageId"
+    childable-only
+    @selected="handleSelected"
+  />
 </template>
 
 <script setup lang="ts">
 import { dateFormatter2 } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
-import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
-import WmPackageSelect from './components/WmPackageSelect.vue'
+import WmPackageSelectDialog from './components/WmPackageSelectDialog.vue'
 
 defineOptions({ name: 'SubPackageList' })
 
@@ -131,36 +111,24 @@ const handleRemoveChild = async (childId: number) => {
   } catch {}
 }
 
-// ==================== 添加子箱表单 ====================
-const dialogVisible = ref(false)
-const formLoading = ref(false)
-const formData = ref({
-  childId: undefined as number | undefined
-})
-const formRules = reactive({
-  childId: [{ required: true, message: '请选择装箱单', trigger: 'change' }]
-})
-const formRef = ref()
+// ==================== 添加子箱 ====================
+const dialogRef = ref()
 
-/** 打开添加子箱弹窗 */
-const openForm = async (_type: string) => {
-  dialogVisible.value = true
-  formData.value.childId = undefined
-  formRef.value?.resetFields()
+/** 打开装箱单选择弹窗 */
+const handleAddChild = () => {
+  dialogRef.value.open()
 }
 
-/** 提交：将选中的装箱单设为当前装箱单的子箱 */
-const submitForm = async () => {
-  await formRef.value.validate()
-  formLoading.value = true
-  try {
-    await WmPackageApi.addChildPackage(props.packageId, formData.value.childId!)
-    message.success(t('common.createSuccess'))
-    dialogVisible.value = false
-    await getList()
-  } finally {
-    formLoading.value = false
+/** 选中回调：将选中的装箱单添加为子箱 */
+const handleSelected = async (rows: WmPackageVO[]) => {
+  if (!rows || rows.length === 0) {
+    return
   }
+  try {
+    await WmPackageApi.addChildPackage(props.packageId, rows[0].id)
+    message.success(t('common.createSuccess'))
+    await getList()
+  } catch {}
 }
 
 /** 初始化 */
diff --git a/src/views/mes/wm/packages/components/WmPackageSelect.vue b/src/views/mes/wm/packages/components/WmPackageSelect.vue
index 8e00af347..80007c4e1 100644
--- a/src/views/mes/wm/packages/components/WmPackageSelect.vue
+++ b/src/views/mes/wm/packages/components/WmPackageSelect.vue
@@ -1,43 +1,79 @@
-<!-- MES 装箱单选择器：纯下拉，前端过滤（支持 code），用于选择父箱 -->
+<!--
+  MES 装箱单选择器：只读输入框 + 点击弹窗选择
+
+  交互：显示为只读 el-input，点击打开弹窗（单选模式）进行选择
+  Props:
+    modelValue  — 绑定的装箱单 ID（v-model）
+    disabled    — 是否禁用
+    clearable   — 是否允许清空（鼠标悬停时显示清除图标）
+    placeholder — 占位文字
+  Events:
+    update:modelValue — v-model 更新
+    change(item)      — 选中装箱单变化时触发，传递完整 WmPackageVO（清空时为 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.code" :value="item.id">
-      <div class="flex items-center gap-8px">
-        <span>{{ item.code }}</span>
-        <el-tag v-if="item.clientName" size="small" type="info" class="ml-4px">
-          {{ item.clientName }}
-        </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.clientName || '-' }}</div>
+          <div>销售订单：{{ selectedItem.salesOrderCode || '-' }}</div>
+          <div>状态：{{ selectedItem.status }}</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 -->
+  <WmPackageSelectDialog
+    ref="dialogRef"
+    :multiple="false"
+    :exclude-id="excludeId"
+    :childable-only="childableOnly"
+    @selected="handleSelected"
+  />
 </template>
 
 <script setup lang="ts">
 import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
+import { Search, CircleClose } from '@element-plus/icons-vue'
+import WmPackageSelectDialog from './WmPackageSelectDialog.vue'
 
-defineOptions({ name: 'WmPackageSelect' })
+// 组件有两个根节点（div + Dialog），Vue 不会自动继承 attrs；
+// 手动透传到外层 div，确保父组件传入的 class / style 等生效
+const attrs = useAttrs()
+
+defineOptions({ name: 'WmPackageSelect', inheritAttrs: false })
 
 const props = withDefaults(
   defineProps<{
-    modelValue?: number
-    disabled?: boolean
-    clearable?: boolean
-    placeholder?: string
+    modelValue?: number // 绑定的装箱单 ID
+    disabled?: boolean // 是否禁用
+    clearable?: boolean // 是否允许清空
+    placeholder?: string // 占位文字
     excludeId?: number // 排除的 ID（避免选择自己作为父箱）
+    childableOnly?: boolean // 只展示可作为子箱的装箱单（无父箱 + 已完成状态）
   }>(),
   {
     disabled: false,
     clearable: true,
-    placeholder: '请选择父箱'
+    placeholder: '请选择装箱单',
+    childableOnly: false
   }
 )
 
@@ -46,59 +82,98 @@ const emit = defineEmits<{
   change: [item: WmPackageVO | undefined]
 }>()
 
-const allList = ref<WmPackageVO[]>([])
-const filteredList = ref<WmPackageVO[]>([])
+const dialogRef = ref() // 弹窗 Ref
+const hovering = ref(false) // 鼠标是否悬停
 
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (val) => emit('update:modelValue', val)
+// ==================== 名称回显 ====================
+const selectedItem = ref<WmPackageVO | undefined>() // 当前选中的装箱单对象
+
+/** 输入框显示文本：展示装箱单编号 */
+const displayLabel = computed(() => {
+  return selectedItem.value?.code ?? ''
 })
 
-/** 获取排除后的列表 */
-const getAvailableList = () => {
-  if (!props.excludeId) {
-    return allList.value
-  }
-  return allList.value.filter((item) => item.id !== props.excludeId)
-}
+/** 是否显示清除图标 */
+const showClear = computed(() => {
+  return props.clearable && !props.disabled && hovering.value && props.modelValue != null
+})
 
-/** 前端过滤（code + clientName） */
-const handleFilter = (query: string) => {
-  const available = getAvailableList()
-  if (!query) {
-    filteredList.value = available
+/** 后缀图标：悬停且有值时显示清除，否则显示搜索 */
+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 = available.filter(
-    (item) =>
-      item.code?.toLowerCase().includes(keyword) || item.clientName?.toLowerCase().includes(keyword)
-  )
-}
-
-/** 选中变化 */
-const handleChange = (val: number | undefined) => {
-  const item = allList.value.find((o) => o.id === val)
-  emit('change', item)
-}
-
-/** 加载装箱单列表（无父箱 + 已完成状态） */
-const loadList = async () => {
-  const data = await WmPackageApi.getChildablePackageSimpleList()
-  allList.value = Array.isArray(data) ? data : []
-  filteredList.value = getAvailableList()
-}
-
-/** 监听 excludeId 变化 */
-watch(
-  () => props.excludeId,
-  () => {
-    filteredList.value = getAvailableList()
+  if (selectedItem.value?.id === id) {
+    return
   }
+  try {
+    selectedItem.value = await WmPackageApi.getPackage(id)
+  } catch (e) {
+    console.error('[WmPackageSelect] resolveItemById failed:', e)
+  }
+}
+
+/** 监听 modelValue 变化，触发回显 */
+watch(
+  () => props.modelValue,
+  (val) => {
+    resolveItemById(val)
+  },
+  { immediate: true }
 )
 
-/** 初始化 */
-onMounted(async () => {
-  await loadList()
-})
+// ==================== 点击交互 ====================
+
+/** 点击组件：清除或打开弹窗 */
+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: WmPackageVO[]) => {
+  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/wm/packages/components/WmPackageSelectDialog.vue b/src/views/mes/wm/packages/components/WmPackageSelectDialog.vue
new file mode 100644
index 000000000..883f44d50
--- /dev/null
+++ b/src/views/mes/wm/packages/components/WmPackageSelectDialog.vue
@@ -0,0 +1,315 @@
+<!--
+  MES 装箱单弹窗选择器（支持单选/多选）
+
+  Props:
+    multiple — true 多选（checkbox），false 单选（radio）；默认 true
+  Events:
+    selected(rows: WmPackageVO[]) — 确认选择后触发，单选时数组长度为 1
+  Expose:
+    open(selectedIds?: number[]) — 打开弹窗，可传入已选 ID 用于预选高亮
+-->
+<template>
+  <Dialog title="装箱单选择" v-model="dialogVisible" width="80%">
+    <ContentWrap>
+      <el-form :inline="true" :model="queryParams" label-width="100px">
+        <el-form-item label="装箱单编号">
+          <el-input
+            v-model="queryParams.code"
+            placeholder="请输入装箱单编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-220px"
+          />
+        </el-form-item>
+        <el-form-item label="销售订单编号">
+          <el-input
+            v-model="queryParams.salesOrderCode"
+            placeholder="请输入销售订单编号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-220px"
+          />
+        </el-form-item>
+        <el-form-item label="客户">
+          <MdClientSelect v-model="queryParams.clientId" class="!w-220px" />
+        </el-form-item>
+        <el-form-item label="检查员">
+          <UserSelect v-model="queryParams.inspectorUserId" class="!w-220px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button @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>
+    </ContentWrap>
+    <!-- 数据表格：单选 radio / 多选 checkbox 统一在一个 table 内 -->
+    <ContentWrap>
+      <el-table
+        ref="tableRef"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        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" min-width="160" />
+        <el-table-column
+          label="装箱日期"
+          align="center"
+          prop="packageDate"
+          :formatter="dateFormatter2"
+          width="120"
+        />
+        <el-table-column label="销售订单编号" align="center" prop="salesOrderCode" min-width="140" />
+        <el-table-column label="发票编号" align="center" prop="invoiceCode" min-width="120" />
+        <el-table-column label="客户编码" align="center" prop="clientCode" min-width="100" />
+        <el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
+        <el-table-column label="箱长度" align="center" prop="length" width="80" />
+        <el-table-column label="箱宽度" align="center" prop="width" width="80" />
+        <el-table-column label="箱高度" align="center" prop="height" width="80" />
+        <el-table-column label="尺寸单位" align="center" prop="sizeUnitName" width="90" />
+        <el-table-column label="净重" align="center" prop="netWeight" width="80" />
+        <el-table-column label="毛重" align="center" prop="grossWeight" width="80" />
+        <el-table-column label="重量单位" align="center" prop="weightUnitName" width="90" />
+        <el-table-column label="检查员" align="center" prop="inspectorName" min-width="100" />
+        <el-table-column label="单据状态" align="center" prop="status" min-width="100">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.MES_WM_PACKAGE_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+    <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 { dateFormatter2 } from '@/utils/formatTime'
+import { DICT_TYPE } from '@/utils/dict'
+import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
+import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
+import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
+
+defineOptions({ name: 'WmPackageSelectDialog' })
+
+const props = withDefaults(
+  defineProps<{
+    multiple?: boolean // true 多选（checkbox），false 单选（radio）
+    excludeId?: number // 排除的 ID（避免选择自己作为父箱）
+    childableOnly?: boolean // 只展示可作为子箱的装箱单（无父箱 + 已完成状态）
+  }>(),
+  {
+    multiple: true,
+    childableOnly: false
+  }
+)
+
+const message = useMessage()
+const emit = defineEmits<{
+  selected: [rows: WmPackageVO[]]
+}>()
+
+const dialogVisible = ref(false) // 弹窗是否展示
+const loading = ref(false) // 列表加载中
+const list = ref<WmPackageVO[]>([]) // 装箱单列表
+const total = ref(0) // 总条数
+
+// ==================== 选中状态 ====================
+const tableRef = ref() // 表格 Ref
+const selectedRows = ref<WmPackageVO[]>([]) // 多选模式：选中行
+const selectedRadioId = ref<number>() // 单选模式：选中 ID
+const currentRadioRow = ref<WmPackageVO>() // 单选模式：选中行对象
+const preSelectedIds = ref<number[]>([]) // 打开弹窗时传入的已选 ID
+
+/** 多选：checkbox 变化 */
+const handleSelectionChange = (rows: WmPackageVO[]) => {
+  if (props.multiple) {
+    selectedRows.value = rows
+  }
+}
+
+/** 单选：radio 变化 */
+const handleRadioChange = (row: WmPackageVO) => {
+  currentRadioRow.value = row
+}
+
+/** 单击行：单选模式下点击整行即选中（降低操作成本），多选不处理（避免和 dblclick 冲突） */
+const handleRowClick = (row: WmPackageVO) => {
+  if (props.multiple) {
+    return
+  }
+  selectedRadioId.value = row.id
+  currentRadioRow.value = row
+}
+
+/** 双击行：多选模式切换勾选，单选模式直接确认 */
+const handleRowDblClick = (row: WmPackageVO) => {
+  if (props.multiple) {
+    tableRef.value?.toggleRowSelection(row)
+    return
+  }
+  selectedRadioId.value = row.id
+  currentRadioRow.value = row
+  confirmSelect()
+}
+
+// ==================== 装箱单查询 ====================
+const queryParams = reactive({
+  pageNo: 1, // 页码
+  pageSize: 10, // 每页条数
+  code: undefined as string | undefined, // 装箱单编号
+  salesOrderCode: undefined as string | undefined, // 销售订单编号
+  clientId: undefined as number | undefined, // 客户 ID
+  inspectorUserId: undefined as number | undefined, // 检查员用户 ID
+  parentId: undefined as number | undefined, // 父箱 ID
+  status: undefined as number | undefined // 单据状态
+})
+
+/** 查询装箱单列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    // childableOnly 模式：注入固定过滤条件（无父箱 + 已完成状态）
+    if (props.childableOnly) {
+      queryParams.parentId = 0
+      queryParams.status = MesWmPackageStatusEnum.FINISHED
+    }
+    const data = await WmPackageApi.getPackagePage(queryParams)
+    // 过滤掉被排除的 ID（避免选择自己作为父箱）
+    list.value = props.excludeId
+      ? data.list.filter((item: WmPackageVO) => item.id !== props.excludeId)
+      : 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()
+}
+
+/** 重置查询条件（parentId / status 由 childableOnly prop 控制，不在此重置） */
+const resetQuery = () => {
+  queryParams.code = undefined
+  queryParams.salesOrderCode = undefined
+  queryParams.clientId = undefined
+  queryParams.inspectorUserId = undefined
+  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.salesOrderCode = undefined
+  queryParams.clientId = undefined
+  queryParams.inspectorUserId = undefined
+  queryParams.pageNo = 1
+  // 清空上一次的选中状态
+  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>