Merge pull request 'fix：更新员工端权限' (#28) from develop into main

Reviewed-on: #28

src/common/components/layout/MyImportModal.tsx

@@ -1,6 +1,6 @@
 import { MyResponseType } from '@/common';
 import { ImportOutlined, InboxOutlined } from '@ant-design/icons';
-import { Button, Flex, Modal, Space, Upload, message } from 'antd';
+import { Button, Flex, Modal, Upload, message } from 'antd';
 import { useState } from 'react';
 
 type MyImportModalType = {
@@ -69,7 +69,7 @@ export function MyImportModal(props: MyImportModalType) {
           return (
             <Flex style={{ width: '100%' }} justify="space-between">
               <Button onClick={() => props?.templateApi?.()}>下载模板</Button>
-              <Space>{dom}</Space>
+              <div>{dom}</div>
             </Flex>
           );
         }}

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

@@ -72,7 +72,6 @@ export default function Update(props: MyBetaModalFormProps) {
         {
           title: '重置登录密码',
           key: 'password',
-          tooltip: '必须超过6位数，且包含数字、字母、符号',
           colProps: { span: 24 },
         },
         Selects?.Positions({

src/pages/company/list/table/Roles.tsx

@@ -1,4 +1,5 @@
 import { MyBetaModalFormProps, MyButtons } from '@/common';
+import MyEnumRadioGroup from '@/common/components/formFields/MyEnumRadioGroup';
 import { Apis } from '@/gen/Apis';
 import { SysModuleEnum } from '@/gen/Enums';
 import { ProCard } from '@ant-design/pro-components';
@@ -61,6 +62,15 @@ export default function Index(props: MyBetaModalFormProps) {
 
   return (treeData?.length ?? 0) > 0 ? (
     <ProCard
+      title={
+        <MyEnumRadioGroup
+          enums={getSysModuleEnum}
+          onChange={(e) => {
+            setGuardName(e as string);
+          }}
+          value={guardName}
+        />
+      }
       extra={[
         <MyButtons.Default
           title="保存"

src/pages/company/positions/index.tsx

@@ -3,14 +3,24 @@ import {
   MyColumns,
   MyPageContainer,
   MyProTableProps,
+  usePageTabs,
 } from '@/common';
 import { Apis } from '@/gen/Apis';
 import { ProTable } from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
 import { Space } from 'antd';
 import PositionCreate from './modals/PositionCreate';
 import PositionUpdate from './modals/PositionUpdate';
 
 export default function Index({ title = '岗位管理' }) {
+  const navigate = useNavigate();
+
+  // 注册当前页面为标签页
+  usePageTabs({
+    tabKey: 'company-positions',
+    tabLabel: title,
+  });
+
   return (
     <MyPageContainer
       title={title}
@@ -33,7 +43,7 @@ export default function Index({ title = '岗位管理' }) {
         columns={[
           MyColumns.ID(),
           {
-            title: '所属机构',
+            title: '机构',
             dataIndex: ['company', 'name'],
             search: false,
           },

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

@@ -42,7 +42,7 @@ export default function Create(props: MyBetaModalFormProps) {
           : [
               Selects?.Companies({
                 key: 'companies_id',
-                title: '选择机构',
+                title: '公司',
                 colProps: { span: 24 },
                 required: true,
               }),