From 2409380d4bd0040724729fa5b179f2dffc15cedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 18 Jul 2022 01:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmTask/XmTaskAgileKanban.vue      | 32 +++++++++++++++++--
 src/views/xm/core/xmTask/XmTaskMng.vue        |  7 ++--
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
index 9e1203aa..cb979377 100644
--- a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
+++ b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
@@ -67,6 +67,7 @@
                     v-for="(task, t) in tasks[scope.row.menuId][tt]"
                     :key="task.id + t"
                   >
+				  	<span class="cell-bar"><el-button type="danger" icon="el-icon-delete" plain @click="handleDel(task,tt)"></el-button></span>
                     <span>
                       {{ task.sortLevel }}&nbsp;<el-tag
                         title="优先级"
@@ -191,7 +192,7 @@
 <script>
 import util from "@/common/js/util"; //全局公共库
 import draggable from "vuedraggable";
-import { initDicts, editXmTaskSomeFields, addTask } from "@/api/xm/core/xmTask";
+import { initDicts, editXmTaskSomeFields, addTask,delXmTask } from "@/api/xm/core/xmTask";
 import XmTaskEdit from "./XmTaskEdit"; //修改界面
 import XmPhaseSelect from "../xmTask/XmPhaseSelect.vue";
 
@@ -204,7 +205,7 @@ export default {
 
   data() {
     return {
-		load:{add:false,edit:false,list:false},
+		load:{add:false,edit:false,list:false,del:false},
       editForm: {
         id: "",
         name: "",
@@ -580,7 +581,7 @@ export default {
             this.load.add = false;
             var tips = res.data.tips;
             if (tips.isOk) {
-              this.$emit("submit", res.data.data); //  @submit="afterAddSubmit"
+              //this.$emit("submit", res.data.data); //  @submit="afterAddSubmit"
               this.xmTasks.push(res.data.data);
             }
             this.$notify({
@@ -617,6 +618,31 @@ export default {
       this.addForm.ptype = "0";
       this.addFormVisible = true;
     },
+	
+    //删除xmTask
+    handleDel: function (row, index) {
+      this.$confirm("确认删除该记录吗?", "提示", {
+        type: "warning",
+      }).then(() => {
+        this.load.del = true;
+        let params = Object.assign({}, row);
+        delXmTask(params)
+          .then((res) => {
+            this.load.del = false;
+            var tips = res.data.tips;
+            if (tips.isOk) { 
+				var index=this.xmTasks.findIndex(k=>k.id==row.id)
+				this.xmTasks.splice(index,1)
+             }
+            this.$notify({
+              showClose: true,
+              message: tips.msg,
+              type: tips.isOk ? "success" : "error",
+            });
+          })
+          .catch((err) => (this.load.del = false));
+      });
+    },
   },
   mounted() {
     initDicts(this);
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index c3940137..8847c1a7 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -997,8 +997,8 @@ export default {
         pageSize: this.queryScope==='plan' || this.queryScope==='planTask'?50:20, //每页数据
         count: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
-        orderFields: ["sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段
-        orderDirs: ["asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+        orderFields: ['menu_id',"sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段
+        orderDirs: ["asc","asc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
       },
       load: { list: false, edit: false, del: false, add: false,calcProgress:false, }, //查询中...
       sels: [], //列表选中数据
@@ -1364,6 +1364,7 @@ export default {
       this.taskTemplateVisible = true;
     },
     checkCanAdd( parentTask){
+      /** 
       if(!parentTask||!parentTask.id){
          this.$notify({
               showClose: true,
@@ -1371,7 +1372,7 @@ export default {
               type: "warning",
             });
             return false;
-      }
+      } **/
       if(parentTask && parentTask.id){
         if(parentTask.ntype=='0'){
            this.$notify({