commit

src/views/components_web/distWork/distWork.vue

@@ -966,8 +966,14 @@ export default {
      */
     setManagerUser: function (nowUser) {
       if (this.InitData.manageUser.length != 0) {
-        console.log(this.InitData.manageUser[0]);
         this.InitData.manageUser[0].selected = false;
+        this.listDept.forEach(dept=>{
+          dept.listUser.forEach(user=>{
+            if(user.id==this.InitData.manageUser[0].id){
+              user.selected=false;
+            }
+          })
+        })
         // this.InitData.manageUser[0].roleName = "普通职员";
         for (var i = 0; i < this.selectedUser.length; i++) {
           if (
@@ -1009,6 +1015,7 @@ export default {
       this.selectedUser = data.listUser;
       this.selectedManageUser = data.manageUser;
       this.isShowSecondPage = true;
+      this.isShowStaffList = false;
       this.isShowFirstPage = false;
       // 这里应该将负责人的selected信息改变
       this.listDept.some(dept=> {
@@ -1060,7 +1067,6 @@ export default {
       *添加职员按钮直接进入 指派职员页面
       */
     aloneAddUserOnlyStaff: function (data) {
-      debugger;
       this.isShowManager=true;
       this.currWorkName = data.folderName;
       if (data.listUser == null) {
@@ -1284,6 +1290,7 @@ export default {
           this.selectedUser.splice(k, 1);
         }
       }
+      this.selectedManageUser.splice(0,1);
       this.cancelCheck(user.id);
       this.toSecondPage();
     },
@@ -1318,6 +1325,7 @@ export default {
           }
         }
       }
+      console.log(this.selectedUser);
       if (this.selectedUser.length > 0 && this.isShowThreePage == true) {
         this.isShowStaffList = true;
       } else {

src/views/components_web/projSetting/projSetting.vue

@@ -907,6 +907,7 @@ import { wrapOssProtocol} from "@/services/oss";
         this.selectedUser = data.listUser;
         this.selectedManageUser = data.manageUser;
         this.isShowSetManager = true;
+        this.isShowStaffList = false;
         this.isShowSetFolder = false;
       },
       /*

vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
     devServer: {
       proxy: {
         '/api/pms': {
-          //target: 'http://47.104.91.134:8089',
-          target:'http://10.240.32.176:8089',
+          target: 'http://47.104.91.134:8089',
+          //target:'http://10.240.32.176:8089',
 
           changeOrigin: true,
           secure: false,