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

src/views/projectcenter/TaskAdd.vue

@@ -314,6 +314,7 @@
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
                 @changeData="updateTableData"
+                @getData="changeVData"
                 v-model:edit="edit"
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
@@ -1028,6 +1029,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
+      voteId:"", //删除投票id
       deleteID: "",
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
@@ -1300,6 +1302,11 @@ export default {
 
     // }
 
+    //获取删除id（投票)
+    const changeVData = (data) => {
+      console.log("8989", data);
+      state.voteId = data.voteId;
+    }
     //数据变化
     const updateTableData = (data) => {
       console.log("添加数据", data);
@@ -1545,7 +1552,8 @@ export default {
       api
         .deleteTask(obj)
         .then((res) => {
-          console.log(res);
+          console.log(res,'gggggggggggggggg');
+          // deleteVoteText();
         })
         .catch((err) => {
           console.log(err);
@@ -1555,7 +1563,7 @@ export default {
     //删除投票信息
     const deleteVoteText = () => {
       let obj = {
-        voteId: "",
+        voteId: state.voteId,
       };
       apivote
         .deleteVoteMessage(obj)
@@ -1911,6 +1919,7 @@ export default {
       deleteTask,
       editStage,
       updateTableData,
+      changeVData,
       changeRow,
       selectRowAll,
       changeCourseType,