Merge branch 'dev' of http://47.104.91.134:3000/yiyun-fe/yiyunjianzhu-vue into dev

package-lock.json

@@ -10658,6 +10658,51 @@
       "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
       "dev": true
     },
+    "lottie-vuejs": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npm.taobao.org/lottie-vuejs/download/lottie-vuejs-0.4.0.tgz",
+      "integrity": "sha1-mijCvQ3cQCpDVM6Dpgzxmo+2cq0=",
+      "requires": {
+        "axios": "^0.19.0",
+        "lottie-web": "^5.1.9"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.19.2",
+          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.19.2.tgz",
+          "integrity": "sha1-PqNsXYgY0NX4qKl6bTa4bNwAyyc=",
+          "requires": {
+            "follow-redirects": "1.5.10"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1600502822029&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&sync_timestamp=1597058055564&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz",
+          "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "lottie-web": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npm.taobao.org/lottie-web/download/lottie-web-5.7.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flottie-web%2Fdownload%2Flottie-web-5.7.4.tgz",
+      "integrity": "sha1-OyUhSOkEoKqYM4ef+2SSTIWgiIw="
+    },
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",

src/views/components_web/distWork/distWork.vue

@@ -705,6 +705,7 @@ export default {
       currListDeptUserData:[],
 
       userList: [], // 员工列表
+      finishBtnClickCount: 0,
     };
   },
   created:function(){
@@ -919,7 +920,10 @@ export default {
       *分配完成并关闭窗体
       */
     submitAndClose: function () {
-      this.createFolders();
+      this.finishBtnClickCount ++;
+      if(this.finishBtnClickCount == 1) {
+        this.createFolders();
+      }
     },
     /*
       *编辑自定义工作
@@ -968,17 +972,22 @@ export default {
       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 (
-            // this.selectedUser[i].userID == this.InitData.manageUser[0].userID
-            this.selectedUser[i].id == this.InitData.manageUser[0].id
-          ) {
+          if (this.selectedUser[i].id == this.InitData.manageUser[0].id) {
             this.InitData.manageUser[0].folderPerm = 0;
             this.selectedUser.splice(i, 1);
           }
         }
       }
+
       var listManageUser = [];
       nowUser.folderPerm = 2;
       listManageUser.push(nowUser);
@@ -1009,19 +1018,8 @@ export default {
       this.selectedUser = data.listUser;
       this.selectedManageUser = data.manageUser;
       this.isShowSecondPage = true;
+      this.isShowStaffList = false;
       this.isShowFirstPage = false;
-      // 这里应该将负责人的selected信息改变
-      this.listDept.some(dept=> {
-        if(data.manageUser[0].deptId === dept.id) {
-          dept.listUser.find(user => {
-            if(user.id === data.manageUser[0].id) {
-              //在部门的人员列表里面找到了已经选择的负责人 修改selected状态
-              user.selected = true;
-            }
-          })
-        }
-      })
-      this.listDept = [...this.listDept];
     },
     /**
      * 进入时,重置权限
@@ -1040,6 +1038,7 @@ export default {
                 data.listUser[i].folderPerm;
               this.listDept[j].listUser[k].selected = true;
             }
+
             if(!this.isShowManager)
             {
               // if(this.currUser.accountId == sessionStorage.userId && sessionStorage.accountId == this.listDept[j].listUser[k].userID )
@@ -1060,7 +1059,6 @@ export default {
       *添加职员按钮直接进入 指派职员页面
       */
     aloneAddUserOnlyStaff: function (data) {
-      debugger;
       this.isShowManager=true;
       this.currWorkName = data.folderName;
       if (data.listUser == null) {
@@ -1284,6 +1282,7 @@ export default {
           this.selectedUser.splice(k, 1);
         }
       }
+      this.selectedManageUser.splice(0,1);
       this.cancelCheck(user.id);
       this.toSecondPage();
     },

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,