diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index c050de77..f6f3b511 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -281,7 +281,7 @@ export default { .addTask({ courseId: state.apiTaskList[i].casesId, name: state.apiTaskList[i].title, - projectTemplateId: props.projectTemplateId, + projectId: props.projectId, projectTaskId: props.projectTaskId, stageId: Number(props.chooseStageId), type: 3, @@ -305,7 +305,7 @@ export default { duration: 0, flag: true, name: state.apiTaskList[i].caseName, - projectId: props.projectId, + projectTaskId: props.projectTaskId, projectTemplateId: props.projectTemplateId, stageId: props.chooseStageId || 0, type: 3, diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 6ba63ad6..9ceaf882 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -608,7 +608,7 @@ export default { editPlan(obj) .then((res) => { message.destroy(); - message.error(`添加成功`); + message.sucsess(`添加成功`); updateTask(res); ctx.emit("changeData", false); closeDrawer(); diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index f1411773..fcd6d625 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -364,7 +364,7 @@ export default { let editObj = { courseId: res.data.data.workId, name: res.data.data.workName, - projectId: props.EditWorkId > 0 ? props.projectId : 0, + projectId: props.projectId , projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0 , type: 4, diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 8785f24a..5aa04497 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -386,7 +386,7 @@ export default { } let obj = { - voteId: props.edit?state.EditVoteId : 0, + voteId: props.edit?props.EditVoteId : 0, voteName: state.inputV1, voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue index 36ff6937..b15c9424 100644 --- a/src/views/projectcenter/ClassAdd.vue +++ b/src/views/projectcenter/ClassAdd.vue @@ -13,7 +13,7 @@
-
+
s
item.stageId == stage); console.log("又找到了", result); if(result!=null){ getTableData(result.taskList); + }else{ + //没有选中的阶段时,获取全部的任务 + console.log(stage); + let stageList = res.data.data.stageList; //阶段数组 + if(stageList!=null){ + let taskListAll; + stageList.forEach((item) => { + taskListAll=[...item.taskList]; + }); + console.log("taskListAll",taskListAll); + getTableData(taskListAll); + } } - } else { - //没有选中的阶段时,获取全部的任务 + } else{ console.log(stage); - let stageList = res.data.data.stageList; //阶段数组 - if(stageList!=null){ - let taskListAll =null; - stageList.forEach((item) => { - taskListAll =[taskListAll,...item.taskList]; - }); - console.log("taskListAll",taskListAll); - getTableData(taskListAll); - } - + let stageList = res.data.data.stageList; //阶段数组 + if(stageList!=null){ + let taskListAll; + stageList.forEach((item) => { + taskListAll=[...item.taskList]; + }); + console.log("taskListAll",taskListAll); + getTableData(taskListAll); + } } - // 每次都获取了第一条taskList // let arr = res.data.data.stageList[0].taskList; // console.log("任务列表", stage, arr); @@ -1628,6 +1637,7 @@ export default { console.log("删除阶段成功", res); message.success("删除阶段成功"); closeDeleteStage(); + localStorage.setItem("stageId", "") getTask(); }) .catch((err) => {