xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 集团补充验证，部门权限取消清楚权限信息

Browse Source
This commit is contained in:
xuziqiang
2024-06-18 18:16:23 +08:00
parent 012c049ab0
commit ec1ae071f8
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
View File

@@ -281,7 +281,7 @@
opMap.type = 'addson'; opMap.type = 'addson';
formData.value = {}; formData.value = {};
let sourceOrgId = ''; let sourceOrgId = '';
if (!currentOrgRef.value.own) { if (!currentOrgRef.value?.own) {
sourceOrgId = orgId; sourceOrgId = orgId;
} }
opMap.fuc = (params) => { opMap.fuc = (params) => {
@@ -304,12 +304,14 @@
roleFormData.value = {}; roleFormData.value = {};
opMap.fuc = (params) => { opMap.fuc = (params) => {
delete params.roleId; delete params.roleId;
return http.post(department.addRole, { return formRoleRef.value.triggerSubmit().then(() => {
...params, return http.post(department.addRole, {
orgId, ...params,
projectId, orgId,
deptId: selectRef.value.deptInfo.deptId, projectId,
deptName: selectRef.value.deptInfo.deptName, deptId: selectRef.value.deptInfo.deptId,
deptName: selectRef.value.deptInfo.deptName,
});
}); });
}; };
}; };
@@ -320,13 +322,15 @@
roleFormData.value = {}; roleFormData.value = {};
opMap.fuc = (params) => { opMap.fuc = (params) => {
delete params.roleId; delete params.roleId;
return http.post(department.addRole, { return formRoleRef.value.triggerSubmit().then(() => {
...params, return http.post(department.addRole, {
orgId, ...params,
projectId, orgId,
proleId: selectRoleRef.value.roleId, projectId,
deptId: selectRef.value.deptInfo.deptId, proleId: selectRoleRef.value.roleId,
deptName: selectRef.value.deptInfo.deptName, deptId: selectRef.value.deptInfo.deptId,
deptName: selectRef.value.deptInfo.deptName,
});
}); });
}; };
}; };
@@ -542,10 +546,14 @@
const CancelApartment = () => { const CancelApartment = () => {
disabled.value = true; disabled.value = true;
// 清楚校验错误信息
formRef.value.formElRef.clearValidate();
}; };
const CancelUser = () => { const CancelUser = () => {
roleDisabled.value = true; roleDisabled.value = true;
// 清楚校验错误信息
formRoleRef.value.formElRef.clearValidate();
}; };
// 部门确定 // 部门确定
@@ -571,7 +579,6 @@
// 角色确定 // 角色确定
const UserSure = () => { const UserSure = () => {
roleDisabled.value = !roleDisabled.value;
const typeArr = ['addUserSon', 'addUser', 'editRole']; const typeArr = ['addUserSon', 'addUser', 'editRole'];
if (roleActiveKey.value === 1) { if (roleActiveKey.value === 1) {
if (typeArr.includes(opMap.type)) { if (typeArr.includes(opMap.type)) {
@@ -579,6 +586,7 @@
opMap.fuc(roleFormData.value).then(() => { opMap.fuc(roleFormData.value).then(() => {
getUserTree(); getUserTree();
clearRoleData(); clearRoleData();
roleDisabled.value = !roleDisabled.value;
}); });
} }
} else { } else {

1
hx-op/src/view/organizationManage/enterpriseManage/config.ts
View File

@@ -47,6 +47,7 @@ export const formConfig = [
placeholder: '请输入集团名称', placeholder: '请输入集团名称',
maxLength: 20, maxLength: 20,
}, },
rules: [{ required: true }],
}, },
{ {
field: 'cityName', field: 'cityName',