Merge branch 'refs/heads/release_v2.31.0' into dev_bug_update

# Conflicts: # components.d.ts # src/api/order.ts

Merge branch 'refs/heads/release_v2.31.0' into dev_bug_update
# Conflicts: # components.d.ts # src/api/order.ts
1196ab7d · zhuzhequan · 1466df3b · 2b26f4ab · 1196ab7d · 1196ab7d
Commit 1196ab7d authored Jul 30, 2026 by zhuzhequan
29 changed files
--- a/components.d.ts
+++ b/components.d.ts
@@ -30,7 +30,6 @@ declare module 'vue' {
    ElDropdown: typeof import('element-plus/es')['ElDropdown']
    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-    ElEmpty: typeof import('element-plus/es')['ElEmpty']
    ElForm: typeof import('element-plus/es')['ElForm']
    ElFormItem: typeof import('element-plus/es')['ElFormItem']
    ElIcon: typeof import('element-plus/es')['ElIcon']
@@ -44,8 +43,6 @@ declare module 'vue' {
    ElRadio: typeof import('element-plus/es')['ElRadio']
    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRow: typeof import('element-plus/es')['ElRow']
-    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
    ElSelect: typeof import('element-plus/es')['ElSelect']
    ElStep: typeof import('element-plus/es')['ElStep']
    ElSteps: typeof import('element-plus/es')['ElSteps']

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
    "bignumber.js": "^9.3.0",
    "dayjs": "^1.11.13",
    "echarts": "^6.0.0",
-    "element-plus": "^2.6.0",
+    "element-plus": "^2.14.3",
    "lodash-es": "^4.17.21",
    "luxon": "^3.7.1",
    "pinia": "^2.1.7",

--- a/src/api/factoryOrderNew.ts
+++ b/src/api/factoryOrderNew.ts
@@ -74,7 +74,6 @@ export function getFactoryOrderNewListApi(
 /** 请求体与 `factory/podOrder/list_page` 一致 */
 export function getPodOrderAcceptedStatisticsApi(
  data: SearchForm,
-  currentPage: number,
  pageSize: number,
  status?: string,
  subStatus?: number,
@@ -88,7 +87,7 @@ export function getPodOrderAcceptedStatisticsApi(
    }>
  >('factory/podOrder/acceptedStatistics', {
    ...normalizePodOrderQueryPayload({ ...data } as Record<string, unknown>),
-    currentPage,
+    currentPage: 1,
    pageSize,
    status,
    acceptedStatus: subStatus,

--- a/src/api/logistics.ts
+++ b/src/api/logistics.ts
@@ -11,7 +11,11 @@ import { AddDeclarationRuleObj } from '@/views/logistics/types/declarationRule'
 import { LogisticsQuotation } from '@/views/logistics/types/logisticsQuotation'
 import { LogisticsPartitionObj } from '@/views/logistics/types/logisticsPartition'
 import { ShippingAddressObj } from '@/views/logistics/types/shippingAddress'
-import { IsortingInfo } from '@/types/api/logistics'
+import {
+  IsortingInfo,
+  SortingPortAreaItem,
+  SortingPortOptionItem,
+} from '@/types/api/logistics'
 export interface ILogisticsList {
  code: string
  basicsName: string
@@ -168,9 +172,12 @@ export function getLogisticsWayListByCompanyId(companyId: number) {
 }
 // 获取tictok物流承运商
 export function getTiktokCarrier() {
-  return axios.get<never, BaseRespData<{ name: string; id: string, typeCode: string, label: string }[]>>(
+  return axios.get<
-    'logisticsWay/getTiktokShippingProvider',
+    never,
-  )
+    BaseRespData<
+      { name: string; id: string; typeCode: string; label: string }[]
+    >
+  >('logisticsWay/getTiktokShippingProvider')
 }
 /**
@@ -461,16 +468,14 @@ export function logisticsCompanyAllCodelist() {
    '/logisticsCompany/allCodelist',
  )
 }
-/**
+// 物流 分拣配置
-  分拣配置
- */
 export function getsortingConfigListApi(
  data: IsortingInfo,
  currentPage: number,
  pageSize: number,
 ) {
  return axios.post<never, BasePaginationData<IsortingInfo>>(
-    'logistics/sortingConfig/list_page',
+    'logistics-sort-port-config/list_page',
    {
      ...data,
      currentPage,
@@ -481,34 +486,52 @@ export function getsortingConfigListApi(
 // 详情
 export function getSortingConfig(params: { id: number | string }) {
  return axios.get<never, BaseRespData<IsortingInfo>>(
-    'logistics/sortingConfig/get',
+    'logistics-sort-port-config/get',
    { params },
  )
 }
 export function createSortingApi(data: IsortingInfo) {
  return axios.post<never, BaseRespData<never>>(
-    'logistics/sortingConfig/add',
+    'logistics-sort-port-config/add',
    data,
  )
 }
 export function updateSortingApi(data: IsortingInfo) {
  return axios.post<never, BaseRespData<never>>(
-    'logistics/sortingConfig/update',
+    'logistics-sort-port-config/update',
    data,
  )
 }
-export function deleteSortingApi(params: {
+export function deleteSortingApi(params: { id: number }) {
-  ids: string
-  type: string | number
-}) {
  return axios.get<never, BaseRespData<never>>(
-    'logistics/sortingConfig/delete',
+    'logistics-sort-port-config/delete',
    {
      params,
    },
  )
 }
+// 分拣配置 查询可用分拣口
+export function getSortingPortAreaListApi() {
+  return axios.get<never, BaseRespData<SortingPortAreaItem[]>>(
+    'logistics-sort-port-config/area-list',
+  )
+}
+// 分拣口规则 条件类型
+export function getSortPortConditionTypeListApi() {
+  return axios.get<never, BaseRespData<SortingPortOptionItem[]>>(
+    'logistics-sort-port-config/condition-type',
+  )
+}
+// 分拣口规则 操作符
+export function getSortPortOperatorListApi() {
+  return axios.get<never, BaseRespData<SortingPortOptionItem[]>>(
+    'logistics-sort-port-config/operator-list',
+  )
+}
 // 物流跟踪 获取菜单树
 export function logisticStatusList() {
  return axios.get<never, BaseRespData<LogisticsTrackingTree[]>>(

--- a/src/api/order.ts
+++ b/src/api/order.ts
@@ -804,3 +804,10 @@ export function getFactoryOrderFlowConfigApi() {
    'report/factory-order-flow-config/get-config',
  )
 }
+// 配货分拣 商品类目
+export function getCategoryListApi() {
+  return axios.get<never, BaseRespData<OperatorList[]>>(
+    'allocation-sorting-rule/find-custom-category-list',
+  )
+}
--- a/src/api/podCnOrder.ts
+++ b/src/api/podCnOrder.ts
@@ -553,7 +553,11 @@ export function getListCraftApi() {
    `factory/podJomallOrderProductCn/listCraft`,
  )
 }
+export function getPodOrderCraftApi() {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podOrder/listCraft`,
+  )
+}
 // 批量下载 列表
 export function batchDownloadApi(
  params: SearchForm,

--- a/src/components/TableView.vue
+++ b/src/components/TableView.vue
@@ -56,7 +56,7 @@
            </div>
          </template>
        </ElTableColumn>
-        <RenderColumn v-else :col="column">
+        <RenderColumn v-if="column.type !== 'expand' && !column.hidden" :col="column">
          <template v-for="(_, name) of slots" #[name]="scope">
            <slot :name="name" v-bind="scope" />
          </template>
@@ -126,11 +126,11 @@ const attrs = useAttrs()
 const slots = useSlots() as Record<string, Slot>
 const setCurrentRow = (row: T) => {
-  tableRef.value?.setCurrentRow(row)
+  tableRef.value?.setCurrentRow(row as Record<PropertyKey, any>)
 }
 const toggleRowSelection = (row: T, selected: boolean = true) => {
-  tableRef.value?.toggleRowSelection(row, selected)
+  tableRef.value?.toggleRowSelection(row as Record<PropertyKey, any>, selected)
 }
 const clearSelection = () => {
@@ -139,11 +139,11 @@ const clearSelection = () => {
 const toggleAllSelection = () => {
  tableRef.value?.toggleAllSelection()
 }
-const rowClick = (row:NonNullable<unknown>)=>{
+const rowClick = (row: NonNullable<unknown>) => {
  console.log(row)
-  console.log(tableRef.value,props.rowClickSelect)
+  console.log(tableRef.value, props.rowClickSelect)
-  if(props.rowClickSelect){
+  if (props.rowClickSelect) {
-    tableRef.value?.toggleRowSelection(row,true)
+    tableRef.value?.toggleRowSelection(row as Record<PropertyKey, any>, true)
  }
 }
 const handleTableHeaderClick = (column: { type?: string }, event: Event) => {
@@ -170,7 +170,10 @@ const selectAllRows = (select: boolean, setInternalIsMore?: boolean) => {
  nextTick(() => {
    if (tableRef.value && props.paginatedData.length > 0) {
      props.paginatedData.forEach((row) => {
-        tableRef.value?.toggleRowSelection(row, select)
+        tableRef.value?.toggleRowSelection(
+          row as Record<PropertyKey, any>,
+          select,
+        )
      })
    }

--- a/src/types/api/logistics.ts
+++ b/src/types/api/logistics.ts
@@ -15,11 +15,34 @@ export interface Ilogistics {
  createTime?: string
  updateTime?: string | null
 }
+export interface SortingPortCondition {
+  id?: number
+  ruleId?: number
+  conditionType: string
+  operator: string
+  conditionValue?: string | number | string[]
+}
 export interface IsortingInfo {
  id?: number
-  sortingFacility?: string | null
+  sortingRemark?: string
-  sortingArea: number | null
+  sortingArea?: number | null
  sortingAreaName?: string | null
-  serviceCode: string | null
+  matchType?: 1 | 2
-  type?: string | number
+  sortNo?: number
+  conditions?: SortingPortCondition[]
+  conditionsText?: string
+}
+export interface SortingPortAreaItem {
+  code: number
+  desc: string
+  used: boolean
+}
+export interface SortingPortOptionItem {
+  desc: string
+  code: string
+  used?: boolean
 }
--- a/src/types/api/order.ts
+++ b/src/types/api/order.ts
@@ -304,6 +304,8 @@ export interface SortingList {
  warehouseName: string
  autoPrint: boolean
  defaultWarehouse: 0 | 1
+  matchType: 1 | 2 // 匹配类型：1=所有条件(且) 2=任一条件(或)
+  conditions: SortingRuleCondition[] // 配货规则
 }
 // 配货分拣 详情
@@ -328,7 +330,7 @@ export interface SortingRuleCondition {
  ruleId?: number
  conditionType: string // 条件
  operator: string // 操作符
-  conditionValue?: string | number | string[]
+  conditionValue?: string | number | (string | number)[]
 }
 // 配货分拣 配货区/操作符/条件

--- a/src/types/api/order/factoryOrderNew.ts
+++ b/src/types/api/order/factoryOrderNew.ts
@@ -5,7 +5,12 @@ export interface StatusTreeNode {
  unit?: string // 数量单位
  children: StatusTreeNode[] | null
 }
+export interface CraftData{
+  name:string
+  id:number | string
+  warehouseName:string
+}
 export interface SearchForm {
  status?: string
  operationStatus?: string | string[]

--- a/src/views/AccountStatementNote.vue
+++ b/src/views/AccountStatementNote.vue
@@ -516,9 +516,14 @@
 </template>
 <script setup lang="ts">
-import { ElMessage, ElRadioGroup, ElTree, TableColumnCtx } from 'element-plus'
+import {
+  ElMessage,
+  ElRadioGroup,
+  ElTree,
+  TableColumnCtx,
+  type TableInstance,
+} from 'element-plus'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
-import { ElTable } from 'element-plus'
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from '@/utils/hooks/useValue'
 import {
@@ -554,7 +559,9 @@ interface Tree {
  code?: string
  children?: Tree[]
 }
-interface SummaryMethodProps<T = AccountStatementNote> {
+interface SummaryMethodProps<
+  T extends Record<PropertyKey, any> = AccountStatementNote,
+> {
  columns: TableColumnCtx<T>[]
  data: T[]
 }
@@ -568,7 +575,7 @@ const dateRange = ref<string[]>([])
 const selections = ref<AccountStatementNote[]>([])
 const detailList = ref<ItemList[]>([])
 const tabsValue = ref<string>('0')
-const singleTableRef = ref<InstanceType<typeof ElTable>>()
+const singleTableRef = ref<TableInstance>()
 const currentRow = ref<AccountStatementNote | null>(null)
 const logList = ref<LogList[]>([])
@@ -583,7 +590,7 @@ const {
  refresh: search,
  onCurrentPageChange: handleCurrentChange,
  onPageSizeChange: handleSizeChange,
-} = usePageList({
+} = usePageList<AccountStatementNote>({
  query: (page, pageSize) =>
    customJomallReconciliation(
      {
@@ -623,7 +630,7 @@ const getTreeNum = async () => {
    console.error(e)
  }
 }
-const rowClick = (row: AccountStatementNote) => {
+const rowClick = (row: AccountStatementNote | null) => {
  if (!row) {
    currentRow.value = null
  }
@@ -789,7 +796,7 @@ const submitConfirmOrder = async () => {
  search()
  await getTreeNum()
  if (singleTableRef.value) {
-    singleTableRef.value!.setCurrentRow(currentRow.value)
+    singleTableRef.value!.setCurrentRow(currentRow.value ?? undefined)
  }
 }
 watch(

--- a/src/views/logistics/components/CreateSortingRuleDialog.vue
+++ b/src/views/logistics/components/CreateSortingRuleDialog.vue
--- a/src/views/logistics/sortingConfiguration.vue
+++ b/src/views/logistics/sortingConfiguration.vue
--- a/src/views/order/allocationSortingRule/components/addDialog.vue
+++ b/src/views/order/allocationSortingRule/components/addDialog.vue
@@ -4,6 +4,7 @@
    :title="isEdit ? '编辑配货区' : '新增配货区'"
    :close-on-click-modal="false"
    width="800px"
+    destroy-on-close
  >
    <el-form ref="formRef" label-width="170px" :model="form" :rules="rules">
      <el-form-item label="配货区说明" prop="areaDesc">
@@ -63,9 +64,9 @@
            <el-select
              v-model="item.operator"
-              style="width: 160px"
+              style="width: 100px"
              :disabled="isDisabled"
-              placeholder="请选择关系"
+              placeholder="关系"
            >
              <el-option
                v-for="operator in getAvailableOperators(item.conditionType)"
@@ -79,13 +80,12 @@
              <el-select
                v-model="item.conditionValue"
                class="platform-select"
-                style="width: 160px"
+                style="width: 190px"
                :disabled="isDisabled"
                placeholder="请选择平台"
                filterable
                multiple
                collapse-tags
-                collapse-tags-tooltip
                :max-collapse-tags="1"
                clearable
                popper-class="customize-select-style"
@@ -105,11 +105,47 @@
                </el-option>
              </el-select>
            </template>
+            <template v-else-if="item.conditionType === 'order_category'">
+              <el-cascader
+                v-model="item.conditionValue"
+                class="category-cascader"
+                style="width: 190px"
+                placeholder="请选择商品类目"
+                :options="categoryList"
+                :props="{
+                  label: 'name',
+                  value: 'id',
+                  children: 'children',
+                  multiple: true,
+                  emitPath: true,
+                }"
+                collapse-tags
+                collapse-tags-tooltip
+                :max-collapse-tags="1"
+                tag-type="info"
+                show-checked-strategy="parent"
+                clearable
+                :disabled="isDisabled"
+              >
+                <template #tag="{ data, deleteTag }">
+                  <el-tag
+                    v-for="tag in data.slice(0, 1)"
+                    :key="tag.key"
+                    type="info"
+                    :closable="tag.closable"
+                    class="category-cascader-tag"
+                    @close="deleteTag(tag)"
+                  >
+                    {{ tag.text }}
+                  </el-tag>
+                </template>
+              </el-cascader>
+            </template>
            <template v-else>
              <el-input-number
                v-model="item.conditionValue"
-                style="width: 160px"
+                style="width: 190px"
                :min="1"
                :max="999"
                :disabled="isDisabled"
@@ -202,19 +238,7 @@ import type {
  SortingRuleCondition,
  SortingRuleDetail,
 } from '@/types/api/order'
-import {
+import { getAreaListApi, addAreaApi, editAreaApi } from '@/api/order'
-  getAreaListApi,
-  getConditionTypeListApi,
-  getOperatorListApi,
-  addAreaApi,
-  editAreaApi,
-} from '@/api/order'
-// 配货规则条件
-const pickingRuleList = ref<OperatorList[]>()
-// 配货规则操作符
-const operatorList = ref<OperatorList[]>()
 const props = defineProps<{
  modelValue: boolean
@@ -223,6 +247,9 @@ const props = defineProps<{
  warehouseId: number
  warehouseName: string
  isDisabled?: boolean
+  categoryList: OperatorList[]
+  pickingRuleList: OperatorList[]
+  operatorList: OperatorList[]
 }>()
 const emit = defineEmits<{
  (e: 'update:modelValue', value: boolean): void
@@ -264,33 +291,38 @@ const getAvailablePickingRules = (currentIndex: number) => {
  const selectedFields = form.value.conditions
    .filter((_, index) => index !== currentIndex)
    .map((item) => item.conditionType)
-  return pickingRuleList.value?.filter(
+  return props.pickingRuleList.filter(
    (rule) => !selectedFields.includes(rule.code),
  )
 }
 // 根据配货规则类型获取可用的操作符
 const getAvailableOperators = (conditionType: string) => {
-  const list = operatorList.value ?? []
+  const list = props.operatorList
-  if (conditionType === 'order_total_num') {
+  const matchers: Record<string, (code: string) => boolean> = {
-    return list.filter((operator) => operator.code !== 'in')
+    order_total_num: (code) => code !== 'in' && code !== 'contain',
-  } else if (conditionType === 'order_platform') {
+    order_platform: (code) => code === 'in',
-    return list.filter((operator) => operator.code === 'in')
+    order_category: (code) => code === 'contain',
  }
-  return list
+  const matcher = matchers[conditionType]
+  return matcher ? list.filter((operator) => matcher(operator.code)) : list
 }
 // 配货规则条件改变
 const handleConditionTypeChange = (item: SortingRuleCondition) => {
-  // 平台 只能选 in属于
+  switch (item.conditionType) {
-  if (item.conditionType === 'order_platform') {
+    case 'order_platform':
      item.conditionValue = undefined
      item.operator = 'in'
-  }
+      break
-  // 订单总件数 清空字段
+    case 'order_total_num':
-  else if (item.conditionType === 'order_total_num') {
      item.conditionValue = undefined
      item.operator = 'gt'
+      break
+    case 'order_category':
+      item.conditionValue = undefined
+      item.operator = 'contain'
+      break
  }
 }
@@ -311,7 +343,8 @@ const validateConditions = (
  for (let i = 0; i < items.length; i++) {
    const item = items[i]
    const isValueValid =
-      item.conditionType === 'order_platform'
+      item.conditionType === 'order_platform' ||
+      item.conditionType === 'order_category'
        ? Array.isArray(item.conditionValue) && item.conditionValue.length > 0
        : item.conditionValue !== null && item.conditionValue !== undefined
    if (!item.conditionType || !isValueValid || !item.operator) {
@@ -352,14 +385,29 @@ const rules = computed(() => {
 const platformList = platformJson
+// 将详情返回的字符串条件值转为表单可用格式
 const formatConditionsForForm = (conditions: SortingRuleCondition[]) =>
-  conditions.map((item) => ({
+  conditions.map((item) => {
+    if (
+      typeof item.conditionValue !== 'string' ||
+      (item.conditionType !== 'order_platform' &&
+        item.conditionType !== 'order_category')
+    ) {
+      return item
+    }
+    const values = item.conditionValue.split(',').filter(Boolean)
+    // 类目 id 一般为 number，需与级联 options 的 id 类型一致才能回显
+    if (item.conditionType === 'order_category') {
+      return {
        ...item,
-    conditionValue:
+        conditionValue: values.map((v) => {
-      typeof item.conditionValue === 'string'
+          const num = Number(v)
-        ? item.conditionValue.split(',').filter(Boolean)
+          return Number.isNaN(num) ? v : num
-        : item.conditionValue,
+        }),
-  }))
+      }
+    }
+    return { ...item, conditionValue: values }
+  })
 // 添加配货规则
 const addPickingRuleItem = () => {
@@ -397,20 +445,6 @@ const loadAreaList = async () => {
  }
 }
-// 获取配货规则条件
-const getConditionTypeList = async () => {
-  const res = await getConditionTypeListApi()
-  if (res.code !== 200) return
-  pickingRuleList.value = res.data
-}
-// 获取配货规则操作符
-const getOperatorList = async () => {
-  const res = await getOperatorListApi()
-  if (res.code !== 200) return
-  operatorList.value = res.data
-}
 // 提交
 const handleSubmit = async () => {
  form.value.warehouseId = props.warehouseId
@@ -425,7 +459,9 @@ const handleSubmit = async () => {
      (item): SortingRuleCondition => ({
        ...item,
        conditionValue: Array.isArray(item.conditionValue)
-          ? item.conditionValue.join(',')
+          ? item.conditionValue
+              .map((v) => (Array.isArray(v) ? v[v.length - 1] : v))
+              .join(',')
          : item.conditionValue,
      }),
    ),
@@ -442,7 +478,7 @@ const handleSubmit = async () => {
 }
 onMounted(async () => {
-  await Promise.all([loadAreaList(), getConditionTypeList(), getOperatorList()])
+  await loadAreaList()
  if (props.editData) {
    form.value = {
      ...props.editData,
@@ -500,7 +536,6 @@ onMounted(async () => {
    :deep(.el-select__selection) {
      flex-wrap: nowrap;
-      overflow: hidden;
    }
    :deep(.el-select__selected-item) {
@@ -529,4 +564,21 @@ onMounted(async () => {
    flex-wrap: wrap;
  }
 }
+// cascader 样式，确保单行显示
+.category-cascader {
+  .el-cascader__tags {
+    display: flex !important;
+    flex-wrap: nowrap !important;
+    align-items: center;
+    overflow: hidden;
+  }
+  .category-cascader-tag {
+    flex: 0 1 auto !important;
+    min-width: 0 !important;
+    max-width: 100%;
+    overflow: hidden;
+  }
+}
 </style>
--- a/src/views/order/allocationSortingRule/index.vue
+++ b/src/views/order/allocationSortingRule/index.vue
@@ -47,6 +47,62 @@
          class="table-container"
        >
          <TableView :paginated-data="sortingList" :columns="columns">
+            <template #conditions="{ row }">
+              <div v-if="row.areaCode === 'AREA_0'">默认分拣口</div>
+              <div v-else class="conditions-text">
+                <div class="match-type">
+                  {{
+                    row.matchType === 1
+                      ? '满足以下所有条件：'
+                      : '满足以下任一条件：'
+                  }}
+                </div>
+                <div
+                  v-for="(item, index) in row.conditions || []"
+                  :key="index"
+                  class="condition-item"
+                >
+                  <span
+                    class="condition-text"
+                    :title="formatConditionText(item)"
+                  >
+                    {{ index + 1 }}、 {{ formatConditionText(item) }}
+                  </span>
+                  <el-popover
+                    v-if="item.conditionType === 'order_category'"
+                    placement="bottom"
+                    :width="'auto'"
+                    trigger="click"
+                  >
+                    <el-cascader-panel
+                      class="category-cascader-panel-readonly"
+                      :model-value="getCategoryCascaderValue(item)"
+                      :options="categoryList"
+                      :props="{
+                        label: 'name',
+                        value: 'id',
+                        children: 'children',
+                        multiple: true,
+                        emitPath: true,
+                        checkOnClickNode: false,
+                        checkOnClickLeaf: false,
+                        showPrefix: false,
+                      }"
+                    />
+                    <template #reference>
+                      <el-button
+                        type="primary"
+                        link
+                        class="category-detail-btn"
+                      >
+                        详情
+                      </el-button>
+                    </template>
+                  </el-popover>
+                </div>
+              </div>
+            </template>
            <template #autoPrint="{ row }">
              {{ row.autoPrint ? '开启' : '关闭' }}
            </template>
@@ -78,6 +134,9 @@
      :edit-data="editData"
      :warehouse-id="searchForm.warehouseId"
      :warehouse-name="searchForm.warehouseName"
+      :category-list="categoryList"
+      :picking-rule-list="pickingRuleList"
+      :operator-list="operatorList"
      @submit="getSortingRuleList"
    />
    <el-dialog
@@ -97,7 +156,9 @@ import { loadWarehouseListApi } from '@/api/common'
 import type { WarehouseListData } from '@/types'
 import type {
  LogListData,
+  OperatorList,
  SortingList,
+  SortingRuleCondition,
  SortingRuleDetail,
 } from '@/types/api/order'
 import type { CustomColumn } from '@/types/table'
@@ -107,6 +168,9 @@ import {
  getConfigApi,
  updateConfighApi,
  getAreaInfoApi,
+  getCategoryListApi,
+  getConditionTypeListApi,
+  getOperatorListApi,
 } from '@/api/order'
 import TableView from '@/components/TableView.vue'
 import LogList from '@/components/LogList.vue'
@@ -128,11 +192,13 @@ const columns: CustomColumn<SortingList>[] = [
    align: 'center',
  },
  {
-    key: 'conditionsText',
+    key: 'conditions',
-    prop: 'conditionsText',
+    prop: 'conditions',
    label: '配货规则',
    minWidth: 250,
    align: 'left',
+    slot: 'conditions',
+    showOverflowTooltip: false,
  },
  {
    key: 'areaName',
@@ -174,6 +240,9 @@ const columns: CustomColumn<SortingList>[] = [
 const warehouseList = ref<WarehouseListData[]>([]) // 仓库列表
 const sortingList = ref<SortingList[]>([]) // 规则列表
+const categoryList = ref<OperatorList[]>([]) // 商品类目
+const pickingRuleList = ref<OperatorList[]>([]) // 配货规则条件
+const operatorList = ref<OperatorList[]>([]) // 配货规则操作符
 const isEnableSorting = ref(false) // 是否开启配货分拣
 const currentId = ref(0) // 当前操作id
 const isEdit = ref(false) // 是否编辑
@@ -188,6 +257,139 @@ const searchForm = ref({
  warehouseName: '',
 })
+type CategoryNode = OperatorList & {
+  id?: number | string
+  name?: string
+  children?: CategoryNode[]
+}
+// 获取节点下全部叶子 id
+const getCategoryLeafIds = (node: CategoryNode): string[] => {
+  if (!node.children?.length) return node.id != null ? [String(node.id)] : []
+  return node.children.flatMap(getCategoryLeafIds)
+}
+// 格式化已选类目：某项下所有子项都被选中时，只展示该项路径
+const formatSelectedCategories = (
+  list: CategoryNode[],
+  selectedIds: Set<string>,
+  path: string[] = [],
+): string[] => {
+  const result: string[] = []
+  for (const item of list) {
+    const currentPath = [...path, item.name ?? '']
+    const leafIds = getCategoryLeafIds(item)
+    const allSelected =
+      leafIds.length > 0 && leafIds.every((id) => selectedIds.has(id))
+    if (allSelected) {
+      result.push(currentPath.join('->'))
+      continue
+    }
+    if (item.children?.length) {
+      result.push(
+        ...formatSelectedCategories(item.children, selectedIds, currentPath),
+      )
+    } else if (item.id != null && selectedIds.has(String(item.id))) {
+      result.push(currentPath.join('->'))
+    }
+  }
+  return result
+}
+// 根据叶子 id 查找类目完整路径（用于级联回显）
+const findCategoryPath = (
+  list: CategoryNode[],
+  targetId: string | number,
+  path: (string | number)[] = [],
+): (string | number)[] | null => {
+  for (const item of list) {
+    if (item.id == null) continue
+    const currentPath = [...path, item.id]
+    if (String(item.id) === String(targetId)) return currentPath
+    if (item.children?.length) {
+      const found = findCategoryPath(item.children, targetId, currentPath)
+      if (found) return found
+    }
+  }
+  return null
+}
+// 将条件值转为级联回显路径
+const getCategoryCascaderValue = (item: SortingRuleCondition) => {
+  const ids = String(item.conditionValue ?? '')
+    .split(',')
+    .filter(Boolean)
+  return ids
+    .map((id) => {
+      const num = Number(id)
+      return findCategoryPath(
+        categoryList.value as CategoryNode[],
+        Number.isNaN(num) ? id : num,
+      )
+    })
+    .filter((path): path is (string | number)[] => !!path)
+}
+// 配货规则展示文案
+const formatConditionText = (item: SortingRuleCondition) => {
+  // 配货规则条件
+  const typeDesc =
+    pickingRuleList.value.find((r) => r.code === item.conditionType)?.desc ??
+    item.conditionType
+  // 配货规则操作符
+  const operatorDesc =
+    operatorList.value.find((r) => r.code === item.operator)?.desc ??
+    item.operator
+  let valueText = ''
+  switch (item.conditionType) {
+    case 'order_category': {
+      const selectedIds = new Set(
+        String(item.conditionValue ?? '')
+          .split(',')
+          .filter(Boolean),
+      )
+      valueText = formatSelectedCategories(
+        categoryList.value as CategoryNode[],
+        selectedIds,
+      ).join('、')
+      break
+    }
+    case 'order_platform':
+      valueText = String(item.conditionValue ?? '')
+        .split(',')
+        .filter(Boolean)
+        .join('、')
+      break
+    default:
+      valueText = String(item.conditionValue ?? '')
+      break
+  }
+  return `${typeDesc}${operatorDesc} ${valueText}`
+}
+// 获取商品类目
+const getCategoryList = async () => {
+  const res = await getCategoryListApi()
+  if (res.code !== 200) return
+  categoryList.value = res.data
+}
+// 获取配货规则条件
+const getConditionTypeList = async () => {
+  const res = await getConditionTypeListApi()
+  if (res.code !== 200) return
+  pickingRuleList.value = res.data
+}
+// 获取配货规则操作符
+const getOperatorList = async () => {
+  const res = await getOperatorListApi()
+  if (res.code !== 200) return
+  operatorList.value = res.data
+}
 // 加载仓库列表
 const loadWarehouseList = async () => {
  try {
@@ -303,9 +505,16 @@ const deleteArea = async (id: number) => {
 // }
 onMounted(async () => {
-  await loadWarehouseList()
+  loading.value = true
-  await getFunctionSwitch()
+  await Promise.all([
+    loadWarehouseList(),
+    getFunctionSwitch(),
+    getCategoryList(),
+    getConditionTypeList(),
+    getOperatorList(),
+  ])
  await getSortingRuleList()
+  loading.value = false
 })
 </script>
@@ -340,4 +549,46 @@ onMounted(async () => {
    margin-top: 10px;
  }
 }
+.conditions-text {
+  padding: 4px 0;
+  line-height: 1.6;
+  overflow: hidden;
+  .match-type {
+    color: #666;
+    margin-bottom: 2px;
+  }
+  .condition-item {
+    display: flex;
+    align-items: center;
+    color: #333;
+    overflow: hidden;
+    min-width: 0;
+    .condition-text {
+      flex: 1;
+      min-width: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .category-detail-btn {
+      flex-shrink: 0;
+      margin-left: 4px;
+      padding: 0;
+      height: auto;
+    }
+  }
+}
+</style>
+<style lang="scss">
+// 详情面板只读：可展开，禁止勾选
+.category-cascader-panel-readonly {
+  .el-checkbox {
+    pointer-events: none;
+  }
+}
 </style>
--- a/src/views/order/factoryOrderNew/hooks/useOrderDictionaries.ts
+++ b/src/views/order/factoryOrderNew/hooks/useOrderDictionaries.ts
@@ -29,7 +29,7 @@ const processTypeMap: Record<string, string> = {
  QT: '其他',
 }
-export function useOrderDictionaries() {
+export function useOrderDictionaries(dontLoadCraft?:boolean) {
  const userMarkList = ref<string[]>([])
  const receiverCountryList = ref<{ countryCode: string; nameCn: string }[]>([])
  const customTagList = ref<{ id: string; name: string }[]>([])
@@ -136,16 +136,20 @@ export function useOrderDictionaries() {
  }
  const loadAllDictionaries = async () => {
-    await Promise.all([
+    const arr = [
-      loadCraftList(),
      getUserMark(),
      getCustomTagList(),
      getLogisticsCompanyAllCodelist(),
-    ])
+    ]
+    if(!dontLoadCraft){
+      arr.unshift(loadCraftList())
+    }
+    await Promise.all(arr)
  }
  return {
    userMarkList,
+    processTypeMap,
    receiverCountryList,
    customTagList,
    allCodelist,

--- a/src/views/order/factoryOrderNew/hooks/useOrderStatusTree.ts
+++ b/src/views/order/factoryOrderNew/hooks/useOrderStatusTree.ts
@@ -91,7 +91,6 @@ export function useOrderStatusTree(options: UseOrderStatusTreeOptions) {
    try {
      const res = await getPodOrderAcceptedStatisticsApi(
        getQueryPayload(),
-        currentPage.value,
        pageSize.value,
        status.value,
        getListPageAcceptedSubStatus(),

--- a/src/views/order/factoryOrderNew/index.vue
+++ b/src/views/order/factoryOrderNew/index.vue
@@ -172,7 +172,7 @@
            <ElFormItem label="工艺" label-width="50px">
              <LogisticsWaySelect
                v-model="searchForm.craftCode"
-                :company-list="craftList"
+                :company-list="podCraftList"
                :start-width="'150px'"
                search-placeholder="搜索工艺名称"
                start-placeholder="请选择工艺名称"
@@ -1281,10 +1281,11 @@ import type { BaseRespData } from '@/types/api'
 import type {
  FactoryOrderNewListData,
  ProductListData,
+  CraftData,
  ExportParams,
  operateOrderListData,
 } from '@/types/api/order/factoryOrderNew'
-import type { AddressInfo } from '@/types/api/podCnOrder'
+import type { AddressInfo, CraftListData } from '@/types/api/podCnOrder'
 import platformJson from '../../../json/platform.json'
 import {
  refreshProductInfoApi,
@@ -1365,10 +1366,11 @@ import { useOrderBatchActions } from './hooks/useOrderBatchActions'
 import { ElButton, ElTag } from 'element-plus'
 import OrderInventoryDetailDialog from './component/OrderInventoryDialog.vue'
 import { downloadByUrl } from '@/utils/index.ts'
+import { getPodOrderCraftApi } from '@/api/podCnOrder.ts'
 const resultInfo = ref<ResultInfoDataItem[]>([])
 const resultRefs = ref()
+const podCraftList = ref<CraftData[]>([])
 const statusSidebarCollapsed = ref(false)
 const toggleStatusSidebar = () => {
  statusSidebarCollapsed.value = !statusSidebarCollapsed.value
@@ -1398,13 +1400,13 @@ const {
  receiverCountryList,
  customTagList,
  allCodelist,
-  craftList,
  warehouseList,
+  processTypeMap,
  productTypeGroups,
  getReceiverCountryList,
  loadWarehouseList,
  loadAllDictionaries,
-} = useOrderDictionaries()
+} = useOrderDictionaries(true)
 const refreshCurrentViewProxy = ref<() => void>(() => {})
 let getFactoryOrderSearchVisibilityContext: () => FactoryOrderSearchQueryVisibilityContext =
@@ -1521,6 +1523,17 @@ const getListQueryPayload = () => {
  return payload
 }
+const getCraft = async () => {
+  const res =  await getPodOrderCraftApi()
+  const data: CraftListData[] = res.data
+  podCraftList.value = data.map((item:CraftListData) => ({
+    id: item.craftCode,
+    name: item.craftName,
+    warehouseName: processTypeMap[item.craftType] ?? '其他',
+  }))
+}
+getCraft()
 const {
  subLoading,
  activeTab,
@@ -1917,11 +1930,19 @@ const mainColumns = computed(() => [
  },
  {
    prop: 'statusName',
-    label: status.value !== 'SUSPEND' ? '订单状态' : '挂起前状态',
+    label:'挂起前状态',
+    minWidth: 120,
+    hidden:status.value !== 'SUSPEND',
+    align: 'center'
+  },
+  {
+    prop: 'statusName',
+    hidden:status.value === 'SUSPEND',
+    label: '订单状态',
    minWidth: 120,
    align: 'center',
    render: (row: FactoryOrderNewListData) => {
-      return <span>{row.pause ? '挂起' : row.statusName}</span>
+      return <span>{ row.pause ? '挂起' : row.statusName}</span>
    },
  },
  {
@@ -2348,6 +2369,13 @@ const baseProductColumns = computed(() => [
    align: 'center',
  },
  {
+    key: 'categoryName',
+    prop: 'categoryName',
+    label: '商品类目',
+    minWidth: 160,
+    align: 'center',
+  },
+  {
    prop: 'price',
    label: '价格',
    minWidth: 100,
@@ -2896,12 +2924,19 @@ const handleSeedingWall = (type: 'print' | 'sort') => {
  podOrderVisible.value = true
 }
-const printOrder = async (
+/** LODOP 单例不可并发，打印串行 */
+let printOrderChain: Promise<void> = Promise.resolve()
+const printOrder = (
  data: OrderData,
  callback: (status: boolean) => void,
 ) => {
+  const run = async () => {
    const lodop = getCLodop(null, null)
-  if (!lodop) return
+    if (!lodop) {
+      callback && callback(false)
+      return
+    }
    lodop.PRINT_INIT('打印内容')
    const printerIndex = lodop.SET_PRINTER_INDEX(sheetPrinter.value)
    console.log(
@@ -2956,11 +2991,9 @@ const printOrder = async (
        console.log('PRINT_STATUS_OK:', jobCode, `ok: ${ok}`)
        if (ok == 1) {
          console.log('打印成功')
-        // 打印状态：成功
          callback && callback(true)
          return
        }
-      // 如果打印状态表示未成功或者返回了空，继续获取任务是否存在
        const exist = await lodopCall((lodop) =>
          lodop.GET_VALUE('PRINT_STATUS_EXIST', jobCode),
        )
@@ -2974,7 +3007,6 @@ const printOrder = async (
        )
        if (exist == 0) {
          console.log('任务不存在了', `exist:${exist}`)
-        // 任务不存在了
          callback && callback(true)
          return
        }
@@ -2991,6 +3023,9 @@ const printOrder = async (
      lodop.PRINT()
      callback && callback(false)
    }
+  }
+  printOrderChain = printOrderChain.then(run, run)
 }
 let _lodop: LODOPObject | null = null
 let _lodopCallback: { [key: string]: (value: string) => void } = {}

--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -198,7 +198,6 @@
              >
                <ElButton
                  :disabled="
-                    selection.find((item) => item.manuscriptStatus !== 30) ||
                    selection.length !== 1
                  "
                  type="warning"

--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/src/views/order/podUs/PodMakeOrder.vue
@@ -1251,9 +1251,6 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
    if (type === 'manual' && boxs.length > 0) {
      nextTick(async () => {
-        // 切换箱子至验货完成的箱子
-        boxChange.value = true
-        boxIndex.value = boxs[0] as number
        const token = ++pickFinishedAlertToken
        if (token > 1) {
          ElMessageBox.close()
@@ -1338,7 +1335,8 @@ const nextStep = async (callback: () => void) => {
        callback && callback()
      })
    } catch (error) {
-      productionOrderRef.value.focus()
+      // 取消打单完成时仍允许切换箱子 / 关闭弹窗
+      callback && callback()
      console.error(error)
    }
  } else {
@@ -1448,15 +1446,24 @@ const handlePrinterChange = (value: string) => {
  emit('set-printer', value)
 }
+/** 已自动打印过的订单，避免 WS 回写清掉 printResult 后重复打印 */
+const autoPrintedIds = new Set<number>()
 const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
  const _boxIndex = boxIndex.value
+  const orderId = data.id
-  if (!forcePrint && data.printResult) {
+  if (
+    !forcePrint &&
+    (data.printResult || (orderId != null && autoPrintedIds.has(orderId)))
+  ) {
    callback && callback()
    return
  }
+  if (!forcePrint && orderId != null) autoPrintedIds.add(orderId)
  props.printOrder(data, (status: boolean) => {
+    if (!status && orderId != null) autoPrintedIds.delete(orderId)
    callback && callback()
    const item = podBoxList.value?.find((item) => item.box === _boxIndex)
    if (item && item.data) {
@@ -1764,6 +1771,7 @@ const resetPlatform = () => {
  .basic-info-item {
    display: flex;
    align-items: center;
+    overflow: hidden;
    span:last-child {
      flex: 1;

--- a/src/views/podBillOrder/index.vue
+++ b/src/views/podBillOrder/index.vue
@@ -901,7 +901,7 @@
 </template>
 <script setup lang="ts">
-import { ElMessage, ElTable, ElTree, TableColumnCtx } from 'element-plus'
+import { ElMessage, ElTree, TableColumnCtx, type TableInstance } from 'element-plus'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
 import { CircleClose, Plus } from '@element-plus/icons-vue'
 // import pendingReconciliation from './pendingReconciliation.vue'
@@ -945,7 +945,9 @@ interface Tree {
  children?: Tree[]
 }
-interface SummaryMethodProps<T = AccountStatementNote> {
+interface SummaryMethodProps<
+  T extends Record<PropertyKey, any> = AccountStatementNote,
+> {
  columns: TableColumnCtx<T>[]
  data: T[]
 }
@@ -973,7 +975,7 @@ const selections = ref<AccountStatementNote[]>([])
 const detailSelections = ref<ItemList[]>([])
 const detailList = ref<ItemList[]>([])
 const tabsValue = ref<string>('0')
-const singleTableRef = ref<InstanceType<typeof ElTable>>()
+const singleTableRef = ref<TableInstance>()
 const currentRow = ref<AccountStatementNote | null>(null)
 const paymentDialogVisible = ref(false)
@@ -1008,7 +1010,7 @@ const {
  refresh: search,
  onCurrentPageChange: handleCurrentChange,
  onPageSizeChange: handleSizeChange,
-} = usePageList({
+} = usePageList<AccountStatementNote>({
  query: (page, pageSize) =>
    podReconciliationList(
      {
@@ -1152,7 +1154,7 @@ const getTreeNum = async () => {
    console.error(e)
  }
 }
-const rowClick = (row: AccountStatementNote) => {
+const rowClick = (row: AccountStatementNote | null) => {
  if (!row) {
    currentRow.value = null
  }
@@ -1362,7 +1364,7 @@ const submitConfirmOrder = async (type: number) => {
  search()
  await getTreeNum()
  if (singleTableRef.value) {
-    singleTableRef.value!.setCurrentRow(currentRow.value)
+    singleTableRef.value!.setCurrentRow(currentRow.value ?? undefined)
  }
 }
 watch(

--- a/src/views/podBillOrder/pendingReconciliation.vue
+++ b/src/views/podBillOrder/pendingReconciliation.vue
@@ -34,7 +34,7 @@ const {
  refresh: search,
  onCurrentPageChange: handleCurrentChange,
  onPageSizeChange: handleSizeChange,
-} = usePageList({
+} = usePageList<AccountStatementNote>({
  query: (page, pageSize) =>
    getPodShipmentDetailsById(
      {

--- a/src/views/podUsBillOrder/editOrder.vue
+++ b/src/views/podUsBillOrder/editOrder.vue
 <script setup lang="ts">
-import { ElMessage, ElTable } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import type { PropType } from 'vue'
 import { ProductDetails } from '@/types/api/billOrder.ts'
 const selection = ref<ProductDetails[]>([])
 defineProps({
  list: {
-    type: Array,
+    type: Array as PropType<ProductDetails[]>,
    default: () => [],
  },
 })
-const handleDetailSelectionChange = (arr:ProductDetails[]) => {
+const handleDetailSelectionChange = (arr: ProductDetails[]) => {
  selection.value = arr
 }

--- a/src/views/podUsBillOrder/index.vue
+++ b/src/views/podUsBillOrder/index.vue
@@ -1040,7 +1040,7 @@
 <script setup lang="ts">
 import DetailView from './detail.vue'
 import EditOrder from './editOrder.vue'
-import { ElMessage, ElTable, ElTree, TableColumnCtx } from 'element-plus'
+import { ElMessage, ElTree, TableColumnCtx, type TableInstance } from 'element-plus'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from '@/utils/hooks/useValue'
@@ -1084,7 +1084,9 @@ interface Tree {
  children?: Tree[]
 }
-interface SummaryMethodProps<T = AccountStatementNote> {
+interface SummaryMethodProps<
+  T extends Record<PropertyKey, any> = AccountStatementNote,
+> {
  columns: TableColumnCtx<T>[]
  data: T[]
 }
@@ -1105,7 +1107,7 @@ const orderSelections = ref<OrderDetails[]>([])
 const detailList = ref<ProductDetails[]>([])
 const orderList = ref<OrderDetails[]>([])
 const tabsValue = ref<string>('0')
-const singleTableRef = ref<InstanceType<typeof ElTable>>()
+const singleTableRef = ref<TableInstance>()
 const currentRow = ref<AccountStatementNote | null>(null)
 const batchSave = async () => {
@@ -1182,7 +1184,7 @@ const {
  refresh: search,
  onCurrentPageChange: handleCurrentChange,
  onPageSizeChange: handleSizeChange,
-} = usePageList({
+} = usePageList<AccountStatementNote>({
  query: (page, pageSize) =>
    podUsReconciliationList(
      {
@@ -1254,7 +1256,7 @@ const getTreeNum = async () => {
    console.error(e)
  }
 }
-const rowClick = (row: AccountStatementNote) => {
+const rowClick = (row: AccountStatementNote | null) => {
  if (!row) {
    currentRow.value = null
  }
@@ -1414,7 +1416,7 @@ const submitConfirmOrder = async (type: number) => {
  search()
  await getTreeNum()
  if (singleTableRef.value) {
-    singleTableRef.value!.setCurrentRow(currentRow.value)
+    singleTableRef.value!.setCurrentRow(currentRow.value ?? undefined)
  }
 }
 watch(

--- a/src/views/podUsBillOrder/pendingReconciliation.vue
+++ b/src/views/podUsBillOrder/pendingReconciliation.vue
@@ -34,7 +34,7 @@ const {
  refresh: search,
  onCurrentPageChange: handleCurrentChange,
  onPageSizeChange: handleSizeChange,
-} = usePageList({
+} = usePageList<AccountStatementNote>({
  query: (page, pageSize) =>
    getPodShipmentDetailsById(
      {

--- a/src/views/warehouse/issueDoc.vue
+++ b/src/views/warehouse/issueDoc.vue
@@ -894,10 +894,9 @@
 </template>
 <script setup lang="ts">
-import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
+import { ElMessage, ElRadioGroup, ElTree, type TableInstance } from 'element-plus'
 import { CirclePlusFilled } from '@element-plus/icons-vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
-import { ElTable } from 'element-plus'
 import usePageList from '@/utils/hooks/usePageList'
 import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
 import { useValue } from '@/utils/hooks/useValue'
@@ -1064,7 +1063,7 @@ const tradingTime = ref<string[]>([])
 const selections = ref<InterWarehousePage[]>([])
 const detailList = ref<InterProductList[]>([])
 const tabsValue = ref<string>('0')
-const singleTableRef = ref<InstanceType<typeof ElTable>>()
+const singleTableRef = ref<TableInstance>()
 const currentRow = ref<InterWarehousePage | null>(null)
 const logList = ref<LogListData[]>([])
 const rules = {
@@ -1399,7 +1398,7 @@ const getWarehouseList = async () => {
    console.error(e)
  }
 }
-const rowClick = (row: InterWarehousePage) => {
+const rowClick = (row: InterWarehousePage | null) => {
  if (!row) {
    currentRow.value = null
  }

--- a/src/views/warehouse/receiptDoc.vue
+++ b/src/views/warehouse/receiptDoc.vue
@@ -629,9 +629,8 @@
 </template>
 <script setup lang="ts">
-import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
+import { ElMessage, ElRadioGroup, ElTree, type TableInstance } from 'element-plus'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
-import { ElTable } from 'element-plus'
 import ReceiptProductDialog from './components/ReceiptProductDialog.vue'
 import usePageList from '@/utils/hooks/usePageList'
 import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
@@ -807,7 +806,7 @@ const tradingTime = ref<string[]>([])
 const selections = ref<InterWarehousePage[]>([])
 const detailList = ref<InterProductList[]>([])
 const tabsValue = ref<string>('0')
-const singleTableRef = ref<InstanceType<typeof ElTable>>()
+const singleTableRef = ref<TableInstance>()
 const currentRow = ref<InterWarehousePage | null>(null)
 const logList = ref<LogListData[]>([])
 const detailLoading = ref(false)
@@ -1085,7 +1084,7 @@ const getWarehouseList = async () => {
    console.error(e)
  }
 }
-const rowClick = (row: InterWarehousePage) => {
+const rowClick = (row: InterWarehousePage | null) => {
  if (!row) {
    currentRow.value = null
  }

--- a/src/views/warehouse/stockingPlan.vue
+++ b/src/views/warehouse/stockingPlan.vue
@@ -998,10 +998,9 @@
 </template>
 <script setup lang="ts">
-import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
+import { ElMessage, ElRadioGroup, ElTree, type TableInstance } from 'element-plus'
 import { CirclePlusFilled } from '@element-plus/icons-vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
-import { ElTable } from 'element-plus'
 import usePageList from '@/utils/hooks/usePageList'
 import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
 import { useValue } from '@/utils/hooks/useValue'
@@ -1174,7 +1173,7 @@ const tradingTime = ref<string[]>([])
 const selections = ref<InterWarehousePage[]>([])
 const detailList = ref<InterProductList[]>([])
 const tabsValue = ref<string>('0')
-const singleTableRef = ref<InstanceType<typeof ElTable>>()
+const singleTableRef = ref<TableInstance>()
 const currentRow = ref<InterWarehousePage | null>(null)
 const logList = ref<LogListData[]>([])
 const rules = {
@@ -1509,7 +1508,7 @@ const getWarehouseList = async () => {
    console.error(e)
  }
 }
-const rowClick = (row: InterWarehousePage) => {
+const rowClick = (row: InterWarehousePage | null) => {
  if (!row) {
    currentRow.value = null
  }