确定
@@ -143,12 +142,10 @@
const selectRef2 = ref();
const formSchema = formConfig(disabled as any);
const formSchema2 = formConfig2(disabled2 as any);
- const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId;
- const projectId = JSON.parse(sessionStorage.getItem('userInfo')).projectId;
+ const { orgId, orgName, projectId } = JSON.parse(sessionStorage.getItem('userInfo'));
const userAdminTreeData = ref([]);
const apartmentTreeData = ref([]);
const apartmentAdminTreeData = ref([]);
-
const userTreeData = ref([]);
const getPermissionTree = (params) => {
return http.post(permission.permissionTree, params).then((res) => {
@@ -157,7 +154,7 @@
});
};
- getPermissionTree({ projectId });
+ getPermissionTree({ projectId, orgId });
watch(ApartcheckedKeys, () => {
console.log('checkedKeys', ApartcheckedKeys.value);
@@ -215,6 +212,7 @@
...params,
orgId,
projectId,
+ orgName,
});
};
return;
@@ -230,6 +228,7 @@
orgId,
projectId,
pdeptId: selectRef.value.deptInfo.deptId,
+ deptName: selectRef.value.deptInfo.deptName,
});
};
};
@@ -245,6 +244,7 @@
orgId,
projectId,
deptId: selectRef.value.deptInfo.deptId,
+ deptName: selectRef.value.deptInfo.deptName,
});
};
};
@@ -261,6 +261,7 @@
projectId,
proleId: selectRef2.value.roleId,
deptId: selectRef.value.deptInfo.deptId,
+ deptName: selectRef.value.deptInfo.deptName,
});
};
};
@@ -374,17 +375,27 @@
};
};
+ // 部门编辑
+ const deptEdit = () => {
+ disabled.value = false;
+ apartmentChoose();
+ };
+
// 部门选择
const SelectApartmentTree = (selectedKeys: any, info: any) => {
+ console.log(selectedKeys, info);
+
const { selected } = info;
- disabled.value = !selected;
- console.log(info, 'info');
- selectKey.value = selectedKeys[0];
+
+ // disabled.value = !selected;
+
+ if (!selectedKeys?.length) return;
+ selectKey.value = [info.node.key];
selectRef.value = info.node.dataRef;
- formData.value = cloneDeep(info.node.dataRef.deptInfo);
- apartmentChoose();
ApartcheckedKeys.value.splice(0);
getDeptPermission();
+ formData.value = cloneDeep(info.node.dataRef.deptInfo);
+
// getUserTree({ deptId: selectRef.value.deptInfo.deptId });
};
@@ -434,10 +445,6 @@
};
const ApartmentSure = () => {
- // formRef.value?.triggerSubmit().then(() => {});
-
- // disabled.value = !disabled.value;
- // console.log(formData.value.name, 'formData');
console.log(opMap.type, 'ApartmentSure');
const opArr = ['addDept', 'editDpet', 'addson'];
if (opArr.includes(opMap.type)) {
@@ -445,6 +452,7 @@
opMap.fuc &&
opMap.fuc(formData.value).then(() => {
getTree();
+ disabled.value = true;
});
} else if (opMap.type === 'deptDelete') {
opMap.fuc && opMap.fuc({ ...formData.value, selectRef: selectRef.value });
@@ -504,6 +512,7 @@
formRef,
apartmentPermission,
rolePermission,
+ deptEdit,
};
},
});
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
index 4191c5d..f311b5f 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
@@ -390,7 +390,7 @@
confirm: true,
handle: ({ userId }: any) => {
http
- .post(origanizemanage.resetPwd, { userId })
+ .post(origanizemanage.resetPwd, { userId, password: 123456 })
.then(() => NsModal.success({ content: '密码重置成功,初始密码123456' }));
},
},
diff --git a/hx-op/index.html b/hx-op/index.html
index 420aa9c..764733a 100644
--- a/hx-op/index.html
+++ b/hx-op/index.html
@@ -10,7 +10,7 @@
securityJsCode: '09e43004c09d39c0e61f8fd65d5e6a5a',
};
-->
-
AI智能BAS系统
+
op端
diff --git a/hx-op/src/api/origanizemanage.ts b/hx-op/src/api/origanizemanage.ts
index e24c073..a5b8364 100644
--- a/hx-op/src/api/origanizemanage.ts
+++ b/hx-op/src/api/origanizemanage.ts
@@ -9,6 +9,10 @@ export enum enterPrise {
getArea = `${BASE_URL}/system/queryAddressTree`,
freeze = `${BASE_URL}/admin/org/freeze`,
getCode = `${BASE_URL}/admin/org/getCode`,
- queryRootAc = `${BASE_URL}/admin/org/queryRootAc`,
- permissionTree = `${BASE_URL}/api/dept/permissionTree`,
+ queryRootAc = `${BASE_URL}/api/user/queryRootAc`,
+ orgPermission = `${BASE_URL}/admin/org/OrgPermission`,
+ permissionTree = `${BASE_URL}/admin/permission/permissionTree`,
+ queryOrgPermission = `${BASE_URL}/admin/org/QueryOrgPermission`,
+ queryOrgTree = `${BASE_URL}/admin/org/QueryLinkOrgTree`,
+ resetPwd = `${BASE_URL}/api/user/resetPwd`,
}
diff --git a/hx-op/src/util/generateRandomString.ts b/hx-op/src/util/generateRandomString.ts
new file mode 100644
index 0000000..34174c4
--- /dev/null
+++ b/hx-op/src/util/generateRandomString.ts
@@ -0,0 +1,9 @@
+export function generateRandomString(length: number) {
+ let result = '';
+ const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+ const charactersLength = characters.length;
+ for (let i = 0; i < length; i++) {
+ result += characters.charAt(Math.floor(Math.random() * charactersLength));
+ }
+ return result;
+}
diff --git a/hx-op/src/view/organizationManage/enterpriseManage/TreeAdd.vue b/hx-op/src/view/organizationManage/enterpriseManage/TreeAdd.vue
index b552187..9438895 100644
--- a/hx-op/src/view/organizationManage/enterpriseManage/TreeAdd.vue
+++ b/hx-op/src/view/organizationManage/enterpriseManage/TreeAdd.vue
@@ -1,14 +1,16 @@
-
+
+
diff --git a/lib/component/drawer/drawer.vue b/lib/component/drawer/drawer.vue
index e902b32..a01a731 100644
--- a/lib/component/drawer/drawer.vue
+++ b/lib/component/drawer/drawer.vue
@@ -29,6 +29,7 @@
console.log(props, getCurrentInstance());
const getBindValue = computed(() => ({
+ getContainer: (triggerNode: any) => triggerNode.parentNode,
...attrs,
...props,
}));