feat:合并

src/views/projectcenter/TaskAdd.vue

@@ -866,6 +866,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
+      deleteID: "",
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -883,6 +884,7 @@ export default {
       data.map((value) => {
         let obj = {
           id: value.projectTaskId,
+          key: value.projectTaskId,
           lei:
             value.type == 1
               ? "在线"
@@ -907,8 +909,8 @@ export default {
               : value.type == 12
               ? "投票"
               : "-",
-          creater: value.name == "" ? "管理者课程" : "-",
-          cretime: value.duration,
+              creater: value.name,
+          cretime: value.duration ? value.duration : "-",
           checked1: value.flag ? true : false,
         };
         array.push(obj);
@@ -1032,7 +1034,7 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
-                      deleteEvalText();
+                      state.deleteID = text.record.id;
                     }}
                   >
                     删除
@@ -1359,6 +1361,19 @@ export default {
         });
     };
 
+        //删除任务
+        const deleteTask = () => {
+      let obj = { projectTaskIds: state.deleteID };
+      api
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+
     //删除投票信息
     const deleteVoteText = () => {
       let obj = {
@@ -1380,19 +1395,20 @@ export default {
     //编辑投票信息
     const editVotePath = () => {
       let obj = {
-        appraiseEndTime: "",
-        appraiseExplain: "",
-        appraiseFlag: "",
-        appraiseId: 0,
-        appraiseName: "",
-        appraiseStartTime: "",
-        appraiseTag: "",
+        baseVote: "",
         createTime: "",
         createUser: 0,
-        researchId: 0,
-        researchName: "",
+        stem: "",
+        stemId: 0,
         updateTime: "",
         updateUser: 0,
+        voteEndTime: "",
+        voteExplain: "",
+        voteFlag: "",
+        voteId: 0,
+        voteName: "",
+        voteStartTime: "",
+        voteTag: "",
       };
       apivote
         .editVote(obj)
@@ -1431,6 +1447,7 @@ export default {
     const showModal1 = () => {
       //关闭确认框
       state.deleteModal = false;
+      deleteTask();
     };
     const closeModal = () => {
       state.stage = false;
@@ -1557,6 +1574,7 @@ export default {
       editInvistPath,
       editVotePath,
       getTableData,
+      deleteTask,
     };
   },
 };