From 41e1e84e2a611874e61b261d4d8502768ca1c497 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 22 Oct 2020 10:44:17 +0800 Subject: [PATCH 01/12] =?UTF-8?q?newProj.vue=20=E4=BF=AE=E6=AD=A3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=91=98=E5=B7=A5=E9=80=9A=E8=AE=AF=E5=BD=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components_web/newProj/newProj.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/components_web/newProj/newProj.vue b/src/views/components_web/newProj/newProj.vue index d8e595d3..6a805635 100644 --- a/src/views/components_web/newProj/newProj.vue +++ b/src/views/components_web/newProj/newProj.vue @@ -453,9 +453,9 @@ 全选 - {{dept.data.deptName}} + {{dept.deptName}} -
@@ -1008,8 +1008,8 @@ this.isShowManager=false; //左侧选中状态根据右侧人员状态改变 // this.setFolderPerm(this.newProjData.listFolder[parseInt(index)]); - fetchPlainDeptUserList(this.$store.state.currentCompanyId).then(res => { - this.listDept = res[0].children; + fetchPlainDeptUserList(this.$store.state.currentCompanyId).then(list => { + this.listDept = list; // this.$nextTick(() => { // this.listDept = res[0].children//是一个包含公司部门的对象数组 每一个对象里面有具体的数据 // this.listDept = [...this.listDept]; @@ -1621,18 +1621,18 @@ ]); const deptHeadList = treeDeptList[0].children || []; const oList = plainTreeNodes(deptHeadList, userList); - return oList; + return oList.filter(dept => dept.listUser && dept.listUser.length); } function plainTreeNodes(nodesList, userList, outputList = []) { (nodesList || []).forEach(node => { // node.id - node.listUser = userList.filter(user => user.deptId === node.id); - outputList.push(node); + const data = node.data; + data.listUser = userList.filter(user => user.deptId === node.id); + outputList.push(data); if(node.children && node.children.length) { plainTreeNodes(node.children, userList, outputList); } - delete node.children; }) return outputList; } From cbfdccbdf7ba8573d1cc19d775de10d95bdd6674 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 22 Oct 2020 14:14:09 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=B0=E5=BB=BA=E6=97=B6=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components_web/newProj/newProj.vue | 87 +++++++++----------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/src/views/components_web/newProj/newProj.vue b/src/views/components_web/newProj/newProj.vue index 6a805635..eba279dc 100644 --- a/src/views/components_web/newProj/newProj.vue +++ b/src/views/components_web/newProj/newProj.vue @@ -161,10 +161,10 @@
-
- +
+
- {{currUser.userName}} + {{currUser.cnName}}
@@ -179,7 +179,7 @@
  • - +
    {{user.userName}}
    @@ -222,7 +222,7 @@
  • - +
    @@ -242,7 +242,7 @@
  • - +
    {{user.cnName}}
    @@ -283,7 +283,7 @@
    - +
    {{user.cnName}} @@ -332,7 +332,7 @@
    - +
      @@ -370,7 +370,7 @@