feat: 新增业务事项、业务步骤权限+一些命名的修改

package.json

@@ -45,6 +45,7 @@
     "@formily/shared": "^2.1.10",
     "@umijs/max": "4.0.12",
     "@umijs/plugins": "4.0.12",
+    "@umijs/route-utils": "^2.2.0",
     "ahooks": "^3.0.0",
     "antd": "4.20.7",
     "array-move": "^4.0.0",

pnpm-lock.yaml

@@ -22,6 +22,7 @@ specifiers:
   '@types/react-dom': ^18.0.0
   '@umijs/max': 4.0.12
   '@umijs/plugins': 4.0.12
+  '@umijs/route-utils': ^2.2.0
   '@unocss/cli': ^0.44.3
   ahooks: ^3.0.0
   antd: 4.20.7
@@ -68,6 +69,7 @@ dependencies:
   '@formily/shared': 2.1.10
   '@umijs/max': 4.0.12_zydoiptit3dcuzymmvs734hkw4
   '@umijs/plugins': 4.0.12_xo7fjoqjibrnuea75o3qm7uusm
+  '@umijs/route-utils': 2.2.0
   ahooks: 3.5.0_react@18.1.0
   antd: 4.20.7_ef5jwxihqo6n7gxfmzogljlgcm
   array-move: 4.0.0
@@ -221,7 +223,7 @@ packages:
       '@ant-design/pro-provider': 1.9.3_ef5jwxihqo6n7gxfmzogljlgcm
       '@ant-design/pro-utils': 1.43.2_ef5jwxihqo6n7gxfmzogljlgcm
       '@babel/runtime': 7.18.3
-      '@umijs/route-utils': 2.1.1
+      '@umijs/route-utils': 2.2.0
       '@umijs/ssr-darkreader': 4.9.45
       '@umijs/use-params': 1.0.9_react@18.1.0
       antd: 4.20.7_ef5jwxihqo6n7gxfmzogljlgcm
@@ -251,7 +253,7 @@ packages:
       '@ant-design/pro-utils': 1.43.2_ef5jwxihqo6n7gxfmzogljlgcm
       '@babel/runtime': 7.18.9
       '@emotion/css': 11.9.0
-      '@umijs/route-utils': 2.1.1
+      '@umijs/route-utils': 2.2.0
       '@umijs/ssr-darkreader': 4.9.45
       '@umijs/use-params': 1.0.9_react@18.1.0
       antd: 4.20.7_ef5jwxihqo6n7gxfmzogljlgcm
@@ -1926,7 +1928,6 @@ packages:
     resolution: {integrity: sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==}
     dependencies:
       '@types/react': 18.0.14
-    dev: true
 
   /@types/react-redux/7.1.24:
     resolution: {integrity: sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==}
@@ -2438,8 +2439,8 @@ packages:
       react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
     dev: false
 
-  /@umijs/route-utils/2.1.1:
-    resolution: {integrity: sha512-N2ftgkqDEPBau1WyAxJfTQOs78OAVJY/Grl90fDo6ui75Eww563FhWcTrribS8sJS33mv9gtSlBLJ3F9WPLVog==}
+  /@umijs/route-utils/2.2.0:
+    resolution: {integrity: sha512-1t/A5+KuoK+AX0FcddNbUKMpMskuDsSSZRlQoTXDBBTDKUgWwG8KSX/NnfTCYJQrntL4A9WYymygop1jAw+Wdw==}
     dependencies:
       '@qixian.cs/path-to-regexp': 6.1.0
       fast-deep-equal: 3.1.3
@@ -8968,7 +8969,6 @@ packages:
     resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
     engines: {node: '>=4.2.0'}
     hasBin: true
-    dev: true
 
   /ufo/0.8.4:
     resolution: {integrity: sha512-/+BmBDe8GvlB2nIflWasLLAInjYG0bC9HRnfEpNi4sw77J2AJNnEVnTDReVrehoh825+Q/evF3THXTAweyam2g==}

src/enums/access.ts

@@ -103,6 +103,10 @@ export enum BackstagePermission {
   VIEW_INVENTORY_TEMPLATE = 'viewInventoryTemplate',
   /** 业务设置-查看步骤执行者 */
   VIEW_PROCESS_USER = 'viewProcessUser',
+  /** 业务步骤设置-启用 */
+  VIEW_STEP = 'viewStep',
+  /** 业务事项配置-启用 */
+  VIEW_MATTER = 'viewMatter',
   /** 表单设置-查看基础数据类型 */
   VIEW_BASE_SCHEMA = 'viewBaseSchema',
   /** 表单设置-编辑基础数据类型 */

src/pages/Business/RuleCode/index.tsx

@@ -6,7 +6,7 @@ import { createUid, dayjsFormat } from '@/utils/util'
 import { queryRuleCodeList, updateRuleCode } from '@/services/api/business'
 import { useRequest } from '@umijs/max'
 import LeftMenu from './components/LeftMenu'
-import { querySubject } from '@/services/api/subject'
+import { querySubjectList } from '@/services/api/subject'
 
 const { TabPane } = Tabs
 
@@ -137,11 +137,11 @@ const RulesCode = () => {
     manual: true,
     onSuccess: () => {
       message.success('规则更改成功')
-      // tryRuleCode({ tab: state.tabId, subjectID: state.activeKey.split('_')[0] })
+      tryRuleCode({ tab: state.tabId, subjectID: state.activeKey.split('_')[0] })
     }
   })
 
