Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/projectcenter/TaskAdd.vue

@@ -208,6 +208,8 @@
           <div>
             <add-discuss
               v-model:adddiscussVisible="adddiscussvisible"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
               @changeData="updateTableData"
             />
           </div>
@@ -225,6 +227,8 @@
           <div>
             <add-active
               v-model:addactiveVisible="addactivevisible"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
               @changeData="updateTableData"
             />
           </div>
@@ -1012,10 +1016,10 @@ export default {
         .editStage(obj)
         .then((res) => {
           console.log("添加阶段成功", res);
-          (state.valuesname = ""),
-            (state.valuesnotice = ""),
-            (state.stage = false);
-          message.default();
+          state.valuesname = "",
+          state.valuesnotice = "",
+          state.stage = false;
+          message.destroy();
           message.success("添加阶段成功");
         })
         .catch((err) => {
@@ -1720,13 +1724,13 @@ export default {
         console.log("value:", value);
         let obj = {
           chapterId: state.chooseStageId,
-          routerTaskIdList: [],
-        };
+          routerTaskIdList: value,
+        }
         apimove
           .moveTask(obj)
           .then((res) => {
-            console.log("移动成功", res);
-            message.default();
+            console.log("移动成功",res);
+            message.destroy();
             message.success("移动成功");
           })
           .catch((err) => {
@@ -1743,15 +1747,18 @@ export default {
           projectTaskIds: value,
         };
         api
-          .deleteTask(obj)
-          .then((res) => {
-            console.log(res);
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      });
-    };
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+          message.destroy();
+          message.success("批量删除成功");
+          getTask();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      })
+    }
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;