fix bug

src/utils/operation.js

+//求并集
+export function getUnion(a,b){
+  if(a.constructor === Array && b.constructor === Array){
+      let set1 = new Set(a);
+      let set2 = new Set(b);
+      return Array.from(new Set([...set1,...set2]));
+  }
+  return null;
+}
+//求差集
+export function getDifference(a,b){
+  if(a.constructor === Array && b.constructor === Array){
+      let set1 = new Set(a);
+      let set2 = new Set(b);
+      return Array.from(new Set([...set1].filter(x => !set2.has(x))));
+  }
+  return null;
+}
+//求交集
+export function getIntersect(a,b){
+  if(a.constructor === Array && b.constructor === Array){
+      let set1 = new Set(a);
+      let set2 = new Set(b);
+      return Array.from(new Set([...set1].filter( x => set2.has(x))));
+  }
+  return null;
+}
+//获取id的list
+export function getIdList(data) {
+  let list = [];
+  for(let i=0;i<data.length;i++) {
+    list.push(data[i].id);
+  }
+  return list;
+}
+//区域
 export function getAdministrative(data) {
   let list = data.split('|');
   //for(let i)
@@ -13,24 +49,66 @@ export function getLevelList(data) {
     }
     level.push(obj);
   }
-  console.log(level);
+  //console.log(level);
   return level;
 }
-function recursiveTraverse (node) {
-	let afterTree = [];
+function inTags(id,tags) {
+  let flag = false;
+  for(let i = 0;i<tags.length;i++) {
+    if(tags[i].key == id) {
+      flag = true;
+    }
+  }
+  return flag;
+}
+export function inOrganization(list,id) {
+  let flag = false;
+  if(list.length == 0) {
+    flag = true;
+  }
+  for(let i=0;i<list.length;i++) {
+    if(list[i].id != id) {
+      flag = true;
+    }
+  }
+  return flag;
+}
+function recursiveTraverse (node,tags) {
+  let afterTree = [];
+  let add = 0;
 	node.forEach(function(item, index) {
     let obj = {
       value: item.id,
       label: item.label,
     }
-    afterTree.push(obj);
+    if(inTags(item.id,tags)) {
+      afterTree[add] = obj;
+      add++;
+    } else if(item.children.length > 0) {
+      afterTree[add] = obj;
+      afterTree[add].children = [];
+      add++;
+      let add2 = 0;
+      item.children.forEach(function(item2, index2) {
+        let obj = {
+          value: item2.id,
+          label: item2.label,
+        }
+        console.log(afterTree[add],add2)
+        //afterTree[add].children[add2] = obj;
+      });
+    }
   });
   return afterTree;
+
 }
 //拼装选择的tree
-export function getTreeData(data) {
-  console.log('allTree', data, data.length);
-  let afterTree = recursiveTraverse(data.children);
+export function getTreeData(data,tags) {
+  console.log('allTree', data.children,'tags',tags);
+  console.log(JSON.stringify(data.children));
+  console.log(JSON.stringify(tags));
+
+  let afterTree = recursiveTraverse(data.children,tags);
   console.log('afterTree ',afterTree);
   let options = [
     {
@@ -229,4 +307,15 @@ export function getTreeData(data) {
       }]
     }];
   return afterTree;
+}
+export function organizationList(data) {
+  let list = [];
+  for(let i=0;i<data.length;i++) {
+    let obj = {
+      value: data[i].key,
+      label: data[i].name,
+    }
+    list.push(obj);
+  }
+  return list;
 }
\ No newline at end of file

src/views/system/item-role.vue

@@ -197,7 +197,8 @@ export default {
         full: false
       },
       dialogFull: false,
-      scopeRow: {}
+      scopeRow: {},
+      activeUser: '',
     };
   },
   created() {
@@ -230,7 +231,8 @@ export default {
         if (res.code == "000000") {
           vm.tableData = res.data.projectRoleInfoModels;
           vm.totalRows = res.data.total;
-
+          vm.activeUser = res.data.activeUser;
+          console.log('activeUser',vm.activeUser);
           //this.roleList = setRoleList(res.data.roleList);
           this.organizationList = res.data.organizationList;
           this.departmentsList = res.data.departmentsList;
@@ -287,18 +289,38 @@ export default {
     //按钮展示情况
     showButton(row, projeceRole) {
       let flag = false;
-      //console.log("当前等级 " + row.projeceRole + " 改变成等级 " + projeceRole);
-      if (row.projeceRole == "L2") {
-        if (projeceRole == "L0") {
-          flag = true;
+      if(vm.activeUser == "L1") {
+        //当前内部管理员
+        if (row.projeceRole == "L2") {
+          if (projeceRole == "L0") {
+            flag = true;
+          }
+        } else if (row.projeceRole == "L3") {
+          if (projeceRole == "L2" || projeceRole == "L0") {
+            flag = true;
+          }
+        } else if (row.projeceRole == "L0") {
+          if (projeceRole == "L2" || projeceRole == "L3") {
+            flag = true;
+          }
         }
-      } else if (row.projeceRole == "L3") {
-        if (projeceRole == "L2" || projeceRole == "L0") {
-          flag = true;
+      } else if (vm.activeUser == "L2") {
+        //当前项目负责人
+        if (row.projeceRole == "L3") {
+          if (projeceRole == "L2" || projeceRole == "L0") {
+            flag = true;
+          }
+        } else if (row.projeceRole == "L0") {
+          if (projeceRole == "L2" || projeceRole == "L3") {
+            flag = true;
+          }
         }
-      } else if (row.projeceRole == "L0") {
-        if (projeceRole == "L2" || projeceRole == "L3") {
-          flag = true;
+      } else if (vm.activeUser == "L3") {
+        //当前次级负责人
+        if (row.projeceRole == "L0") {
+          if (projeceRole == "L3") {
+            flag = true;
+          }
         }
       }
       return flag;