Browse Source

feat: 新增步骤、事项相关路由、权限定义

fix: 后台人员管理编辑的提交修改
lanjianrong 3 năm trước cách đây
mục cha
commit
9a923d882b

+ 0 - 0
.husky/pre-commit


+ 10 - 0
config/routes.ts

@@ -162,6 +162,16 @@ const routes: Route[] = [
         name: BackstagePermission.VIEW_PROCESS_USER,
         access: 'authRouteFilter',
         component: './Business/Process'
+      },
+      {
+        path: 'step',
+        name: BackstagePermission.VIEW_STEP_CONFIG,
+        component: './Business/Step'
+      },
+      {
+        path: 'matter',
+        name: BackstagePermission.VIEW_MATTER_SETTING,
+        component: './Business/Matter'
       }
     ]
   },

+ 1 - 0
package.json

@@ -51,6 +51,7 @@
     "array-move": "^4.0.0",
     "classnames": "^2.2.6",
     "dayjs": "^1.11.3",
+    "lodash": "^4.17.21",
     "omit.js": "^2.0.2",
     "rc-menu": "^9.0.13",
     "rc-tween-one": "^3.0.6",

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1193 - 1167
pnpm-lock.yaml


+ 4 - 4
src/enums/access.ts

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

+ 2 - 0
src/locales/zh-CN/menu.ts

@@ -34,6 +34,8 @@ export default {
   'menu.business.viewRuleCode': '编号规则设置',
   'menu.business.viewInventoryTemplate': '审核资料清单模板',
   'menu.business.viewProcessUser': '步骤执行者',
+  'menu.business.viewStepConfig': '步骤配置',
+  'menu.business.viewMatterSetting': '事项设置',
   'menu.schema': '表单设置',
   'menu.schema.viewBaseSchema': '基础数据设置',
   'menu.schema.viewBaseSchema.base': '基础数据设置',

+ 5 - 0
src/pages/Business/Matter/index.tsx

@@ -0,0 +1,5 @@
+const Matter: React.FC = () => {
+  return <div>事项设置</div>
+}
+
+export default Matter

+ 5 - 0
src/pages/Business/Step/index.tsx

@@ -0,0 +1,5 @@
+const Step: React.FC = () => {
+  return <div>步骤设置</div>
+}
+
+export default Step

+ 5 - 7
src/pages/System/Account/hooks/useScripts.tsx

@@ -35,8 +35,6 @@ export default function useScripts(modal: ModalAction) {
   })
 
   const addOrEdit = (mode: 'add' | 'edit', accountValues?: API.AccountBgParams) => {
-    console.log(mode)
-
     const text = mode === 'add' ? '添加人员' : '编辑人员'
     modal.open({
       title: text,
@@ -89,14 +87,14 @@ export default function useScripts(modal: ModalAction) {
         if (mode === 'add') {
           requestFn = addAccountBg
         } else {
-          omit(values, ['account', 'password'])
-          // ['account', 'password'].forEach(function (k) {
-          //   delete values[k]
-          // })
           requestFn = updateAccountBg
         }
         try {
-          await requestFn?.(values)
+          if (mode === 'add') {
+            await requestFn?.(values)
+          } else {
+            await requestFn?.(omit(values, ['account', 'password']))
+          }
           refresh()
           modal.close()
           message.success(text + '成功')