src/pages/asset/asset_projects/modals/GridCreate.tsx

@@ -29,7 +29,7 @@ export default function Create(props: MyBetaModalFormProps) {
         values?.grid_ranges?.map((res: { asset_projects_id: string }) => {
           res.asset_projects_id = props?.item?.id;
         });
-        return Apis.Grid.Grids.Store({
+        Apis.Grid.Grids.Store({
           ...values,
           asset_projects_id: props?.item?.id,
         })

src/pages/company/companies/$id.tsx

@@ -6,8 +6,6 @@ import { Tabs } from 'antd';
 import { useEffect, useState } from 'react';
 import ComponentsInfo from './components/ComponentsInfo';
 import Organizations from './components/Organizations';
-import Positions from './components/Positions';
-import Projects from './components/Projects';
 export default function Show({ title = '机构详情' }) {
   const { id } = useParams<{ id: string }>();
   const [data, setShow] = useState<any>({});
@@ -30,29 +28,11 @@ export default function Show({ title = '机构详情' }) {
       children: <ComponentsInfo item={data} reload={() => loadShow()} />,
     },
     {
-      label: '项目管理',
+      label: '组织',
       key: '2',
       closable: false,
-      children: <Projects item={data} />,
-    },
-    {
-      label: '组织管理',
-      key: '3',
-      closable: false,
       children: <Organizations item={data} />,
     },
-    {
-      label: '员工管理',
-      key: '4',
-      closable: false,
-      // children: <Employees item={data} />,
-    },
-    {
-      label: '岗位管理',
-      key: '5',
-      closable: false,
-      children: <Positions item={data} />,
-    },
   ];
   return (
     <MyPageContainer title={title}>

src/pages/company/companies/components/Positions.tsx

@@ -1,76 +0,0 @@
-import {
-  MyBetaModalFormProps,
-  MyButtons,
-  MyColumns,
-  MyProTableProps,
-} from '@/common';
-import { Apis } from '@/gen/Apis';
-import { ProTable } from '@ant-design/pro-components';
-import { Space } from 'antd';
-import OrganizationsCreate from '../modals/OrganizationsCreate';
-
-export default function Organizations(props: MyBetaModalFormProps) {
-  return (
-    <>
-      <ProTable
-        {...MyProTableProps.props}
-        search={false}
-        request={async (params, sort) =>
-          MyProTableProps.request(
-            { ...params, companies_id: props?.item?.id },
-            sort,
-            Apis.Company.CompanyPositions.List,
-          )
-        }
-        toolBarRender={(action) => [
-          <OrganizationsCreate
-            key="Create"
-            reload={action?.reload}
-            item={props?.item}
-            title="组织"
-          />,
-        ]}
-        options={false}
-        columns={[
-          MyColumns.ID(),
-
-          {
-            title: '岗位名称',
-            dataIndex: 'name',
-          },
-          {
-            title: '岗位编号',
-            dataIndex: 'code',
-            search: false,
-          },
-          {
-            title: '岗位排序',
-            dataIndex: 'sort',
-            search: false,
-          },
-          {
-            title: '备注',
-            dataIndex: 'remark',
-            search: false,
-          },
-          MyColumns.UpdatedAt(),
-          MyColumns.CreatedAt(),
-          MyColumns.Option({
-            render: (_, item: any, index, action) => (
-              <Space key={index}>
-                {/* <Update item={item} reload={action?.reload} title={title} /> */}
-                <MyButtons.Delete
-                  onConfirm={() =>
-                    Apis.Common.Admins.Delete({ id: item.id }).then(() =>
-                      action?.reload(),
-                    )
-                  }
-                />
-              </Space>
-            ),
-          }),
-        ]}
-      />
-    </>
-  );
-}

src/pages/company/companies/components/Projects.tsx

@@ -1,82 +0,0 @@
-import {
-  MyBetaModalFormProps,
-  MyButtons,
-  MyColumns,
-  MyProTableProps,
-} from '@/common';
-import { Apis } from '@/gen/Apis';
-import { OrganizationsTypeEnum } from '@/gen/Enums';
-import { ProTable } from '@ant-design/pro-components';
-import { Space } from 'antd';
-import OrganizationsCreate from '../modals/OrganizationsCreate';
-import OrganizationsUpdate from '../modals/OrganizationsUpdate';
-
-export default function Organizations(props: MyBetaModalFormProps) {
-  return (
-    <>
-      <ProTable
-        {...MyProTableProps.props}
-        search={false}
-        request={async (params, sort) =>
-          MyProTableProps.request(
-            { ...params, companies_id: props?.item?.id },
-            sort,
-            Apis.Company.Organizations.List,
-          )
-        }
-        toolBarRender={(action) => [
-          <OrganizationsCreate
-            key="Create"
-            reload={action?.reload}
-            item={props?.item}
-            title="组织"
-          />,
-        ]}
-        options={false}
-        columns={[
-          MyColumns.ID(),
-          {
-            title: '上级组织',
-            dataIndex: ['organization_parent', 'name'],
-          },
-          {
-            title: '组织',
-            dataIndex: 'name',
-          },
-          MyColumns.EnumTag({
-            title: '类型',
-            dataIndex: 'type',
-            valueEnum: OrganizationsTypeEnum,
-          }),
-          {
-            title: '负责人',
-            dataIndex: ['manager', 'name'],
-          },
-          {
-            title: '联系电话',
-            dataIndex: 'manager_phone',
-          },
-
-          MyColumns.Option({
-            render: (_, item: any, index, action) => (
-              <Space key={index}>
-                <OrganizationsUpdate
-                  item={{ ...item, companies_id: props?.item?.id }}
-                  reload={action?.reload}
-                  title="组织"
-                />
-                <MyButtons.Delete
-                  onConfirm={() =>
-                    Apis.Company.Organizations.Delete({ id: item.id }).then(
-                      () => action?.reload(),
-                    )
-                  }
-                />
-              </Space>
-            ),
-          }),
-        ]}
-      />
-    </>
-  );
-}

src/pages/company/companies/modals/PositionsCreate.tsx

@@ -1,62 +0,0 @@
-import {
-  MyBetaModalFormProps,
-  MyButtons,
-  MyModalFormProps,
-  rulesHelper,
-} from '@/common';
-import { Selects } from '@/components/Select';
-import { Apis } from '@/gen/Apis';
-import { BetaSchemaForm } from '@ant-design/pro-components';
-import { message } from 'antd';
-
-export default function Create(props: MyBetaModalFormProps) {
-  return (
-    <BetaSchemaForm<ApiTypes.Company.CompanyPositions.Store>
-      {...MyModalFormProps.props}
-      title={`添加${props.title}`}
-      wrapperCol={{ span: 24 }}
-      width="500px"
-      trigger={<MyButtons.Create title={`添加${props.title}`} />}
-      onFinish={async (values) =>
-        Apis.Company.CompanyPositions.Store(values)
-          .then(() => {
-            props.reload?.();
-            message.success(props.title + '成功');
-            return true;
-          })
-          .catch(() => false)
-      }
-      columns={[
-        Selects?.Companies({
-          title: '机构',
-          key: 'companies_id',
-          formItemProps: { ...rulesHelper.text },
-        }),
-        {
-          key: 'name',
-          title: '岗位名称',
-          colProps: { span: 12 },
-          formItemProps: { ...rulesHelper.text },
-        },
-        {
-          key: 'code',
-          title: '岗位编号',
-          colProps: { span: 12 },
-          // formItemProps: { ...rulesHelper.text },
-        },
-        // {
-        //   key: 'sort',
-        //   title: '岗位排序',
-        //   colProps: { span: 24 },
-        //   valueType: 'number',
-        // },
-        {
-          key: 'remark',
-          title: '备注',
-          colProps: { span: 24 },
-          valueType: 'textarea',
-        },
-      ]}
-    />
-  );
-}

src/pages/company/employees/index.tsx

@@ -10,12 +10,11 @@ import { Space } from 'antd';
 import Create from './modals/Create';
 import Update from './modals/Update';
 
-export default function Index({ title = '员工管理' }) {
+export default function Index({ title = '管理员' }) {
   return (
     <MyPageContainer title={title}>
       <ProTable
         {...MyProTableProps.props}
-        // search={false}
         request={async (params, sort) =>
           MyProTableProps.request(
             params,

src/pages/company/employees/modals/Create.tsx

@@ -15,10 +15,10 @@ export default function Create(props: MyBetaModalFormProps) {
   return (
     <BetaSchemaForm<ApiTypes.Company.CompanyEmployees.Store>
       {...MyModalFormProps.props}
-      title={`添加员工`}
+      title={`添加${props.title}`}
       wrapperCol={{ span: 24 }}
       width="500px"
-      trigger={<MyButtons.Create title={`添加`} />}
+      trigger={<MyButtons.Create title={`添加${props.title}`} />}
       onFinish={async (values) =>
         Apis.Company.CompanyEmployees.Store(values)
           .then(() => {
@@ -30,7 +30,7 @@ export default function Create(props: MyBetaModalFormProps) {
       }
       columns={[
         Selects?.Companies({
-          title: '所属机构',
+          title: '机构',
           key: 'companies_id',
           formItemProps: { ...rulesHelper.text },
         }),
@@ -49,7 +49,7 @@ export default function Create(props: MyBetaModalFormProps) {
         {
           key: 'name',
           title: '姓名',
-          colProps: { span: 6 },
+          colProps: { span: 12 },
           formItemProps: { ...rulesHelper.text },
         },
         {
@@ -65,7 +65,7 @@ export default function Create(props: MyBetaModalFormProps) {
         MyFormItems.EnumRadio({
           key: 'sex',
           title: '性别',
-          colProps: { span: 6 },
+          colProps: { span: 24 },
           valueEnum: SexEnum,
           required: true,
         }),

src/pages/company/employees/modals/Update.tsx

@@ -16,7 +16,7 @@ export default function Update(props: MyBetaModalFormProps) {
   return (
     <BetaSchemaForm<ApiTypes.Company.CompanyEmployees.Update>
       {...MyModalFormProps.props}
-      title={`编辑员工`}
+      title={`编辑${props.title}`}
       trigger={<MyButtons.Edit />}
       wrapperCol={{ span: 24 }}
       width="500px"
@@ -43,7 +43,7 @@ export default function Update(props: MyBetaModalFormProps) {
       }
       columns={[
         Selects?.Companies({
-          title: '所属机构',
+          title: '机构',
           key: 'companies_id',
           formItemProps: { ...rulesHelper.text },
         }),
@@ -62,7 +62,7 @@ export default function Update(props: MyBetaModalFormProps) {
         {
           key: 'name',
           title: '姓名',
-          colProps: { span: 6 },
+          colProps: { span: 12 },
           formItemProps: { ...rulesHelper.text },
         },
         {
@@ -78,7 +78,7 @@ export default function Update(props: MyBetaModalFormProps) {
         MyFormItems.EnumRadio({
           key: 'sex',
           title: '性别',
-          colProps: { span: 6 },
+          colProps: { span: 24 },
           valueEnum: SexEnum,
           required: true,
         }),

src/pages/company/positions/index.tsx

@@ -1,25 +0,0 @@
-import { MyPageContainer, MyProTableProps } from '@/common';
-import { Apis } from '@/gen/Apis';
-import { ProTable } from '@ant-design/pro-components';
-import Create from './modals/Create';
-
-export default function Index({ title = '岗位管理' }) {
-  return (
-    <MyPageContainer title={title}>
-      <ProTable
-        {...MyProTableProps.props}
-        // search={false}
-        request={async (params, sort) =>
-          MyProTableProps.request(
-            params,
-            sort,
-            Apis.Company.CompanyPositions.List,
-          )
-        }
-        toolBarRender={(action) => [
-          <Create key="Create" reload={action?.reload} title={title} />,
-        ]}
-      />
-    </MyPageContainer>
-  );
-}

src/pages/company/positions/modals/Create.tsx

@@ -1,62 +0,0 @@
-import {
-  MyBetaModalFormProps,
-  MyButtons,
-  MyModalFormProps,
-  rulesHelper,
-} from '@/common';
-import { Selects } from '@/components/Select';
-import { Apis } from '@/gen/Apis';
-import { BetaSchemaForm } from '@ant-design/pro-components';
-import { message } from 'antd';
-
-export default function Create(props: MyBetaModalFormProps) {
-  return (
-    <BetaSchemaForm<ApiTypes.Company.CompanyPositions.Store>
-      {...MyModalFormProps.props}
-      title={`添加${props.title}`}
-      wrapperCol={{ span: 24 }}
-      width="500px"
-      trigger={<MyButtons.Create title={`添加${props.title}`} />}
-      onFinish={async (values) =>
-        Apis.Company.CompanyPositions.Store(values)
-          .then(() => {
-            props.reload?.();
-            message.success(props.title + '成功');
-            return true;
-          })
-          .catch(() => false)
-      }
-      columns={[
-        Selects?.Companies({
-          title: '机构',
-          key: 'companies_id',
-          formItemProps: { ...rulesHelper.text },
-        }),
-        {
-          key: 'name',
-          title: '岗位名称',
-          colProps: { span: 12 },
-          formItemProps: { ...rulesHelper.text },
-        },
-        {
-          key: 'code',
-          title: '岗位编号',
-          colProps: { span: 12 },
-          // formItemProps: { ...rulesHelper.text },
-        },
-        // {
-        //   key: 'sort',
-        //   title: '岗位排序',
-        //   colProps: { span: 24 },
-        //   valueType: 'number',
-        // },
-        {
-          key: 'remark',
-          title: '备注',
-          colProps: { span: 24 },
-          valueType: 'textarea',
-        },
-      ]}
-    />
-  );
-}

src/pages/company/positions/modals/Update.tsx

@@ -1,74 +0,0 @@
-import {
-  MyBetaModalFormProps,
-  MyButtons,
-  MyModalFormProps,
-  rulesHelper,
-} from '@/common';
-
-import { Selects } from '@/components/Select';
-import { Apis } from '@/gen/Apis';
-import { BetaSchemaForm } from '@ant-design/pro-components';
-import { Form, message } from 'antd';
-export default function Update(props: MyBetaModalFormProps) {
-  const [form] = Form.useForm();
-  return (
-    <BetaSchemaForm<ApiTypes.Company.CompanyPositions.Update>
-      {...MyModalFormProps.props}
-      title={`编辑${props.title}`}
-      trigger={<MyButtons.Edit />}
-      wrapperCol={{ span: 24 }}
-      width="500px"
-      form={form}
-      onOpenChange={(open: any) => {
-        if (open && props.item) {
-          form.setFieldsValue({
-            ...props.item,
-          });
-        }
-      }}
-      onFinish={async (values) =>
-        Apis.Company.CompanyPositions.Update({
-          ...values,
-          id: props.item?.id ?? 0,
-        })
-          .then(() => {
-            props.reload?.();
-            message.success(props.title + '成功');
-            return true;
-          })
-          .catch(() => false)
-      }
-      columns={[
-        Selects?.Companies({
-          title: '机构',
-          key: 'companies_id',
-          formItemProps: { ...rulesHelper.text },
-        }),
-        {
-          key: 'name',
-          title: '岗位名称',
-          colProps: { span: 12 },
-          formItemProps: { ...rulesHelper.text },
-        },
-        {
-          key: 'code',
-          title: '岗位编号',
-          colProps: { span: 12 },
-          // formItemProps: { ...rulesHelper.text },
-        },
-        // {
-        //   key: 'sort',
-        //   title: '岗位排序',
-        //   colProps: { span: 24 },
-        //   valueType: 'number',
-        // },
-        {
-          key: 'remark',
-          title: '备注',
-          colProps: { span: 24 },
-          valueType: 'textarea',
-        },
-      ]}
-    />
-  );
-}