hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-08 10:26:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220

Browse Source
This commit is contained in:
joshen
2025-06-18 10:13:21 +08:00
parent 786e38f380 7b73978db3
commit 8e676a34ca
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/report/Employeelearning.vue
View File

@@ -232,45 +232,51 @@ export default {
}); });
}; };
//请求组织接口 //请求组织接口
const getOrgList = async () => { const getOrgList = async () => {
var manageFlag = false; var manageFlag = false;
if (store.state.userInfo != null && store.state.userInfo.roleList != null) { if (store.state.userInfo != null && store.state.userInfo.roleList != null) {
for(let i=0;i<store.state.userInfo.roleList.length;i++){ for (let i = 0; i < store.state.userInfo.roleList.length; i++) {
if(store.state.userInfo.roleList[i].roleCode=="system-admin"){ if (store.state.userInfo.roleList[i].roleCode == "system-admin") {
manageFlag = true; manageFlag = true;
break; break;
} }
} }
} }
const res = await api.userGetUserOrg({}); const res = await api.userGetUserOrg({});
// const res = orgjson;
if (res != null && res.data != null && res.data.result != null && res.data.result.orgTreeList != null) { if (res != null && res.data != null && res.data.result != null && res.data.result.orgTreeList != null) {
orgArray = flattenOrgTree(res.data.result.orgTreeList); orgArray = flattenOrgTree(res.data.result.orgTreeList);
} }
if (res) { if (res) {
if(manageFlag){ if (manageFlag) {
state.option = [{ state.option = [{
orgName:"全部", orgName: "全部",
organizationId: null, organizationId: null,
childList:res.data?.result.orgTreeList childList: res.data?.result.orgTreeList
}]; }];
state.orgId = res.data?.result.treeNodeList || []; state.orgId = [null, ...res.data?.result.treeNodeList];
state.resetOrgId = res.data?.result.treeNodeList || []; state.resetOrgId = [null, ...res.data?.result.treeNodeList];
}else{ } else {
if(res.data?.result.orgTreeList!=null){ if (res.data?.result.orgTreeList != null) {
state.option = res.data?.result.orgTreeList; state.option = res.data?.result.orgTreeList;
state.orgId = res.data?.result.treeNodeList; state.orgId = res.data?.result.treeNodeList;
state.resetOrgId = res.data?.result.treeNodeList; state.resetOrgId = res.data?.result.treeNodeList;
}else{ } else {
state.option = [{ state.option = [{
orgName:"无权限", orgName: "无权限",
organizationId: "1", organizationId: "1",
childList:[], childList: [],
}]; }];
state.orgId = ["1"]; state.orgId = ["1"];
state.resetOrgId = ["1"]; state.resetOrgId = ["1"];
} }
} }
state.type = res.data?.result?.userType;
res.data?.result?.userType === 1
? (state.allowClear = true)
: (state.allowClear = false);
getTableData(); getTableData();
} }
}; };
@@ -589,7 +595,7 @@ export default {
size: state.pageSize, size: state.pageSize,
userNo: state.userNo, userNo: state.userNo,
name: state.name, name: state.name,
orgId: state.orgId, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
bandCode: state.valueBand, bandCode: state.valueBand,
jobName: state.studentJobName, jobName: state.studentJobName,
tableSorts: state.tableSorts tableSorts: state.tableSorts