fix(merge): merge department

config/routes.ts

@@ -75,6 +75,26 @@
         icon: 'smile',
         component: './system/DataSource',
       },
+      {
+        path: '/system/department',
+        name: 'department',
+        icon: 'smile',
+        component: './system/Department',
+      },
+      {
+        hideInMenu: true,
+        path: '/system/department/:id/assets',
+        name: 'assets',
+        icon: 'smile',
+        component: './system/Department/Assets',
+      },
+      {
+        hideInMenu: true,
+        path: '/system/department/:id/user',
+        name: 'member',
+        icon: 'smile',
+        component: './system/Department/Member',
+      },
     ],
   },
   {

src/locales/zh-CN/menu.ts

@@ -11,6 +11,9 @@ export default {
   'menu.system.permission': '权限管理',
   'menu.system.tenant': '租户管理',
   'menu.system.datasource': '数据源管理',
+  'menu.system.department': '部门管理',
+  'menu.system.assets': '资产分配',
+  'menu.system.member': '用户',
   'menu.device': '设备管理',
   'menu.device.product': '产品',
   'menu.device.product-detail': '产品详情',

src/locales/zh-CN/pages.ts

@@ -28,6 +28,7 @@ export default {
   'pages.data.option.download': '下载',
   'pages.data.option.record': '通知记录',
   'pages.data.option.save': '保存',
+  'pages.data.option.assets': '资产分配',
   'pages.searchTable.new': '新建',
   'pages.searchTable.titleStatus': '状态',
   'pages.searchTable.titleStatus.all': '全部',
@@ -121,6 +122,9 @@ export default {
   'pages.system.org.option.bindUser': '绑定用户',
   'pages.system.org.option.permission': '权限分配',
   'pages.system.org.option.add': '添加下级',
+  // 系统设置-部门管理
+  'pages.system.department.user': '用户',
+  'pages.system.department.option.add': '新增子部门',
   // 系统设置-第三方平台
   'pages.system.openApi': '第三方平台',
   'pages.system.openApi.username': '用户名',

src/pages/system/Department/Assets/deivce/bind.tsx

@@ -0,0 +1,141 @@
+// 资产-产品分类-绑定
+import type { ProColumns, ActionType } from '@jetlinks/pro-table';
+import ProTable from '@jetlinks/pro-table';
+import { DeviceBadge, service } from './index';
+import { Modal } from 'antd';
+import { useParams } from 'umi';
+import Models from './model';
+import { useEffect, useRef, useState } from 'react';
+import { observer } from '@formily/react';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import type { DeviceItem } from '@/pages/system/Department/typings';
+import PermissionModal from '@/pages/system/Department/Assets/permissionModal';
+
+interface Props {
+  reload: () => void;
+  visible: boolean;
+  onCancel: () => void;
+}
+
+const Bind = observer((props: Props) => {
+  const intl = useIntl();
+  const param = useParams<{ id: string }>();
+  const actionRef = useRef<ActionType>();
+  const [perVisible, setPerVisible] = useState(false);
+
+  const columns: ProColumns<DeviceItem>[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 220,
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.table.name',
+        defaultMessage: '名称',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.device.firmware.productName',
+        defaultMessage: '所属产品',
+      }),
+      dataIndex: 'configuration',
+      render: (_, row) => {
+        return row.productName;
+      },
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.device.instance.registrationTime',
+        defaultMessage: '注册时间',
+      }),
+      dataIndex: 'registryTime',
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.searchTable.titleStatus',
+        defaultMessage: '状态',
+      }),
+      dataIndex: 'state',
+      render: (_, row) => <DeviceBadge type={row.state.value} text={row.state.text} />,
+      search: false,
+    },
+  ];
+
+  const handleBind = () => {
+    if (Models.bindKeys.length) {
+      setPerVisible(true);
+    } else {
+      props.onCancel();
+    }
+  };
+
+  useEffect(() => {
+    if (props.visible) {
+      actionRef.current?.reload();
+    }
+  }, [props.visible]);
+
+  return (
+    <Modal
+      visible={props.visible}
+      onOk={handleBind}
+      onCancel={props.onCancel}
+      width={990}
+      title="绑定"
+    >
+      <PermissionModal
+        visible={perVisible}
+        type="device"
+        bindKeys={Models.bindKeys}
+        onCancel={(type) => {
+          setPerVisible(false);
+          if (type) {
+            props.reload();
+            props.onCancel();
+          }
+        }}
+      />
+      <ProTable<DeviceItem>
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="id"
+        pagination={{
+          pageSize: 5,
+        }}
+        rowSelection={{
+          selectedRowKeys: Models.bindKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            Models.bindKeys = selectedRows.map((item) => item.id);
+          },
+        }}
+        request={(params) => service.queryDeviceList(params)}
+        params={{
+          terms: [
+            {
+              column: 'id',
+              termType: 'dim-assets$not',
+              value: {
+                assetType: 'device',
+                targets: [
+                  {
+                    type: 'org',
+                    id: param.id,
+                  },
+                ],
+              },
+            },
+          ],
+        }}
+      />
+    </Modal>
+  );
+});
+export default Bind;

src/pages/system/Department/Assets/deivce/index.tsx

