From 946384b9ed2c9bd8be717ff6698b064bc39302d9 Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Thu, 6 Jun 2024 16:56:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hx-ai-intelligent/src/api/origanizemanage.ts | 1 +
hx-ai-intelligent/src/router/organizationManage.ts | 35 +++++++++++++++++
.../organizationManage/departmentManage/config.ts | 20 +++++-----
.../organizationManage/departmentManage/index.vue | 44 ++++++++++++++--------
.../view/organizationManage/usermanage/index.vue | 10 ++---
lib/saas/store/modules/app-config.ts | 14 ++-----
lib/util/http/axios.ts | 3 +-
7 files changed, 84 insertions(+), 43 deletions(-)
diff --git a/hx-ai-intelligent/src/api/origanizemanage.ts b/hx-ai-intelligent/src/api/origanizemanage.ts
index 4d02876..12d2b93 100644
--- a/hx-ai-intelligent/src/api/origanizemanage.ts
+++ b/hx-ai-intelligent/src/api/origanizemanage.ts
@@ -1,6 +1,7 @@
const BASE_URL = '/carbon-smart';
export enum permission {
add = `${BASE_URL}/admin/permission/save`,
+ permissionTree = `${BASE_URL}/api/dept/permissionTree`,
}
export enum origanizemanage {
diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts
index 23c8f2d..9c28777 100644
--- a/hx-ai-intelligent/src/router/organizationManage.ts
+++ b/hx-ai-intelligent/src/router/organizationManage.ts
@@ -38,6 +38,41 @@ const organizationManage = {
meta: {
title: '用户管理',
keepAlive: true,
+ operates: [
+ { title: '新增', code: 'userAdd' },
+ {
+ title: '导入',
+ code: 'userImport',
+ },
+ {
+ title: '模板下载',
+ code: 'userTemDownload',
+ },
+ {
+ title: '导出',
+ code: 'userExports',
+ },
+ {
+ title: '批量删除',
+ code: 'userBatchDel',
+ },
+ {
+ title: '编辑',
+ code: 'userEdit',
+ },
+ {
+ title: '冻结',
+ code: 'userFrozen',
+ },
+ {
+ title: '重置密码',
+ code: 'userCodeReset',
+ },
+ {
+ title: '删除',
+ code: 'userDelete',
+ },
+ ],
// backApi: [],
},
},
diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts b/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts
index ffd1c1f..f2e5aff 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts
@@ -116,7 +116,7 @@ export const formConfig2 = (disabled2: Boolean) => {
// },
{
label: '节点编码',
- field: 'code',
+ field: 'roleCode',
component: 'NsInput',
componentProps: {
disabled: disabled2,
@@ -132,22 +132,22 @@ export const formConfig2 = (disabled2: Boolean) => {
},
{
label: '是否部门领导',
- field: 'isleader',
+ field: 'isLeader',
component: 'NsRadioGroup',
componentProps: {
disabled: disabled2,
radioType: 'radio',
options: [
- { label: '是', value: 1 },
- { label: '否', value: 2 },
- ],
- rules: [
- {
- required: true,
- message: '请选择是否部门领导',
- },
+ { label: '是', value: 0 },
+ { label: '否', value: 1 },
],
},
+ rules: [
+ {
+ required: true,
+ message: '请选择是否部门领导',
+ },
+ ],
},
{
field: 'remark',
diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
index 4cf69cd..e505664 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
@@ -101,14 +101,14 @@
取消
- {{ disabled2 ? '编辑' : '确定' }}
+ 确定