-  const { run: trySubjectList } = useRequest(() => querySubject({ pageNo: 1, pageSize: 214000 }), {
+  const { run: trySubjectList } = useRequest(() => querySubjectList({ current: 1, pageSize: 214000 }), {
     manual: true,
     onSuccess: result => {
       setState({ ...state, subjectList: result?.items })

src/pages/Permission/BackRole/components/ConnectModal/index.tsx

@@ -11,7 +11,7 @@ const ConnectModal = ({ dataId, onReload }) => {
   const [menuRoles, setMenuRoles] = useState([])
   const { run: tryGetRoleBgStaffList } = useRequest(
     (params: { roleID: string; search?: string }) =>
-      fetchRoleBgStaffListByRoleId({ pageNo: 1, pageSize: 214000, ...params }),
+      fetchRoleBgStaffListByRoleId({ current: 1, pageSize: 214000, ...params }),
     {
       manual: true,
       onSuccess: result => {

src/pages/Permission/BackRole/components/DataTab/index.tsx

@@ -1,4 +1,4 @@
-import { querySubject } from '@/services/api/subject'
+import { querySubjectList } from '@/services/api/subject'
 import { queryRoleBgDetailByID, setRoleBgPermission } from '@/services/api/permission'
 import { useRequest } from '@umijs/max'
 import type { CheckboxValueType } from 'antd/es/checkbox/Group'
@@ -11,9 +11,8 @@ const DataTabs = ({ currentPermData: { ID } }) => {
     value: '',
     subjectList: ''
   })
-  console.log(state.value)
 
-  const { run: trySubjectList } = useRequest(() => querySubject({ pageNo: 1, pageSize: 214000 }), {
+  const { run: trySubjectList } = useRequest(() => querySubjectList({ current: 1, pageSize: 214000 }), {
     manual: true,
     onSuccess: result => {
       setState({ ...state, subjectList: result?.items })

src/pages/Permission/BackRole/components/PermTab/index.tsx

@@ -286,6 +286,26 @@ const PermTabs: React.FC<PermTabsProps> = ({ currentPermData: { ID } }) => {
                   </Checkbox>
                 </div>
               </div>
+              <div>
+                <h4 className="pt-3">业务步骤配置</h4>
+                <div className="my-2">
+                  <Checkbox
+                    onChange={e => handleBackOnchange(e.target.checked, BackstagePermission.VIEW_STEP)}
+                    checked={permission.includes(BackstagePermission.VIEW_STEP)}>
+                    启用
+                  </Checkbox>
+                </div>
+              </div>
+              <div>
+                <h4 className="pt-3">业务事项配置</h4>
+                <div className="my-2">
+                  <Checkbox
+                    onChange={e => handleBackOnchange(e.target.checked, BackstagePermission.VIEW_MATTER)}
+                    checked={permission.includes(BackstagePermission.VIEW_MATTER)}>
+                    启用
+                  </Checkbox>
+                </div>
+              </div>
             </Card>
           </div>
           <div className="shadow-md mb-4">

src/pages/Permission/BackRole/index.tsx

@@ -22,7 +22,7 @@ const Role = () => {
   const [menuRoles, setMenuRoles] = useState([])
   const { run: tryGetRoleBgStaffList, loading: staffListLoading } = useRequest(
     (params: { roleID: string; search?: string }) =>
-      fetchRoleBgStaffListByRoleId({ pageNo: 1, pageSize: 214000, ...params }),
+      fetchRoleBgStaffListByRoleId({ current: 1, pageSize: 214000, ...params }),
     {
       manual: true,
       onSuccess: result => {

src/pages/Permission/FrontRole/index.tsx

@@ -22,7 +22,7 @@ const Role = () => {
   const [menuRoles, setMenuRoles] = useState([])
   const { run: tryGetRoleStaffList, loading: staffListLoading } = useRequest(
     (params: { roleID: string; search?: string }) =>
-      fetchRoleStaffListByRoleId({ pageNo: 1, pageSize: 214000, ...params }),
+      fetchRoleStaffListByRoleId({ current: 1, pageSize: 214000, ...params }),
     {
       manual: true,
       onSuccess: result => {

src/pages/Subject/Mainstay/index.tsx

@@ -1,4 +1,4 @@
-import { addSubject, delSubject, querySubject } from '@/services/api/subject'
+import { addSubject, delSubject, querySubjectList } from '@/services/api/subject'
 import consts from '@/utils/consts'
 import { PageContainer } from '@ant-design/pro-layout'
 import ProTable from '@ant-design/pro-table'
@@ -98,7 +98,7 @@ const Mainstay = () => {
         scroll={{ y: document.body.clientHeight - 315 }}
         search={false}
         request={async (params, filter, sorter) => {
-          const { code = -1, data: { items = [], total = 0 } = {} } = await querySubject({
+          const { code = -1, data: { items = [], total = 0 } = {} } = await querySubjectList({
             ...params,
             ...filter,
             ...sorter

src/services/api/subject.ts

@@ -9,7 +9,7 @@ export async function addSubject(params: API.AddSubjectParams) {
 }
 
 /** 获得业务主体列表 */
-export async function querySubject(params: API.SubjectParams) {
+export async function querySubjectList(params: API.SubjectParams) {
   return request('/Subject/list', {
     method: 'GET',
     params