@@ -0,0 +1,274 @@
+// 资产分配-产品分类
+import ProTable from '@jetlinks/pro-table';
+import type { ActionType, ProColumns } from '@jetlinks/pro-table';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import { Button, message, Popconfirm, Tooltip, Badge } from 'antd';
+import { useRef, useState } from 'react';
+import { useParams } from 'umi';
+import { observer } from '@formily/react';
+import type { DeviceItem } from '@/pages/system/Department/typings';
+import { DisconnectOutlined, PlusOutlined } from '@ant-design/icons';
+import Models from './model';
+import Service from '@/pages/system/Department/Assets/service';
+import Bind from './bind';
+import SearchComponent from '@/components/SearchComponent';
+
+export const service = new Service<DeviceItem>();
+
+type DeviceBadgeProps = {
+  type: string;
+  text: string;
+};
+export const DeviceBadge = (props: DeviceBadgeProps) => {
+  const STATUS = {
+    notActive: 'processing',
+    offline: 'error',
+    online: 'success',
+  };
+  return <Badge status={STATUS[props.type]} text={props.text} />;
+};
+
+export default observer(() => {
+  const intl = useIntl();
+  const actionRef = useRef<ActionType>();
+
+  const param = useParams<{ id: string }>();
+  const [searchParam, setSearchParam] = useState({
+    terms: [
+      {
+        column: 'id',
+        termType: 'dim-assets',
+        value: {
+          assetType: 'device',
+          targets: [
+            {
+              type: 'org',
+              id: param.id,
+            },
+          ],
+        },
+      },
+    ],
+  });
+  /**
+   * 解除资产绑定
+   */
+  const handleUnBind = () => {
+    service
+      .unBind('device', [
+        {
+          targetType: 'org',
+          targetId: param.id,
+          assetType: 'device',
+          assetIdList: Models.unBindKeys,
+        },
+      ])
+      .subscribe({
+        next: () => message.success('操作成功'),
+        error: () => message.error('操作失败'),
+        complete: () => {
+          Models.unBindKeys = [];
+          actionRef.current?.reload();
+        },
+      });
+  };
+
+  const singleUnBind = (key: string) => {
+    Models.unBindKeys = [key];
+    handleUnBind();
+  };
+
+  const columns: ProColumns<DeviceItem>[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 220,
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.table.name',
+        defaultMessage: '名称',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.device.firmware.productName',
+        defaultMessage: '所属产品',
+      }),
+      dataIndex: 'configuration',
+      render: (_, row) => {
+        return row.productName;
+      },
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.device.instance.registrationTime',
+        defaultMessage: '注册时间',
+      }),
+      dataIndex: 'registryTime',
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.searchTable.titleStatus',
+        defaultMessage: '状态',
+      }),
+      dataIndex: 'state',
+      filters: true,
+      onFilter: true,
+      valueType: 'select',
+      valueEnum: {
+        all: {
+          text: intl.formatMessage({
+            id: 'pages.searchTable.titleStatus.all',
+            defaultMessage: '全部',
+          }),
+          status: 'Default',
+        },
+        onLine: {
+          text: intl.formatMessage({
+            id: 'pages.device.instance.status.onLine',
+            defaultMessage: '在线',
+          }),
+          status: 'onLine',
+        },
+        offLine: {
+          text: intl.formatMessage({
+            id: 'pages.device.instance.status.offLine',
+            defaultMessage: '离线',
+          }),
+          status: 'offLine',
+        },
+        notActive: {
+          text: intl.formatMessage({
+            id: 'pages.device.instance.status.notActive',
+            defaultMessage: '未启用',
+          }),
+          status: 'notActive',
+        },
+      },
+      render: (_, row) => <DeviceBadge type={row.state.value} text={row.state.text} />,
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.data.option',
+        defaultMessage: '操作',
+      }),
+      valueType: 'option',
+      align: 'center',
+      width: 200,
+      render: (text, record) => [
+        <Popconfirm
+          title={intl.formatMessage({
+            id: 'pages.system.role.option.unBindUser',
+            defaultMessage: '是否解除绑定',
+          })}
+          key="unBind"
+          onConfirm={() => {
+            singleUnBind(record.id);
+          }}
+        >
+          <a href="#">
+            <Tooltip
+              title={intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '解除绑定',
+              })}
+            >
+              <DisconnectOutlined />
+            </Tooltip>
+          </a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  const closeModal = () => {
+    Models.bind = false;
+    Models.bindKeys = [];
+  };
+
+  return (
+    <>
+      <Bind
+        visible={Models.bind}
+        onCancel={closeModal}
+        reload={() => actionRef.current?.reload()}
+      />
+      <SearchComponent<DeviceItem>
+        field={columns}
+        onSearch={async (data) => {
+          setSearchParam({
+            terms: [
+              ...data,
+              {
+                column: 'id',
+                termType: 'dim-assets',
+                value: {
+                  assetType: 'device',
+                  targets: [
+                    {
+                      type: 'org',
+                      id: param.id,
+                    },
+                  ],
+                },
+              },
+            ],
+          });
+        }}
+        target="department-assets-device"
+      />
+      <ProTable<DeviceItem>
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="id"
+        search={false}
+        params={searchParam}
+        request={(params) => service.queryDeviceList(params)}
+        rowSelection={{
+          selectedRowKeys: Models.unBindKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            Models.unBindKeys = selectedRows.map((item) => item.id);
+          },
+        }}
+        toolBarRender={() => [
+          <Button
+            onClick={() => {
+              Models.bind = true;
+            }}
+            icon={<PlusOutlined />}
+            type="primary"
+            key="bind"
+          >
+            {intl.formatMessage({
+              id: 'pages.data.option.assets',
+              defaultMessage: '资产分配',
+            })}
+          </Button>,
+          <Popconfirm
+            title={intl.formatMessage({
+              id: 'pages.system.role.option.unBindUser',
+              defaultMessage: '是否批量解除绑定',
+            })}
+            key="unBind"
+            onConfirm={handleUnBind}
+          >
+            <Button icon={<DisconnectOutlined />} key="bind">
+              {intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '批量解绑',
+              })}
+            </Button>
+          </Popconfirm>,
+        ]}
+      />
+    </>
+  );
+});

src/pages/system/Department/Assets/deivce/model.ts

@@ -0,0 +1,16 @@
+// 用户数据模型
+import { model } from '@formily/reactive';
+
+type ModelType = {
+  bind: boolean;
+  bindKeys: string[];
+  unBindKeys: string[];
+};
+
+const Models = model<ModelType>({
+  bind: false,
+  bindKeys: [],
+  unBindKeys: [],
+});
+
+export default Models;

src/pages/system/Department/Assets/index.tsx

@@ -0,0 +1,55 @@
+// 部门-资产分配
+import { PageContainer } from '@ant-design/pro-layout';
+import { Tabs } from 'antd';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import ProductCategory from './productCategory';
+import Product from './product';
+import Device from '@/pages/system/Department/Assets/deivce';
+
+// 资产类型
+const TabsArray = [
+  {
+    intlTitle: '1',
+    defaultMessage: '产品分类',
+    key: 'ProductCategory',
+    components: ProductCategory,
+  },
+  {
+    intlTitle: '2',
+    defaultMessage: '产品',
+    key: 'Product',
+    components: Product,
+  },
+  {
+    intlTitle: '3',
+    defaultMessage: '设备',
+    key: 'Device',
+    components: Device,
+  },
+];
+
+const Assets = () => {
+  const intl = useIntl();
+
+  return (
+    <PageContainer>
+      <div style={{ background: '#fff', padding: 12 }}>
+        <Tabs tabPosition="left" defaultActiveKey="ProductCategory">
+          {TabsArray.map((item) => (
+            <Tabs.TabPane
+              tab={intl.formatMessage({
+                id: item.intlTitle,
+                defaultMessage: item.defaultMessage,
+              })}
+              key={item.key}
+            >
+              <item.components />
+            </Tabs.TabPane>
+          ))}
+        </Tabs>
+      </div>
+    </PageContainer>
+  );
+};
+
+export default Assets;

src/pages/system/Department/Assets/permissionModal.tsx

