合并

src/views/projectcenter/TaskAdd.vue

@@ -326,6 +326,8 @@
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
                 v-model:EditVoteId="EditVoteId"
+                v-model:voteId = "voteId"
+                v-model:ballotId = "ballotId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -948,15 +950,16 @@ export default {
       isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的ids
-      EditDiscussId: null, //要编辑的讨论的id
-      EditActiveId: null, //要编辑的活动id
-      EditWorkId: null, // 要编辑的作业id
-      EditTestId: null, // 要编辑的考试id
-      EditEvalId: null,
-      EditInvistId: null,
-      EditVoteId: null,
-      projectTaskId: null, // 要编辑的具体任务id
       deAll: false,
+      EditDiscussId:null,//要编辑的讨论的id
+      EditActiveId:null,//要编辑的活动id
+      EditWorkId:null, // 要编辑的作业id
+      EditTestId: null,// 要编辑的考试id
+      EditEvalId:null,
+      EditInvistId:null,
+      EditVoteId: null, //编辑需要投票的id
+      ballotId: "", //编辑需要的题干id
+      projectTaskId:null, // 要编辑的具体任务id
       projectNameList: [
         {
           id: 1,
@@ -1379,10 +1382,13 @@ export default {
         });
     };
 
-    //获取删除id（投票)
+
+
+    //获取修改、删除id（投票)
     const changeVData = (data) => {
-      console.log("8989", data);
+      console.log("获取修改、删除id投票", data);
       state.voteId = data.voteId;
+      state.ballotId = data.ballotId;
     };
     //数据变化
     const updateTableData = (data) => {
@@ -1548,9 +1554,12 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
+      console.log(id, eleId, '95835325932953295325');
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
+      // voteId = state.voteId;
+      // ballotId = state.ballotId;
     };
     const showConfirm = () => {
       state.confirmModal = true;