diff --git a/src/views/Forward.vue b/src/views/Forward.vue
index 1b47c650..4e596d08 100644
--- a/src/views/Forward.vue
+++ b/src/views/Forward.vue
@@ -1,7 +1,7 @@
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index 7a38af7d..c6ff5ed4 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -63,17 +63,14 @@
发布
-
-
-
-
+
成绩
推送
取消发布
- 考试
+ 更多
编辑
diff --git a/src/views/manage/AddAudiences.vue b/src/views/manage/AddAudiences.vue
index aaad9774..102e7520 100644
--- a/src/views/manage/AddAudiences.vue
+++ b/src/views/manage/AddAudiences.vue
@@ -121,6 +121,7 @@
import usergroupApi from "@/api/modules/usergroup";
import userApi from "@/api/system/user";
import orgApi from "@/api/system/organiza";
+ import apiUserBasic from "@/api/boe/userbasic";
export default{
data(){
return{
@@ -181,22 +182,45 @@
if (node.level === 0) {
resolve([{name:'组织机构树',id:'-1'}]);
}else{
+ let $this=this;
if(node.level === 1){
parentId = '-1';
+ apiUserBasic.findOrgsByKeyword('').then(rs=>{
+ let treeList=[];
+ rs.result.forEach(item=>{
+ let node={
+ id:item.id,
+ name:item.name,
+ hrbpId:item.hrbpId,
+ children:[]
+ }
+ treeList.push(node);
+ });
+ resolve(treeList);
+ });
}else{
parentId = node.data.id;
+
+ apiUserBasic.getOrgInfo(parentId).then(rs=>{
+ if(rs.status==200){
+ let treeList=[];
+ if(rs.result.directChildList){
+ rs.result.directChildList.forEach(item=>{
+ let node={
+ id:item.id,
+ name:item.name,
+ hrbpId:item.hrbpId,
+ children:[]
+ }
+ treeList.push(node);
+ });
+ }
+ resolve(treeList);
+ }else{
+ resolve([]);
+ }
+ });
}
- usergroupApi.userOrgs(parentId).then(res =>{
- if (res.status == 200) {
- if(res.result != null && res.result.length > 0){
- resolve(res.result);
- }else{
- resolve([]);
- }
- }else{
- this.$message.error('查询用户的机构失败');
- }
- });
}
},
handleSelectionChange(val) {
diff --git a/src/views/manage/AutoAddAudiences.vue b/src/views/manage/AutoAddAudiences.vue
index 24ec0a5c..be1d09df 100644
--- a/src/views/manage/AutoAddAudiences.vue
+++ b/src/views/manage/AutoAddAudiences.vue
@@ -22,40 +22,15 @@
导入
批量删除
-
-
-
-
+
+
+
{{ scope.row.date }}
-
-
-
-
-
-
-
+
+
+
+
操作
@@ -65,11 +40,8 @@
暂存
发布
-
- 这是一段信息
+
+