@@ -0,0 +1,108 @@
+import { createForm } from '@formily/core';
+import { createSchemaField } from '@formily/react';
+import { Form, FormItem, Checkbox } from '@formily/antd';
+import { message, Modal } from 'antd';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import type { ISchema } from '@formily/json-schema';
+import type { ModalProps } from 'antd/lib/modal/Modal';
+import { useParams } from 'umi';
+import Service from './service';
+
+type PermissionType = 'device' | 'product' | 'deviceCategory';
+
+export interface PerModalProps extends Omit<ModalProps, 'onOk' | 'onCancel'> {
+  type: PermissionType;
+  bindKeys: string[];
+  visible: boolean;
+  /**
+   * Model关闭事件
+   * @param type 是否为请求接口后关闭，用于外部table刷新数据
+   */
+  onCancel?: (type: boolean) => void;
+}
+
+const service = new Service('assets');
+
+export default (props: PerModalProps) => {
+  const intl = useIntl();
+  const params = useParams<{ id: string }>();
+
+  const SchemaField = createSchemaField({
+    components: {
+      Form,
+      FormItem,
+      Checkbox,
+    },
+  });
+
+  const form = createForm({
+    validateFirst: true,
+    initialValues: {},
+  });
+
+  /**
+   * 关闭Modal
+   * @param type 是否需要刷新外部table数据
+   */
+  const modalClose = (type: boolean) => {
+    if (typeof props.onCancel === 'function') {
+      props.onCancel(type);
+    }
+  };
+
+  const saveData = async () => {
+    const formData: any = await form.submit();
+    service
+      .bind(props.type, [
+        {
+          targetType: 'org',
+          targetId: params.id,
+          assetType: props.type,
+          assetIdList: props.bindKeys,
+          permission: formData.permission,
+        },
+      ])
+      .subscribe({
+        next: () => message.success('操作成功'),
+        error: () => message.error('操作失败'),
+        complete: () => {
+          modalClose(true);
+        },
+      });
+  };
+
+  const schema: ISchema = {
+    type: 'object',
+    properties: {
+      permission: {
+        type: 'array',
+        title: '资产权限',
+        'x-decorator': 'FormItem',
+        'x-component': 'Checkbox.Group',
+        enum: [
+          { label: '查看', value: 'read' },
+          { label: '编辑', value: 'save' },
+          { label: '删除', value: 'delete' },
+        ],
+      },
+    },
+  };
+
+  return (
+    <Modal
+      title={intl.formatMessage({
+        id: `pages.data.option.`,
+        defaultMessage: '资产权限',
+      })}
+      visible={props.visible}
+      onOk={saveData}
+      onCancel={() => {
+        modalClose(false);
+      }}
+    >
+      <Form form={form} labelCol={5} wrapperCol={16}>
+        <SchemaField schema={schema} />
+      </Form>
+    </Modal>
+  );
+};

src/pages/system/Department/Assets/product/bind.tsx

@@ -0,0 +1,123 @@
+// 资产-产品分类-绑定
+import type { ProColumns, ActionType } from '@jetlinks/pro-table';
+import ProTable from '@jetlinks/pro-table';
+import { service } from './index';
+import { Modal } from 'antd';
+import { useParams } from 'umi';
+import Models from './model';
+import { useEffect, useRef, useState } from 'react';
+import { observer } from '@formily/react';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import type { ProductCategoryItem } from '@/pages/system/Department/typings';
+import PermissionModal from '@/pages/system/Department/Assets/permissionModal';
+
+interface Props {
+  reload: () => void;
+  visible: boolean;
+  onCancel: () => void;
+}
+
+const Bind = observer((props: Props) => {
+  const intl = useIntl();
+  const param = useParams<{ id: string }>();
+  const actionRef = useRef<ActionType>();
+  const [perVisible, setPerVisible] = useState(false);
+
+  const columns: ProColumns<ProductCategoryItem>[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 220,
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.table.name',
+        defaultMessage: '姓名',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      dataIndex: 'username',
+      title: intl.formatMessage({
+        id: 'pages.table.describe',
+        defaultMessage: '用户名',
+      }),
+      search: {
+        transform: (value) => ({ username$LIKE: value }),
+      },
+    },
+  ];
+
+  const handleBind = () => {
+    if (Models.bindKeys.length) {
+      setPerVisible(true);
+    } else {
+      props.onCancel();
+    }
+  };
+
+  useEffect(() => {
+    if (props.visible) {
+      actionRef.current?.reload();
+    }
+  }, [props.visible]);
+
+  return (
+    <Modal
+      visible={props.visible}
+      onOk={handleBind}
+      onCancel={props.onCancel}
+      width={990}
+      title="绑定"
+    >
+      <PermissionModal
+        visible={perVisible}
+        type="product"
+        bindKeys={Models.bindKeys}
+        onCancel={(type) => {
+          setPerVisible(false);
+          if (type) {
+            props.reload();
+            props.onCancel();
+          }
+        }}
+      />
+      <ProTable<ProductCategoryItem>
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="id"
+        pagination={{
+          pageSize: 5,
+        }}
+        rowSelection={{
+          selectedRowKeys: Models.bindKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            Models.bindKeys = selectedRows.map((item) => item.id);
+          },
+        }}
+        request={(params) => service.queryProductList(params)}
+        params={{
+          terms: [
+            {
+              column: 'id',
+              termType: 'dim-assets$not',
+              value: {
+                assetType: 'product',
+                targets: [
+                  {
+                    type: 'org',
+                    id: param.id,
+                  },
+                ],
+              },
+            },
+          ],
+        }}
+      />
+    </Modal>
+  );
+});
+export default Bind;

src/pages/system/Department/Assets/product/index.tsx

