diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 362ca087..135a0be8 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -9,18 +9,26 @@
{{filters.selProject?filters.selProject.name:'选择项目'}}
-
-
-
- 查询
+
小组进度
- 变化日志
- 绑定即聊情况
+ 变化日志
+ 绑定即聊情况
角色说明
- 注意：点击架构图进行操作
+ 点击架构图操作
+
+
+ 变化日志
+ 绑定即聊情况
+ 角色说明
+ 注意：点击架构图进行操作
+ 更多
+
-
@@ -297,6 +306,9 @@ XmProductSelect,XmProjectSelect,
},
xmIteration(){
this.getXmGroup();
+ },
+ "filters.key":function(val) {
+ this.$refs.tree.filter(val);
}
},
data() {
@@ -748,7 +760,37 @@ XmProductSelect,XmProjectSelect,
onProjectClearSelect(){
this.filters.selProject=null
this.xmGroups=[]
- }
+ },
+ filterNode(value, data) {
+ if (!value) return true;
+ var match=false;
+ if(data.leaderUsername){
+ match=data.leaderUsername.indexOf(value)!==-1;
+ if(match==true){
+ return true;
+ }
+ }
+ if(data.assUsername){
+ match=data.assUsername.indexOf(value)!==-1;
+ if(match==true){
+ return true;
+ }
+ }
+ if(data.groupName){
+ match=data.groupName.indexOf(value)!==-1;
+ if(match==true){
+ return true;
+ }
+ }
+
+ if(data.crowBranchName){
+ match=data.crowBranchName.indexOf(value)!==-1;
+ if(match==true){
+ return true;
+ }
+ }
+ return data.label.indexOf(value) !== -1;
+ },
},//end methods
mounted() {
this.$nextTick(() => {
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 4cbcdbbb..8e20d83d 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -3,7 +3,8 @@
-
+
+
迭代名称 清空所选
-
+
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index b6f51020..b35e4a6f 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -2,7 +2,9 @@