kuaifan 5 年之前
父節點
當前提交
5e9d16711e

+ 3 - 3
app/Http/Controllers/Api/ProjectController.php

@@ -557,7 +557,7 @@ class ProjectController extends Controller
         //
         $levels = [];
         $logArray = [];
-        $upLevel = [];
+        $taskLevel = [];
         foreach ($newSort AS $sort => $item) {
             list($newLevel, $newTask) = explode(':', $item);
             list($oldLevel, $oldTask) = explode(':', $oldSort[$sort]);
@@ -597,7 +597,7 @@ class ProjectController extends Controller
                                     'title' => $task['title'],
                                 ])
                             ];
-                            $upLevel[] = [
+                            $taskLevel[] = [
                                 'id' => $task['id'],
                                 'level' => $newLevel,
                             ];
@@ -620,7 +620,7 @@ class ProjectController extends Controller
         //
         return Base::retSuccess('保存成功!', [
             'levels' => $levels,
-            'levelTask' => $upLevel,
+            'taskLevel' => $taskLevel,
         ]);
     }
 

+ 1 - 1
resources/assets/js/main/mixins/project.js

@@ -75,7 +75,7 @@ export default {
                             setTimeout(() => {
                                 if (res.ret === 1) {
                                     this.$Message.success(res.msg);
-                                    $A.triggerTaskInfoListener('deleteproject', projectid);
+                                    $A.triggerTaskInfoListener('deleteproject', {projectid: projectid});
                                 }else{
                                     this.$Modal.error({title: this.$L('温馨提示'), content: res.msg });
                                 }

+ 1 - 1
resources/assets/js/main/pages/project-panel.vue

@@ -577,7 +577,7 @@
                                 setTimeout(() => {
                                     if (res.ret === 1) {
                                         this.$Message.success(res.msg);
-                                        $A.triggerTaskInfoListener('deletelabel', item.id);
+                                        $A.triggerTaskInfoListener('deletelabel', {labelid: item.id});
                                     } else {
                                         this.$Modal.error({title: this.$L('温馨提示'), content: res.msg });
                                     }

+ 9 - 5
resources/assets/js/main/pages/project.vue

@@ -364,26 +364,30 @@
             this.getLists(true);
             $A.setOnTaskInfoListener((act, detail) => {
                 switch (act) {
-                    case "complete":    // 标记完成
+                    case 'deleteproject':   // 删除项目
+                    case 'deletelabel':     // 删除分类
+                        this.getLists(true);
+                        break;
+                    case "complete":        // 标记完成
                         this.lists.some((item) => {
                             if (item.id == detail.projectid) {
                                 item.complete++;
                                 item.unfinished--;
                                 return true;
                             }
-                        })
+                        });
                         break;
-                    case "unfinished":  // 标记未完成
+                    case "unfinished":      // 标记未完成
                         this.lists.some((item) => {
                             if (item.id == detail.projectid) {
                                 item.complete--;
                                 item.unfinished++;
                                 return true;
                             }
-                        })
+                        });
                         break;
                 }
-            });
+            }, true);
         },
         deactivated() {
             this.addShow = false;

+ 11 - 2
resources/assets/js/main/pages/todo.vue

@@ -373,6 +373,15 @@
                 this.refreshTask();
             });
             $A.setOnTaskInfoListener((act, detail) => {
+                switch (act) {
+                    case 'deleteproject':   // 删除项目
+                    case 'deletelabel':     // 删除分类
+                        this.refreshTask();
+                        return;
+                    case 'tasklevel':
+                        return;
+                }
+                //
                 for (let level in this.taskDatas) {
                     this.taskDatas[level].lists.some((task, i) => {
                         if (task.id == detail.id) {
@@ -441,7 +450,7 @@
                         this.taskSortData = this.getTaskSort();
                         break;
                 }
-            });
+            }, true);
         },
         computed: {
 
@@ -649,7 +658,7 @@
                     success: (res) => {
                         if (res.ret === 1) {
                             this.$Message.success(res.msg);
-                            $A.triggerTaskInfoListener('leveltask', res.data.levelTask);
+                            $A.triggerTaskInfoListener('tasklevel', res.data.taskLevel);
                         } else {
                             this.refreshTask();
                             this.$Modal.error({title: this.$L('温馨提示'), content: res.msg});