@@ -0,0 +1,210 @@
+// 资产分配-产品分类
+import ProTable from '@jetlinks/pro-table';
+import type { ActionType, ProColumns } from '@jetlinks/pro-table';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import { Button, message, Popconfirm, Tooltip } from 'antd';
+import { useRef, useState } from 'react';
+import { useParams } from 'umi';
+import { observer } from '@formily/react';
+import type { ProductItem } from '@/pages/system/Department/typings';
+import { DisconnectOutlined, PlusOutlined } from '@ant-design/icons';
+import Service from '@/pages/system/Department/Assets/service';
+import Models from './model';
+import Bind from './bind';
+import SearchComponent from '@/components/SearchComponent';
+
+export const service = new Service<ProductItem>();
+
+export default observer(() => {
+  const intl = useIntl();
+  const actionRef = useRef<ActionType>();
+
+  const param = useParams<{ id: string }>();
+  const [searchParam, setSearchParam] = useState({
+    terms: [
+      {
+        column: 'id',
+        termType: 'dim-assets',
+        value: {
+          assetType: 'product',
+          targets: [
+            {
+              type: 'org',
+              id: param.id,
+            },
+          ],
+        },
+      },
+    ],
+  });
+
+  /**
+   * 解除资产绑定
+   */
+  const handleUnBind = () => {
+    service
+      .unBind('product', [
+        {
+          targetType: 'org',
+          targetId: param.id,
+          assetType: 'product',
+          assetIdList: Models.unBindKeys,
+        },
+      ])
+      .subscribe({
+        next: () => message.success('操作成功'),
+        error: () => message.error('操作失败'),
+        complete: () => {
+          Models.unBindKeys = [];
+          actionRef.current?.reload();
+        },
+      });
+  };
+
+  const singleUnBind = (key: string) => {
+    Models.unBindKeys = [key];
+    handleUnBind();
+  };
+
+  const columns: ProColumns<ProductItem>[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 220,
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.system.name',
+        defaultMessage: '名称',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.system.tenant.memberManagement.administrators',
+        defaultMessage: '管理员',
+      }),
+      dataIndex: 'adminMember',
+      renderText: (text) => (text ? '是' : '否'),
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.data.option',
+        defaultMessage: '操作',
+      }),
+      valueType: 'option',
+      align: 'center',
+      width: 200,
+      render: (text, record) => [
+        <Popconfirm
+          title={intl.formatMessage({
+            id: 'pages.system.role.option.unBindUser',
+            defaultMessage: '是否解除绑定',
+          })}
+          key="unBind"
+          onConfirm={() => {
+            singleUnBind(record.id);
+          }}
+        >
+          <a href="#">
+            <Tooltip
+              title={intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '解除绑定',
+              })}
+            >
+              <DisconnectOutlined />
+            </Tooltip>
+          </a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  const closeModal = () => {
+    Models.bind = false;
+    Models.bindKeys = [];
+  };
+
+  return (
+    <>
+      <Bind
+        visible={Models.bind}
+        onCancel={closeModal}
+        reload={() => actionRef.current?.reload()}
+      />
+      <SearchComponent<ProductItem>
+        field={columns}
+        onSearch={async (data) => {
+          setSearchParam({
+            terms: [
+              ...data,
+              {
+                column: 'id',
+                termType: 'dim-assets',
+                value: {
+                  assetType: 'product',
+                  targets: [
+                    {
+                      type: 'org',
+                      id: param.id,
+                    },
+                  ],
+                },
+              },
+            ],
+          });
+        }}
+        target="department-assets-product"
+      />
+      <ProTable<ProductItem>
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="id"
+        search={false}
+        params={searchParam}
+        request={(params) => service.queryProductList(params)}
+        rowSelection={{
+          selectedRowKeys: Models.unBindKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            Models.unBindKeys = selectedRows.map((item) => item.id);
+          },
+        }}
+        toolBarRender={() => [
+          <Button
+            onClick={() => {
+              Models.bind = true;
+            }}
+            icon={<PlusOutlined />}
+            type="primary"
+            key="bind"
+          >
+            {intl.formatMessage({
+              id: 'pages.data.option.assets',
+              defaultMessage: '资产分配',
+            })}
+          </Button>,
+          <Popconfirm
+            title={intl.formatMessage({
+              id: 'pages.system.role.option.unBindUser',
+              defaultMessage: '是否批量解除绑定',
+            })}
+            key="unBind"
+            onConfirm={handleUnBind}
+          >
+            <Button icon={<DisconnectOutlined />} key="bind">
+              {intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '批量解绑',
+              })}
+            </Button>
+          </Popconfirm>,
+        ]}
+      />
+    </>
+  );
+});

src/pages/system/Department/Assets/product/model.ts

@@ -0,0 +1,16 @@
+// 用户数据模型
+import { model } from '@formily/reactive';
+
+type ModelType = {
+  bind: boolean;
+  bindKeys: string[];
+  unBindKeys: string[];
+};
+
+const Models = model<ModelType>({
+  bind: false,
+  bindKeys: [],
+  unBindKeys: [],
+});
+
+export default Models;

src/pages/system/Department/Assets/productCategory/bind.tsx

@@ -0,0 +1,131 @@
+// 资产-产品分类-绑定
+import type { ProColumns, ActionType } from '@jetlinks/pro-table';
+import ProTable from '@jetlinks/pro-table';
+import { service, getTableKeys } from './index';
+import { Modal } from 'antd';
+import { useParams } from 'umi';
+import Models from './model';
+import { useRef, useState, useEffect } from 'react';
+import { observer } from '@formily/react';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import type { ProductCategoryItem } from '@/pages/system/Department/typings';
+import PermissionModal from '@/pages/system/Department/Assets/permissionModal';
+
+interface Props {
+  reload: () => void;
+  visible: boolean;
+  onCancel: () => void;
+}
+
+const Bind = observer((props: Props) => {
+  const intl = useIntl();
+  const param = useParams<{ id: string }>();
+  const actionRef = useRef<ActionType>();
+  const [perVisible, setPerVisible] = useState(false);
+
+  const columns: ProColumns<ProductCategoryItem>[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 220,
+    },
+    {
+      dataIndex: 'key',
+      title: intl.formatMessage({
+        id: 'pages.system.name',
+        defaultMessage: '标识',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.system.name',
+        defaultMessage: '分类名称',
+      }),
+      search: false,
+    },
+  ];
+
+  const handleBind = () => {
+    if (Models.bindKeys.length) {
+      setPerVisible(true);
+    } else {
+      props.onCancel();
+    }
+  };
+
+  useEffect(() => {
+    if (props.visible) {
+      actionRef.current?.reload();
+    }
+  }, [props.visible]);
+
+  return (
+    <Modal
+      visible={props.visible}
+      onOk={handleBind}
+      onCancel={props.onCancel}
+      width={990}
+      title="绑定"
+    >
+      <PermissionModal
+        visible={perVisible}
+        type="deviceCategory"
+        bindKeys={Models.bindKeys}
+        onCancel={(type) => {
+          setPerVisible(false);
+          if (type) {
+            props.reload();
+            props.onCancel();
+          }
+        }}
+      />
+      <ProTable<ProductCategoryItem>
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="id"
+        pagination={false}
+        rowSelection={{
+          selectedRowKeys: Models.bindKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            Models.bindKeys = getTableKeys(selectedRows);
+          },
+        }}
+        params={{
+          terms: [
+            {
+              column: 'id',
+              termType: 'dim-assets$not',
+              value: {
+                assetType: 'deviceCategory',
+                targets: [
+                  {
+                    type: 'org',
+                    id: param.id,
+                  },
+                ],
+              },
+            },
+          ],
+        }}
+        request={async (params) => {
+          const response = await service.queryProductCategoryList(params);
+          return {
+            code: response.message,
+            result: {
+              data: response.result,
+              pageIndex: 0,
+              pageSize: 0,
+              total: 0,
+            },
+            status: response.status,
+          };
+        }}
+      />
+    </Modal>
+  );
+});
+export default Bind;

src/pages/system/Department/Assets/productCategory/index.tsx

