From 7274efd5c2e69f516b51f11bb174d4259e06afeb Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Thu, 18 Jul 2024 15:40:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E9=97=A8=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../organizationManage/departmentManage/index.vue | 13 +-
.../view/organizationManage/usermanage/config.ts | 171 ++++++++++-----------
.../view/organizationManage/usermanage/index.vue | 14 +-
3 files changed, 100 insertions(+), 98 deletions(-)
diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
index a49011b..ab6b8c8 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
@@ -145,7 +145,7 @@
取消
编辑
@@ -501,6 +501,7 @@
roleFormData.value = {};
opMap.type = '';
opMap.fuc = '';
+ selectRoleRef.value = '';
roleDisabled.value = true;
};
@@ -627,6 +628,7 @@
roleActiveKey.value = 1;
// 需要重置数据
clearDeptData();
+ clearRoleData();
const { selected } = info;
if (!selectedKeys?.length) return;
@@ -686,7 +688,7 @@
roleFormData.value = cloneDeep(info.node.dataRef);
roleCheckedKeys.value = [];
if (selectRoleRef.value?.proleId) {
- // 查询子部门
+ // 查询子角色
getRolesonPermissionTree({ roleId: selectRoleRef.value?.proleId });
} else {
getRolePermissionTree({ deptId: selectRef.value.deptInfo.deptId });
@@ -723,6 +725,13 @@
deptPermission().then(() => {
clearDeptData();
disabled.value = true;
+ // 部门权限修改后更新角色树
+ if (selectRoleRef.value?.proleId) {
+ // 查询子角色
+ getRolesonPermissionTree({ roleId: selectRoleRef.value?.proleId });
+ } else {
+ getRolePermissionTree({ deptId: selectRef.value.deptInfo.deptId });
+ }
});
}
};
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts b/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
index 6b5e24c..dd3e275 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
@@ -4,100 +4,91 @@ import { origanizemanage } from '/@/api/origanizemanage';
export const formConfig = (disabled) => {
return ref([
{
- field: 'field111',
- component: 'NsChildForm',
+ label: '账号',
+ field: 'accountNo',
+ component: 'NsInput',
componentProps: {
- title: '用户信息',
- schemas: [
- {
- label: '账号',
- field: 'accountNo',
- component: 'NsInput',
- componentProps: {
- placeholder: '请输入账号',
- maxLength: 20,
- disabled,
- },
- rules: [
- {
- required: true,
- message: '请输入账号',
- },
- ],
- },
- {
- label: '姓名',
- field: 'realName',
- component: 'NsInput',
- componentProps: {
- placeholder: '请输入姓名',
- maxLength: 20,
- },
- rules: [
- {
- required: true,
- message: '请输入姓名',
- },
- ],
- },
- {
- label: '性别',
- field: 'sex',
- component: 'NsRadioGroup',
- defaultValue: '男',
- componentProps: {
- radioType: 'radio',
- options: [
- { label: '男', value: '男' },
- { label: '女', value: '女' },
- ],
- },
- },
- {
- label: '手机号',
- field: 'telephone',
- component: 'NsInput',
- componentProps: {
- placeholder: '请输入手机号',
- maxLength: 11,
- },
- rules: [
- {
- required: true,
- message: '请输入正确手机号格式',
- pattern: /^[1][3-9][0-9]{9}$/,
- },
- ],
- },
- {
- label: '邮箱',
- field: 'email',
- component: 'NsInput',
- componentProps: {
- placeholder: '请输入邮箱',
- maxLength: 30,
- },
- rules: [
- {
- pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/,
- message: '请输入正确的邮箱格式',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '组织关系',
- field: 'orgName',
- component: 'NsInput',
- defaultValue: JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgName,
- componentProps: {
- disabled: true,
- maxLength: 30,
- },
- },
+ placeholder: '请输入账号',
+ maxLength: 20,
+ disabled,
+ },
+ rules: [
+ {
+ required: true,
+ message: '请输入账号',
+ },
+ ],
+ },
+ {
+ label: '姓名',
+ field: 'realName',
+ component: 'NsInput',
+ componentProps: {
+ placeholder: '请输入姓名',
+ maxLength: 20,
+ },
+ rules: [
+ {
+ required: true,
+ message: '请输入姓名',
+ },
+ ],
+ },
+ {
+ label: '性别',
+ field: 'sex',
+ component: 'NsRadioGroup',
+ defaultValue: '男',
+ componentProps: {
+ radioType: 'radio',
+ options: [
+ { label: '男', value: '男' },
+ { label: '女', value: '女' },
],
},
},
+ {
+ label: '手机号',
+ field: 'telephone',
+ component: 'NsInput',
+ componentProps: {
+ placeholder: '请输入手机号',
+ maxLength: 11,
+ },
+ rules: [
+ {
+ required: true,
+ message: '请输入正确手机号格式',
+ pattern: /^[1][3-9][0-9]{9}$/,
+ },
+ ],
+ },
+ {
+ label: '邮箱',
+ field: 'email',
+ component: 'NsInput',
+ componentProps: {
+ placeholder: '请输入邮箱',
+ maxLength: 30,
+ },
+ rules: [
+ {
+ pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/,
+ message: '请输入正确的邮箱格式',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '组织关系',
+ field: 'orgName',
+ component: 'NsInput',
+ defaultValue: JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgName,
+ componentProps: {
+ disabled: true,
+ maxLength: 30,
+ },
+ },
]);
};
const options = ref([]);
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
index 79613a5..42d6c6c 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
@@ -32,12 +32,14 @@
:footer-style="{ textAlign: 'right' }"
destroyOnClose
@close="onClose">
+ 用户信息
用户权限