feat:合并

src/views/projectcenter/TaskAdd.vue

@@ -303,7 +303,7 @@
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
-              v-model:EditInvistId = "EditInvistId"
+              v-model:EditInvistId="EditInvistId"
             />
           </div>
           <!-- 添加评估侧弹窗 -->
@@ -325,7 +325,9 @@
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
-                v-model:EditVoteId = "EditVoteId"
+                v-model:EditVoteId="EditVoteId"
+                v-model:voteId = "voteId"
+                v-model:ballotId = "ballotId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -337,7 +339,7 @@
           <div class="onerow">
             <div class="taskmain">任务列表</div>
             <button class="btn" @click="showChangeModal">移动任务到阶段</button>
-            <div class="edit" @click="deleteTaskAll">
+            <div class="edit" @click="showdeAll">
               <img
                 class="editimg"
                 src="../../assets/images/projectadd/delete.png"
@@ -787,6 +789,35 @@
         </div>
       </div>
     </a-modal>
+    <a-modal
+      v-model:visible="deAll"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeDeAll"></div>
+          </div>
+          <div class="body">
+            <span>您确定要批量删除任务吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="closeDeAll">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="deleteTaskAll">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal
       style="padding: 0"
@@ -850,7 +881,6 @@ import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 
-
 const drawercolumns = [
   {
     title: "项目名称",
@@ -920,13 +950,15 @@ export default {
       isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的ids
+      deAll: false,
       EditDiscussId:null,//要编辑的讨论的id
       EditActiveId:null,//要编辑的活动id
       EditWorkId:null, // 要编辑的作业id
       EditTestId: null,// 要编辑的考试id
       EditEvalId:null,
       EditInvistId:null,
-      EditVoteId:null,
+      EditVoteId: null, //编辑需要投票的id
+      ballotId: "", //编辑需要的题干id
       projectTaskId:null, // 要编辑的具体任务id
       projectNameList: [
         {
@@ -1325,7 +1357,6 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-     
               let arr = res.data.data.stageList[0].taskList;
               console.log("任务列表", arr);
               getTableData(arr);
@@ -1353,17 +1384,18 @@ 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) => {
       console.log("添加数据", data);
       getTask(data);
     };
-    
+
     //删除任务
     const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
@@ -1420,8 +1452,11 @@ export default {
           })
           .catch((err) => {
             console.log(err);
+            message.destroy();
+            message.warning("批量删除失败");
           });
       });
+      state.deAll = false;
     };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
@@ -1502,12 +1537,12 @@ export default {
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     };
-   
+
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.projectTaskId = eleId;
-      console.log("active=======",id);
+      console.log("active=======", id);
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
@@ -1519,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;
@@ -1566,6 +1604,8 @@ export default {
         });
       }
       state.selectRow = arr;
+      console.log(state.selectRow, "xuanzhong");
+      console.log(Object.prototype.toString.call(state.selectRow));
       //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
       if (arr.length !== 0) {
         if (arr.length === state.tableData.length) {
@@ -1607,8 +1647,7 @@ export default {
     const changeCourseType = (id) => {
       console.log("任务id", id);
     };
- 
- 
+
     //打开测评的弹窗
     const showEditEvalDrawer = (id, eleId) => {
       console.log("222222222222222222222", id);
@@ -1641,6 +1680,17 @@ export default {
         showDrawerAddTest(id, eleId);
       }
     };
+    const showdeAll = () => {
+      if(state.selectRow.length==0){
+        message.destroy()
+        return message.warning("请选择要删除的任务")
+      }else{
+        state.deAll = true;
+      }
+    };
+    const closeDeAll = () => {
+      state.deAll = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1688,8 +1738,8 @@ export default {
       moveTask,
       deleteTaskAll,
       decideType,
-      
-      
+      showdeAll,
+      closeDeAll,
     };
   },
 };