@@ -0,0 +1,244 @@
+// 资产分配-产品分类
+import ProTable from '@jetlinks/pro-table';
+import type { ActionType, ProColumns } from '@jetlinks/pro-table';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import { Button, Popconfirm, Tooltip, message } from 'antd';
+import { useRef, useState } from 'react';
+import { useParams } from 'umi';
+import { observer } from '@formily/react';
+import type { ProductCategoryItem } from '@/pages/system/Department/typings';
+import { DisconnectOutlined, PlusOutlined } from '@ant-design/icons';
+import Models from '@/pages/system/Department/Assets/productCategory/model';
+import Service from '@/pages/system/Department/Assets/service';
+import Bind from './bind';
+import SearchComponent from '@/components/SearchComponent';
+
+export const service = new Service<ProductCategoryItem>('assets');
+
+export const getTableKeys = (rows: ProductCategoryItem[]): string[] => {
+  let keys: string[] = [];
+  rows.forEach((item) => {
+    keys.push(item.id);
+    if (item.children && item.children.length) {
+      const childrenKeys = getTableKeys(item.children);
+      keys = [...keys, ...childrenKeys];
+    }
+  });
+  return keys;
+};
+
+export default observer(() => {
+  const intl = useIntl();
+  const actionRef = useRef<ActionType>();
+  const param = useParams<{ id: string }>();
+  const [searchParam, setSearchParam] = useState({
+    terms: [
+      {
+        column: 'id',
+        termType: 'dim-assets',
+        value: {
+          assetType: 'deviceCategory',
+          targets: [
+            {
+              type: 'org',
+              id: param.id,
+            },
+          ],
+        },
+      },
+    ],
+  });
+
+  /**
+   * 解除资产绑定
+   */
+  const handleUnBind = () => {
+    service
+      .unBind('deviceCategory', [
+        {
+          targetType: 'org',
+          targetId: param.id,
+          assetType: 'deviceCategory',
+          assetIdList: Models.unBindKeys,
+        },
+      ])
+      .subscribe({
+        next: () => message.success('操作成功'),
+        error: () => message.error('操作失败'),
+        complete: () => {
+          Models.unBindKeys = [];
+          actionRef.current?.reload();
+        },
+      });
+  };
+
+  const singleUnBind = (key: string) => {
+    Models.unBindKeys = [key];
+    handleUnBind();
+  };
+
+  const columns: ProColumns<ProductCategoryItem>[] = [
+    {
+      dataIndex: 'id',
+      title: 'ID',
+      width: 220,
+    },
+    {
+      dataIndex: 'key',
+      title: intl.formatMessage({
+        id: 'pages.device.category.key',
+        defaultMessage: '标识',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.device.category.name',
+        defaultMessage: '分类名称',
+      }),
+      search: false,
+    },
+    {
+      dataIndex: 'description',
+      title: intl.formatMessage({
+        id: 'pages.system.description',
+        defaultMessage: '说明',
+      }),
+      search: false,
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.data.option',
+        defaultMessage: '操作',
+      }),
+      valueType: 'option',
+      align: 'center',
+      width: 200,
+      render: (text, record) => [
+        <Popconfirm
+          title={intl.formatMessage({
+            id: 'pages.system.role.option.unBindUser',
+            defaultMessage: '是否解除绑定',
+          })}
+          key="unBind"
+          onConfirm={() => {
+            singleUnBind(record.id);
+          }}
+        >
+          <a href="#">
+            <Tooltip
+              title={intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '解除绑定',
+              })}
+            >
+              <DisconnectOutlined />
+            </Tooltip>
+          </a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  const closeModal = () => {
+    Models.bind = false;
+    Models.bindKeys = [];
+  };
+
+  return (
+    <>
+      <Bind
+        visible={Models.bind}
+        onCancel={closeModal}
+        reload={() => actionRef.current?.reload()}
+      />
+      <SearchComponent<ProductCategoryItem>
+        field={columns}
+        onSearch={async (data) => {
+          setSearchParam({
+            terms: [
+              ...data,
+              {
+                column: 'id',
+                termType: 'dim-assets',
+                value: {
+                  assetType: 'deviceCategory',
+                  targets: [
+                    {
+                      type: 'org',
+                      id: param.id,
+                    },
+                  ],
+                },
+              },
+            ],
+          });
+        }}
+        target="department-assets-category"
+      />
+      <ProTable<ProductCategoryItem>
+        actionRef={actionRef}
+        columns={columns}
+        params={searchParam}
+        search={false}
+        rowKey="id"
+        request={async (params) => {
+          const response = await service.queryProductCategoryList(params);
+          return {
+            code: response.message,
+            result: {
+              data: response.result,
+              pageIndex: 0,
+              pageSize: 0,
+              total: 0,
+            },
+            status: response.status,
+          };
+        }}
+        postData={(data) => {
+          console.log(data);
+          return data;
+        }}
+        rowSelection={{
+          selectedRowKeys: Models.unBindKeys,
+          onChange: (selectedRowKeys, selectedRows) => {
+            Models.unBindKeys = selectedRows.map((item) => item.id);
+          },
+        }}
+        toolBarRender={() => [
+          <Button
+            onClick={() => {
+              Models.bind = true;
+            }}
+            icon={<PlusOutlined />}
+            type="primary"
+            key="bind"
+          >
+            {intl.formatMessage({
+              id: 'pages.data.option.assets',
+              defaultMessage: '资产分配',
+            })}
+          </Button>,
+          <Popconfirm
+            title={intl.formatMessage({
+              id: 'pages.system.role.option.unBindUser',
+              defaultMessage: '是否批量解除绑定',
+            })}
+            key="unBind"
+            onConfirm={handleUnBind}
+          >
+            <Button icon={<DisconnectOutlined />} key="bind">
+              {intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '批量解绑',
+              })}
+            </Button>
+          </Popconfirm>,
+        ]}
+      />
+    </>
+  );
+});

src/pages/system/Department/Assets/productCategory/model.ts

@@ -0,0 +1,16 @@
+// 用户数据模型
+import { model } from '@formily/reactive';
+
+type ProductCategoryModelType = {
+  bind: boolean;
+  bindKeys: string[];
+  unBindKeys: string[];
+};
+
+const ProductCategoryModel = model<ProductCategoryModelType>({
+  bind: false,
+  bindKeys: [],
+  unBindKeys: [],
+});
+
+export default ProductCategoryModel;

src/pages/system/Department/Assets/service.ts

@@ -0,0 +1,48 @@
+import BaseService from '@/utils/BaseService';
+import { request } from '@@/plugin-request/request';
+import SystemConst from '@/utils/const';
+import { defer, from } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+
+class Service<T> extends BaseService<T> {
+  // 资产绑定
+  bind = (type: string, params: any) =>
+    defer(() => from(request(`${this.uri}/bind/${type}`, { method: 'POST', data: params }))).pipe(
+      filter((item) => item.status === 200),
+      map((item) => item.result),
+    );
+
+  // 资产解绑
+  unBind = (type: string, params: any) =>
+    defer(() => from(request(`${this.uri}/unbind/${type}`, { method: 'POST', data: params }))).pipe(
+      filter((item) => item.status === 200),
+      map((item) => item.result),
+    );
+
+  // 资产-产品分类
+  queryProductCategoryList = (params: any) => {
+    return request(`${SystemConst.API_BASE}/device/category/_tree`, {
+      method: 'POST',
+      data: {
+        ...params,
+        paging: false,
+      },
+    });
+  };
+  // 资产-设备
+  queryDeviceList = (params: any) => {
+    return request<T>(`${SystemConst.API_BASE}/device/instance/_query`, {
+      method: 'POST',
+      data: params,
+    });
+  };
+  // 资产-产品
+  queryProductList = (params: any) => {
+    return request<T>(`${SystemConst.API_BASE}/device-product/_query`, {
+      method: 'POST',
+      data: params,
+    });
+  };
+}
+
+export default Service;

src/pages/system/Department/Member/bind.tsx

