From f8e2458b5eb54e3b7c5fe3b2440c695d94ea8c56 Mon Sep 17 00:00:00 2001
From: zhengzhou <wzszhengzhou@hotmail.com>
Date: Mon, 30 Nov 2020 18:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=B7=A5=E4=BD=9C=E4=B8=AD?=
 =?UTF-8?q?=E7=BB=99=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0oldListManageUser=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components_web/distWork/distWork.vue      | 95 ++-----------------
 1 file changed, 6 insertions(+), 89 deletions(-)

diff --git a/src/views/components_web/distWork/distWork.vue b/src/views/components_web/distWork/distWork.vue
index 7c3dedbe..208b746e 100644
--- a/src/views/components_web/distWork/distWork.vue
+++ b/src/views/components_web/distWork/distWork.vue
@@ -270,6 +270,7 @@
 
 <script>
 import { getUserInfo,roleOptions,fetchDeptList,getUserListByNode,roleMap,stateOptions} from '@/services/user.js';
+import { cloneDeep } from 'lodash';
 import { fetchApi } from '@/utils/request';
 import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
 import { AssignedWork } from '@/services/project.js';
@@ -329,6 +330,7 @@ export default {
       currUser: {},
       isShowManager:true,// 当前是否是设置项目负责人
       listManagerUser:[], //项目负责人
+      oldListManagerUser: [],
       isProjManager: false,
       currListDeptUserData:[],
 
@@ -1033,94 +1035,6 @@ export default {
       this.nodeLeaves = false;
       this.opentree = true;
     },
-    /**
-     * 获取listprojprop
-     */
-    getListProjProp: function () {
-      this.$axios({
-          method: "get",
-          url: encodeURI(
-            process.env.API_HOST +
-            "templates/templateproperty/" +
-            sessionStorage.templateID +
-            "/" +
-            sessionStorage.projId
-          )
-        })
-        .then(response => {
-          this.listProjProp = response.data.data;
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取当前项目信息
-     */
-    getNowProject: function () {
-      var thisApp = this;
-      this.$axios({
-          method: "get",
-          url: encodeURI(
-            process.env.API_HOST + "projects/project/" + sessionStorage.projId
-          )
-        })
-        .then(response => {
-          thisApp.nowProject = response.data;
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * todo
-     * 加载需要分配的文件夹
-     */
-    async listFolderChildren () {
-      // const res = await queryFolderList(sessionStorage.projId, this.userList);
-      // console.log(res);
-      // const { Data } = await templateService.queryTemplateNodeByTemplateId(templateID);
-      // const headNodes = (Data.children || []);
-      // this.newProjData.listFolder = [];
-      // headNodes.forEach(node => {
-      //   const folder = {
-      //     folderID: "",
-      //     projID: "",
-      //     superID: "",
-      //     levelID: "",
-      //     firstFolderID: "",
-      //     tempNodeID: node.id,
-      //     folderName: node.topic,
-      //     fileCount: 0,
-      //     childCount: 0,
-      //     modifyUserID: "",
-      //     deleted: 0,
-      //     default: true,
-      //     listUser: [],
-      //     manageUser: []
-      //   };
-      //   this.newProjData.listFolder.push(folder);
-      // });
-      var thisApp = this;
-      this.$axios({
-          method: "get",
-          url: encodeURI(
-            process.env.API_HOST +
-            "folders/allot/children/" +
-            sessionStorage.userId +
-            "/" +
-            sessionStorage.projId
-          )
-        })
-        .then(response => {
-          for (var i = 0; i < response.data.length; i++) {
-            thisApp.listNewFolder.push(response.data[i]);
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
     /**
      * 获取全部的Dept数据
      */
@@ -1213,7 +1127,9 @@ export default {
         this.currUser = this.listManagerUser[0] || {};
         this.listManagerUser = this.listManagerUser.slice(1);
       }
-      const  folderList = mergeFolderList(folder, userHash);
+      this.oldListManagerUser = cloneDeep(this.listManagerUser);
+      const folderList = mergeFolderList(folder, userHash);
+      // 
       this.getfolderPerm(folderList)
       this.listNewFolder = folderList;
       // console.log('得到的listNewFolder', this.listNewFolder);
@@ -1269,6 +1185,7 @@ export default {
           Id: sessionStorage.createUserID,
           ProjId: sessionStorage.projId,
           ProjectManagerId: '',
+          OldProjectManagerId: this.oldListManagerUser.map(u => u.id).join(','),
           Work: [],
       };
       params.ProjectManagerId = this.listManagerUser.length > 0 ? this.listManagerUser.map(projManager => {