Browse Source

部门任务bug修改

liuhj 6 days ago
parent
commit
c68285f854
2 changed files with 21 additions and 8 deletions
  1. 0 1
      src/components/system/AssignTasks.vue
  2. 21 7
      src/components/system/TaskList.vue

+ 0 - 1
src/components/system/AssignTasks.vue

@@ -234,7 +234,6 @@ export default {
                         id: that.id,
                     }
                 }).then(function (res) {
-                    console.log(res)
                     if(res.data.code==200){
                         that.taskform.department=res.data.data.depId;
                         that.taskform.taskname=res.data.data.taskName;

+ 21 - 7
src/components/system/TaskList.vue

@@ -590,16 +590,30 @@ export default {
         taskedit(index,val){
             // this.$router.push({path: '/home/AssignTasks?id='+val.id+''});
             // this.$router.push({path: '/home/MyTasksinif?id='+val.id+''});
-            
-            if(val.createUserName==this.cnName){
-                this.$router.push({path: '/home/AssignTasks?id='+val.id+''});
-            }else{
-                if(val.participant.indexOf(this.cnName)!=-1){
-                    this.$router.push({path: '/home/MyTasksinif?id='+val.id+''});
-                }else{
+            if (val.editPerm) {
+                this.$router.push({ path: '/home/AssignTasks?id=' + val.id + '' });
+            } else {
+                if (val.participant.indexOf(this.cnName) != -1) {
+                    this.$router.push({ path: '/home/MyTasksinif?id=' + val.id + '' });
+                } else {
                     this.$message.error("此任务被指派人没有此账号!");
                 }
             }
+            
+            // if(val.createUserName==this.cnName){
+            //     this.$router.push({path: '/home/AssignTasks?id='+val.id+''});
+            // }else{
+                
+            //     if(val.editPerm){
+            //         this.$router.push({path: '/home/AssignTasks?id='+val.id+''});
+            //     }else{
+            //         if(val.participant.indexOf(this.cnName)!=-1){
+            //             this.$router.push({path: '/home/MyTasksinif?id='+val.id+''});
+            //         }else{
+            //             this.$message.error("此任务被指派人没有此账号!");
+            //         }
+            //     }
+            // }
         },
         //基础数据原
         PostTaskAllocationInit(){