Merge remote-tracking branch 'refs/remotes/origin/dev_pro2.0' into dev_宁夏_九泓化工

云

13 小时以前 c77086ad2d7949ab36dd0c4e0b59907e672dd64f

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

@@ -5,7 +5,6 @@
import { ref } from 'vue';

import { CommonStatusEnum } from '@vben/constants';
import { handleTree } from '@vben/utils';

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: {