@@ -0,0 +1,98 @@
+// 部门-用户绑定
+import type { ProColumns, ActionType } from '@jetlinks/pro-table';
+import ProTable from '@jetlinks/pro-table';
+import { service } from '@/pages/system/Department/Member';
+import { message, Modal } from 'antd';
+import { useParams } from 'umi';
+import MemberModel from '@/pages/system/Department/Member/model';
+import { observer } from '@formily/react';
+import { useEffect, useRef } from 'react';
+import { useIntl } from '@@/plugin-locale/localeExports';
+
+interface Props {
+  reload: () => void;
+  visible: boolean;
+  onCancel: () => void;
+}
+
+const Bind = observer((props: Props) => {
+  const intl = useIntl();
+  const param = useParams<{ id: string }>();
+  const actionRef = useRef<ActionType>();
+
+  useEffect(() => {
+    if (props.visible) {
+      actionRef.current?.reload();
+    }
+  }, [props.visible]);
+
+  const columns: ProColumns<UserItem>[] = [
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.system.name',
+        defaultMessage: '姓名',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      dataIndex: 'username',
+      title: intl.formatMessage({
+        id: 'pages.system.username',
+        defaultMessage: '用户名',
+      }),
+      search: {
+        transform: (value) => ({ username$LIKE: value }),
+      },
+    },
+  ];
+
+  const handleBind = () => {
+    if (MemberModel.bindUsers.length) {
+      service.handleUser(param.id, MemberModel.bindUsers, 'bind').subscribe({
+        next: () => message.success('操作成功'),
+        error: () => message.error('操作失败'),
+        complete: () => {
+          MemberModel.bindUsers = [];
+          actionRef.current?.reload();
+          props.reload();
+          props.onCancel();
+        },
+      });
+    } else {
+      props.onCancel();
+    }
+  };
+
+  return (
+    <Modal
+      visible={props.visible}
+      onOk={handleBind}
+      onCancel={props.onCancel}
+      width={990}
+      title="绑定"
+    >
+      <ProTable
+        actionRef={actionRef}
+        columns={columns}
+        rowKey="id"
+        pagination={{
+          pageSize: 5,
+        }}
+        rowSelection={{
+          selectedRowKeys: MemberModel.bindUsers,
+          onChange: (selectedRowKeys, selectedRows) => {
+            MemberModel.bindUsers = selectedRows.map((item) => item.id);
+          },
+        }}
+        request={(params) => service.queryUser(params)}
+        defaultParams={{
+          'id$in-dimension$org$not': param.id,
+        }}
+      />
+    </Modal>
+  );
+});
+export default Bind;

src/pages/system/Department/Member/index.tsx

@@ -0,0 +1,214 @@
+// 部门-用户管理
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@jetlinks/pro-table';
+import type { ActionType, ProColumns } from '@jetlinks/pro-table';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import { Badge, Button, Card, Divider, message, Popconfirm, Tooltip } from 'antd';
+import { useRef, useState } from 'react';
+import { useParams } from 'umi';
+import { observer } from '@formily/react';
+import MemberModel from '@/pages/system/Department/Member/model';
+import type { MemberItem } from '@/pages/system/Department/typings';
+import Service from '@/pages/system/Department/Member/service';
+import { PlusOutlined, DisconnectOutlined } from '@ant-design/icons';
+import Bind from './bind';
+import SearchComponent from '@/components/SearchComponent';
+
+export const service = new Service('tenant');
+
+const Member = observer(() => {
+  const intl = useIntl();
+  const actionRef = useRef<ActionType>();
+
+  const param = useParams<{ id: string }>();
+  const [searchParam, setSearchParam] = useState({
+    terms: [{ column: 'id$in-dimension$org', value: param.id }],
+  });
+
+  const handleUnBind = () => {
+    service.handleUser(param.id, MemberModel.unBindUsers, 'unbind').subscribe({
+      next: () => message.success('操作成功'),
+      error: () => message.error('操作失败'),
+      complete: () => {
+        MemberModel.unBindUsers = [];
+        actionRef.current?.reload();
+      },
+    });
+  };
+
+  const singleUnBind = (key: string) => {
+    MemberModel.unBindUsers = [key];
+    handleUnBind();
+  };
+
+  const columns: ProColumns<MemberItem>[] = [
+    {
+      dataIndex: 'index',
+      valueType: 'indexBorder',
+      width: 48,
+    },
+    {
+      dataIndex: 'name',
+      title: intl.formatMessage({
+        id: 'pages.system.name',
+        defaultMessage: '姓名',
+      }),
+      search: {
+        transform: (value) => ({ name$LIKE: value }),
+      },
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.searchTable.titleStatus',
+        defaultMessage: '状态',
+      }),
+      dataIndex: 'status',
+      filters: true,
+      onFilter: true,
+      valueType: 'select',
+      valueEnum: {
+        all: {
+          text: intl.formatMessage({
+            id: 'pages.searchTable.titleStatus.all',
+            defaultMessage: '全部',
+          }),
+          status: 'Default',
+        },
+        1: {
+          text: intl.formatMessage({
+            id: 'pages.searchTable.titleStatus.normal',
+            defaultMessage: '正常',
+          }),
+          status: 1,
+        },
+        0: {
+          text: intl.formatMessage({
+            id: 'pages.searchTable.titleStatus.disable',
+            defaultMessage: '禁用',
+          }),
+          status: 0,
+        },
+      },
+      render: (value) => (
+        <Badge
+          status={value === 1 ? 'success' : 'error'}
+          text={
+            value === 1
+              ? intl.formatMessage({
+                  id: 'pages.searchTable.titleStatus.normal',
+                  defaultMessage: '正常',
+                })
+              : intl.formatMessage({
+                  id: 'pages.searchTable.titleStatus.disable',
+                  defaultMessage: '禁用',
+                })
+          }
+        />
+      ),
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.data.option',
+        defaultMessage: '操作',
+      }),
+      valueType: 'option',
+      align: 'center',
+      width: 200,
+      render: (text, record) => [
+        <Popconfirm
+          title={intl.formatMessage({
+            id: 'pages.system.role.option.unBindUser',
+            defaultMessage: '是否解除绑定',
+          })}
+          key="unBindUser"
+          onConfirm={() => {
+            singleUnBind(record.id);
+          }}
+        >
+          <a href="#">
+            <Tooltip
+              title={intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '解除绑定',
+              })}
+            >
+              <DisconnectOutlined />
+            </Tooltip>
+          </a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  const closeModal = () => {
+    MemberModel.bind = false;
+  };
+
+  return (
+    <PageContainer>
+      <Bind
+        visible={MemberModel.bind}
+        onCancel={closeModal}
+        reload={() => actionRef.current?.reload()}
+      />
+      <Card>
+        <SearchComponent<MemberItem>
+          field={columns}
+          onSearch={async (data) => {
+            setSearchParam({
+              terms: [...data, { column: 'id$in-dimension$org', value: param.id }],
+            });
+          }}
+          target="department-user"
+        />
+      </Card>
+      <Divider />
+      <ProTable<MemberItem>
+        actionRef={actionRef}
+        columns={columns}
+        search={false}
+        rowKey="id"
+        request={(params) => service.queryUser(params)}
+        rowSelection={{
+          selectedRowKeys: MemberModel.unBindUsers,
+          onChange: (selectedRowKeys, selectedRows) => {
+            MemberModel.unBindUsers = selectedRows.map((item) => item.id);
+          },
+        }}
+        params={searchParam}
+        toolBarRender={() => [
+          <Button
+            onClick={() => {
+              MemberModel.bind = true;
+            }}
+            icon={<PlusOutlined />}
+            type="primary"
+            key="bind"
+          >
+            {intl.formatMessage({
+              id: 'pages.system.role.option.bindUser',
+              defaultMessage: '绑定用户',
+            })}
+          </Button>,
+          <Popconfirm
+            title={intl.formatMessage({
+              id: 'pages.system.role.option.unBindUser',
+              defaultMessage: '是否批量解除绑定',
+            })}
+            key="unBind"
+            onConfirm={handleUnBind}
+          >
+            <Button icon={<DisconnectOutlined />} key="bind">
+              {intl.formatMessage({
+                id: 'pages.system.role.option.unBindUser',
+                defaultMessage: '批量解绑',
+              })}
+            </Button>
+          </Popconfirm>,
+        ]}
+      />
+    </PageContainer>
+  );
+});
+
+export default Member;

