Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

liu

2026-09-07 a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8

 src/views/mes/dv/machinery/type/components/tree.vue

@@ -4,8 +4,7 @@

import { ref } from 'vue';

import { CommonStatusEnum } from '..\..\..\..\..\..\packages\constants\src';
import { handleTree } from '..\..\..\..\..\..\packages\utils\src';
import { CommonStatusEnum } from '@vben/constants';

import { Card, Input } from 'ant-design-vue';

@@ -30,12 +29,10 @@
    proxyConfig: {
      ajax: {
        query: async () =>
          handleTree(
            await getMachineryTypeList({
              name: searchKeyword.value || undefined,
              status: CommonStatusEnum.ENABLE,
            }),
          ),
          await getMachineryTypeList({
            name: searchKeyword.value || undefined,
            status: CommonStatusEnum.ENABLE,
          }),
      },
    },
    rowConfig: {