feat:合并

This commit is contained in:
lixg
2022-11-30 23:54:51 +08:00
16 changed files with 983 additions and 976 deletions

View File

@@ -1364,31 +1364,42 @@ export default {
let stage = localStorage.getItem("stageId")
? localStorage.getItem("stageId")
: null;
// console.log("stage",Object.prototype.toString.call(stage))
getStageData(res.data.data.stageList);
if (stage !== "null") {
if (stage != null) {
console.log(stage);
let stageList = res.data.data.stageList; //阶段数组
let result = stageList.find((item) => item.stageId == stage);
console.log("又找到了", result);
if (result != null) {
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);
@@ -1624,6 +1635,7 @@ export default {
console.log("删除阶段成功", res);
message.success("删除阶段成功");
closeDeleteStage();
localStorage.setItem("stageId", "")
getTask();
})
.catch((err) => {