src/pages/system/Department/Member/model.ts

@@ -0,0 +1,16 @@
+// 用户数据模型
+import { model } from '@formily/reactive';
+
+type MemberModelType = {
+  bind: boolean;
+  bindUsers: string[];
+  unBindUsers: string[];
+};
+
+const MemberModel = model<MemberModelType>({
+  bind: false,
+  bindUsers: [],
+  unBindUsers: [],
+});
+
+export default MemberModel;

src/pages/system/Department/Member/service.ts

@@ -0,0 +1,29 @@
+import BaseService from '@/utils/BaseService';
+import type { MemberItem } from '@/pages/system/Department/typings';
+import { defer, from } from 'rxjs';
+import { request } from '@@/plugin-request/request';
+import SystemConst from '@/utils/const';
+import { filter, map } from 'rxjs/operators';
+
+class Service extends BaseService<MemberItem> {
+  queryUser = (params: Record<string, unknown>) =>
+    request(`/${SystemConst.API_BASE}/user/_query`, {
+      method: 'POST',
+      data: params,
+    });
+
+  handleUser = (id: string, data: Record<string, unknown>[] | string[], type: 'bind' | 'unbind') =>
+    defer(() =>
+      from(
+        request(`/${SystemConst.API_BASE}/organization/${id}/users/_${type}`, {
+          method: 'POST',
+          data,
+        }),
+      ),
+    ).pipe(
+      filter((item) => item.status === 200),
+      map((item) => item.result),
+    );
+}
+
+export default Service;

src/pages/system/Department/index.tsx

