Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-admin into develop

# Conflicts:
#	src/pages/company/employees/index.tsx

src/pages/company/companies/index.tsx

@@ -17,7 +17,6 @@ export default function Index({ title = '机构管理' }) {
     <MyPageContainer title={title}>
       <ProTable
         {...MyProTableProps.props}
-        search={false}
         request={async (params, sort) =>
           MyProTableProps.request(params, sort, Apis.Company.Companies.List)
         }
@@ -32,30 +31,20 @@ export default function Index({ title = '机构管理' }) {
             valueEnum: CompaniesMerchantTypeEnum,
           }),
           {
-            title: '组织名称',
+            title: '机构名称',
             dataIndex: 'name',
           },
           {
             title: '组织简称',
             dataIndex: 'short_name',
+            search: false,
           },
 
           {
             title: '营业执照号',
             dataIndex: 'business_license_number',
+            search: false,
           },
-          // {
-          //   title: '联系人',
-          //   dataIndex: 'contact_name',
-          // },
-          // {
-          //   title: '手机号',
-          //   dataIndex: 'contact_phone',
-          // },
-          // {
-          //   title: '联系人邮箱',
-          //   dataIndex: 'contact_email',
-          // },
           MyColumns.UpdatedAt(),
           // MyColumns.CreatedAt(),
           MyColumns.Option({

src/pages/company/employees/index.tsx

@@ -39,11 +39,13 @@ export default function Index({ title = '员工管理' }) {
           {
             title: '机构',
             dataIndex: ['company', 'name'],
+            search: false,
+          },
+          {
+            title: '组织',
+            dataIndex: ['organization', 'name'],
+            search: false,
           },
-          // {
-          //   title: '组织',
-          //   dataIndex: ['organization', 'name'],
-          // },
           MyColumns.UpdatedAt(),
           MyColumns.CreatedAt(),
           MyColumns.Option({

src/pages/company/positions/index.tsx

@@ -1,14 +1,7 @@
-import {
+import { MyPageContainer, MyProTableProps } from '@/common';
-  MyButtons,
-  MyColumns,
-  MyPageContainer,
-  MyProTableProps,
-} from '@/common';
 import { Apis } from '@/gen/Apis';
 import { ProTable } from '@ant-design/pro-components';
-import { Space } from 'antd';
 import Create from './modals/Create';
-import Update from './modals/Update';
 
 export default function Index({ title = '岗位管理' }) {
   return (
@@ -26,48 +19,6 @@ export default function Index({ title = '岗位管理' }) {
         toolBarRender={(action) => [
           <Create key="Create" reload={action?.reload} title={title} />,
         ]}
-        columns={[
-          MyColumns.ID(),
-          {
-            title: '机构',
-            dataIndex: ['company', 'name'],
-          },
-          {
-            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>
-            ),
-          }),
-        ]}
       />
     </MyPageContainer>
   );