@@ -0,0 +1,250 @@
+// 部门管理
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@jetlinks/pro-table';
+import type { ActionType, ProColumns } from '@jetlinks/pro-table';
+import { useRef, useState } from 'react';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import { Button, message, Popconfirm, Tooltip, Card, Divider } from 'antd';
+import {
+  EditOutlined,
+  PlusOutlined,
+  PlusCircleOutlined,
+  TeamOutlined,
+  MedicineBoxOutlined,
+  DeleteOutlined,
+} from '@ant-design/icons';
+import Service from '@/pages/system/Department/service';
+import type { ISchema } from '@formily/json-schema';
+import type { DepartmentItem } from '@/pages/system/Department/typings';
+import { observer } from '@formily/react';
+import { model } from '@formily/reactive';
+import { Link } from 'umi';
+import Save from './save';
+import SearchComponent from '@/components/SearchComponent';
+
+export const service = new Service('organization');
+
+type ModelType = {
+  visible: boolean;
+  current: Partial<DepartmentItem>;
+  parentId: string | undefined;
+};
+export const State = model<ModelType>({
+  visible: false,
+  current: {},
+  parentId: undefined,
+});
+
+export default observer(() => {
+  const actionRef = useRef<ActionType>();
+  const intl = useIntl();
+  const [param, setParam] = useState({
+    terms: [{ column: 'typeId', value: 'org' }],
+  });
+
+  /**
+   * 根据部门ID删除数据
+   * @param id
+   */
+  const deleteItem = async (id: string) => {
+    const response: any = await service.remove(id);
+    if (response.status === 200) {
+      message.success(
+        intl.formatMessage({
+          id: 'pages.data.option.success',
+          defaultMessage: '操作成功!',
+        }),
+      );
+    }
+    actionRef.current?.reload();
+  };
+
+  const columns: ProColumns<DepartmentItem>[] = [
+    {
+      title: intl.formatMessage({
+        id: 'pages.table.name',
+        defaultMessage: '名称',
+      }),
+      dataIndex: 'name',
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.device.instanceDetail.detail.sort',
+        defaultMessage: '排序',
+      }),
+      search: false,
+      dataIndex: 'sortIndex',
+    },
+    {
+      title: intl.formatMessage({
+        id: 'pages.data.option',
+        defaultMessage: '操作',
+      }),
+      valueType: 'option',
+      align: 'center',
+      width: 240,
+      render: (text, record) => [
+        <a
+          key="editable"
+          onClick={() => {
+            State.current = record;
+            State.visible = true;
+          }}
+        >
+          <Tooltip
+            title={intl.formatMessage({
+              id: 'pages.data.option.edit',
+              defaultMessage: '编辑',
+            })}
+          >
+            <EditOutlined />
+          </Tooltip>
+        </a>,
+        <a
+          key="editable"
+          onClick={() => {
+            State.current = {
+              parentId: record.id,
+            };
+            State.visible = true;
+          }}
+        >
+          <Tooltip
+            title={intl.formatMessage({
+              id: 'pages.system.department.option.add',
+              defaultMessage: '新增子部门',
+            })}
+          >
+            <PlusCircleOutlined />
+          </Tooltip>
+        </a>,
+        <Link key="assets" to={`/system/department/${record.id}/assets`}>
+          <Tooltip
+            title={intl.formatMessage({
+              id: 'pages.data.option.assets',
+              defaultMessage: '资产分配',
+            })}
+          >
+            <MedicineBoxOutlined />
+          </Tooltip>
+        </Link>,
+        <Link key="user" to={`/system/department/${record.id}/user`}>
+          <Tooltip
+            title={intl.formatMessage({
+              id: 'pages.system.department.user',
+              defaultMessage: '用户',
+            })}
+          >
+            <TeamOutlined />
+          </Tooltip>
+        </Link>,
+        <Popconfirm
+          key="unBindUser"
+          title={intl.formatMessage({
+            id: 'pages.system.role.option.unBindUser',
+            defaultMessage: '是否批量解除绑定',
+          })}
+          onConfirm={() => {
+            deleteItem(record.id);
+          }}
+        >
+          <Tooltip
+            title={intl.formatMessage({
+              id: 'pages.data.option.delete',
+              defaultMessage: '删除',
+            })}
+          >
+            <a key="delete">
+              <DeleteOutlined />
+            </a>
+          </Tooltip>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  const schema: ISchema = {
+    type: 'object',
+    properties: {
+      name: {
+        type: 'string',
+        title: '名称',
+        required: true,
+        'x-decorator': 'FormItem',
+        'x-component': 'Input',
+      },
+      sortIndex: {
+        type: 'string',
+        title: '排序',
+        'x-decorator': 'FormItem',
+        'x-component': 'Input',
+      },
+    },
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <SearchComponent<DepartmentItem>
+          field={columns}
+          onSearch={async (data) => {
+            setParam({ terms: [...data, { column: 'typeId', value: 'org' }] });
+          }}
+          target="department"
+        />
+      </Card>
+      <Divider />
+      <ProTable<DepartmentItem>
+        columns={columns}
+        actionRef={actionRef}
+        request={async (params) => {
+          const response = await service.queryOrgThree({ paging: false, ...params });
+          return {
+            code: response.message,
+            result: {
+              data: response.result,
+              pageIndex: 0,
+              pageSize: 0,
+              total: 0,
+            },
+            status: response.status,
+          };
+        }}
+        rowKey="id"
+        pagination={false}
+        search={false}
+        params={param}
+        toolBarRender={() => [
+          <Button
+            onClick={() => (State.visible = true)}
+            key="button"
+            icon={<PlusOutlined />}
+            type="primary"
+          >
+            {intl.formatMessage({
+              id: 'pages.data.option.add',
+              defaultMessage: '新增',
+            })}
+          </Button>,
+        ]}
+        headerTitle={intl.formatMessage({
+          id: 'pages.system.department',
+          defaultMessage: '部门列表',
+        })}
+      />
+      <Save<DepartmentItem>
+        service={service}
+        onCancel={(type) => {
+          if (type) {
+            actionRef.current?.reload();
+          }
+          State.current = {};
+          State.visible = false;
+        }}
+        data={State.current}
+        visible={State.visible}
+        schema={schema}
+      />
+    </PageContainer>
+  );
+});

src/pages/system/Department/save.tsx

@@ -0,0 +1,117 @@
+// Modal 弹窗，用于新增、修改数据
+import React from 'react';
+import { createForm } from '@formily/core';
+import { createSchemaField } from '@formily/react';
+import {
+  ArrayTable,
+  Editable,
+  Form,
+  FormGrid,
+  FormItem,
+  FormTab,
+  Input,
+  NumberPicker,
+  Password,
+  Select,
+  Switch,
+  Upload,
+  Checkbox,
+} from '@formily/antd';
+import { message, Modal } from 'antd';
+import { useIntl } from '@@/plugin-locale/localeExports';
+import type { ISchema } from '@formily/json-schema';
+import type { ModalProps } from 'antd/lib/modal/Modal';
+import FUpload from '@/components/Upload';
+import * as ICONS from '@ant-design/icons';
+import type BaseService from '@/utils/BaseService';
+
+export interface SaveModalProps<T> extends Omit<ModalProps, 'onOk' | 'onCancel'> {
+  service: BaseService<T>;
+  data?: Partial<T>;
+  /**
+   * Model关闭事件
+   * @param type 是否为请求接口后关闭，用于外部table刷新数据
+   */
+  onCancel?: (type: boolean) => void;
+  schema: ISchema;
+}
+
+const Save = <T extends object>(props: SaveModalProps<T>) => {
+  const { data, schema, onCancel, service } = props;
+  const intl = useIntl();
+
+  const SchemaField = createSchemaField({
+    components: {
+      FormItem,
+      FormTab,
+      Input,
+      Password,
+      Upload,
+      Select,
+      ArrayTable,
+      Switch,
+      FormGrid,
+      Editable,
+      NumberPicker,
+      FUpload,
+      Checkbox,
+    },
+    scope: {
+      icon(name: any) {
+        return React.createElement(ICONS[name]);
+      },
+    },
+  });
+
+  const form = createForm({
+    validateFirst: true,
+    initialValues: data || {},
+  });
+
+  /**
+   * 关闭Modal
+   * @param type 是否需要刷新外部table数据
+   */
+  const modalClose = (type: boolean) => {
+    if (typeof onCancel === 'function') {
+      onCancel(type);
+    }
+  };
+
+  /**
+   * 新增、修改数据
+   */
+  const saveData = async () => {
+    const formData: T = await form.submit();
+
+    const response =
+      data && 'id' in data ? await service.update(formData) : await service.save(formData);
+
+    if (response.status === 200) {
+      message.success('操作成功！');
+      modalClose(true);
+    } else {
+      message.error('操作成功！');
+    }
+  };
+
+  return (
+    <Modal
+      title={intl.formatMessage({
+        id: `pages.data.option.${data && 'id' in data ? 'edit' : 'add'}`,
+        defaultMessage: '新增',
+      })}
+      visible={props.visible}
+      onOk={saveData}
+      onCancel={() => {
+        modalClose(false);
+      }}
+    >
+      <Form form={form} labelCol={5} wrapperCol={16}>
+        <SchemaField schema={schema} />
+      </Form>
+    </Modal>
+  );
+};
+
+export default Save;

src/pages/system/Department/service.ts

@@ -0,0 +1,11 @@
+import BaseService from '@/utils/BaseService';
+import type { DepartmentItem } from '@/pages/system/Department/typings';
+import { request } from '@@/plugin-request/request';
+
+class Service extends BaseService<DepartmentItem> {
+  // 根据ID查询部门
+  queryOrgThree = (params: any) =>
+    request(`${this.uri}/_all/tree`, { method: 'POST', data: params });
+}
+
+export default Service;

src/pages/system/Department/typings.d.ts

@@ -0,0 +1,42 @@
+import type { State } from '@/utils/typings';
+
+// 部门
+export type DepartmentItem = {
+  id: string;
+  name: string;
+  path: string;
+  sortIndex: number;
+  level: number;
+  code: string;
+  parentId: string;
+  children: DepartmentItem[];
+};
+
+// 用户
+export type MemberItem = {
+  id: string;
+  name: string;
+  username: string;
+  status: number;
+  createTime: number;
+  creatorId: string;
+};
+
+// 产品
+export type ProductItem = {
+  id: string;
+  name: string;
+  description: string;
+};
+
+// 产品分类
+export type ProductCategoryItem = { key: string; children: ProductCategoryItem[] } & ProductItem;
+
+// 设备
+export type DeviceItem = {
+  id: string;
+  name: string;
+  productName: string;
+  createTime: string;
+  state: State;
+};

src/utils/menu.ts

@@ -0,0 +1,27 @@
+// 路由components映射
+// const findComponents = (files: __WebpackModuleApi.RequireContext) => {
+//   const modules = {};
+//   files.keys().forEach((key) => {
+//     // 删除路径开头的./ 以及结尾的 /index；
+//     const str = key.replace(/(\.\/|\.tsx)/g, '').replace('/index', '');
+//     modules[str] = files(key).default;
+//   });
+//   return modules;
+// };
+//
+// /**
+//  * 处理为正确的路由格式
+//  * @param extraRoutes 后端菜单数据
+//  */
+// const getRoutes = (extraRoutes: any[]) => {
+//   const allComponents = findComponents(require.context('@/pages', true, /index(\.tsx)$/));
+//   return extraRoutes.map((route) => {
+//     const component = allComponents[route.key];
+//     return {
+//       ...route,
+//       component,
+//     };
+//   });
+// };
+//
+// export default getRoutes;