--项目 阶段修改

This commit is contained in:
yuping
2022-12-04 17:51:53 +08:00
parent a38ca44e6f
commit a09bbd6fde
3 changed files with 962 additions and 951 deletions

View File

@@ -1526,6 +1526,7 @@ export default {
onClick={() => {
router.push({
path: "/taskpage",
query: {projectId: value.record.projectId}
});
storage.set("projectId", value.record.projectId);
}}

View File

@@ -1027,7 +1027,7 @@
</template>
<script>
import {reactive, toRefs, onMounted, onUnmounted, onUpdated} from "vue";
import {reactive, toRefs, onMounted, onUnmounted, onUpdated, watch} from "vue";
import AddOnline from "../../components/drawers/AddOnline.vue";
import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import AddCase from "../../components/drawers/AddCase.vue";
@@ -1048,7 +1048,7 @@ import draggable from "vuedraggable";
import {storage} from "../../api/storage";
// import UnlockMode from "../../components/drawers/UnlockMode.vue";
// import * as api1 from "../../api/index1";
import {useRouter} from "vue-router";
import {useRoute, useRouter} from "vue-router";
export default {
name: "TaskAdd",
@@ -1070,10 +1070,9 @@ export default {
},
setup() {
const router = useRouter();
const route = useRoute();
const state = reactive({
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
: null,
projectId: route.query.projectId,
chooseStageId: null,
removeStageId: null,
edit: false,
@@ -1160,6 +1159,10 @@ export default {
console.log("visible", bool);
};
watch(route, () => {
console.log(route)
})
// 把数据放到state里
const getTableData = (tableData) => {
let data = tableData;
@@ -1360,90 +1363,86 @@ export default {
//获取任务列表
const getTask = async () => {
// console.log("state.projectId", state.projectId);
let obj = {
projectId: state.projectId,
// projectId: 28,
};
await api
.getTask(obj)
.then((res) => {
if (res.status == 200) {
console.log("22222", res.data.data.stageList);
// console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList;
let leng = res.data.data.stageList.length;
if (leng > 0) {
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) {
console.log(stage);
let stageList = res.data.data.stageList; //阶段数组
let result = stageList.find((item) => 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 {
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);
}
}
// 每次都获取了第一条taskList
// let arr = res.data.data.stageList[0].taskList;
// console.log("任务列表", stage, arr);
// getTableData(arr);
}
// //获取阶段列表
let stagearr = res.data.data.stageList;
// let arrlist = state.curLevel;
console.log(stagearr, 111111);
if (stagearr.length > 0) {
getStageData(stagearr);
// stagearr.map((value) => {
// console.log(value);
// // arrlist.push(value);
// });
}
//给阶段id赋初始值
let stageid = localStorage.getItem("stageId")
? localStorage.getItem("stageId")
: null;
if (stageid !== "null") {
state.chooseStageId = stageid;
} else {
state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
}
let final = state.level.find((item) => item.id == state.chooseStageId);
getTableData(final.taskList);
}
console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList);
updateStageChoosd()
// let leng = res.data.data.stageList.length;
// if (leng > 0) {
// let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
//
// // console.log("stage",Object.prototype.toString.call(stage))
// 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) {
// 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 {
// 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);
// }
// }
// // 每次都获取了第一条taskList
// // let arr = res.data.data.stageList[0].taskList;
// // console.log("任务列表", stage, arr);
// // getTableData(arr);
// }
// // //获取阶段列表
// let stagearr = res.data.data.stageList;
// // let arrlist = state.curLevel;
// console.log(stagearr, 111111);
// if (stagearr.length > 0) {
// getStageData(stagearr);
// // stagearr.map((value) => {
// // console.log(value);
// // // arrlist.push(value);
// // });
// }
// //给阶段id赋初始值
// let stageid = localStorage.getItem("stageId")
// ? localStorage.getItem("stageId")
// : null;
// if (stageid !== "null") {
// state.chooseStageId = stageid;
// } else {
// state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
// }
// let final = state.level.find((item) => item.id == state.chooseStageId);
// getTableData(final.taskList);
})
.catch((err) => {
console.log("获取任务列表失败", err);
});
};
//获取修改、删除id投票)
@@ -1459,18 +1458,28 @@ export default {
};
//删除任务
const deleteTask = () => {
let obj = {projectTaskIds: state.deleteID};
api
.deleteTask(obj)
.then((res) => {
console.log(res);
})
.catch((err) => {
console.log(err);
});
const deleteTask = async () => {
await api.deleteTask({projectTaskIds: state.deleteID})
//删除后更新索引
};
function updateStageChoosd() {
console.log('updateStageChoosd')
console.log(state.chooseStageId)
if (state.chooseStageId && state.stageList.find(e => e.stageId == state.chooseStageId)) {
getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
return
}
state.chooseStageId = ''
const arr = state.stageList.filter(e => e.name);
arr && arr.length && (state.chooseStageId = arr[0].stageId);
if (!state.chooseStageId) {
getTableData(state.stageList[0].taskList)
return
}
getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
}
const showChangeModal = () => {
if (state.selectRow.length == 0) {
message.destroy();
@@ -1771,7 +1780,7 @@ export default {
state.selectAll = 0; //0未选择1全选2部分选择
console.log("state.level", id, state.level);
state.chooseStageId = id;
let final = state.level.find((item) => item.id === id);
let final = state.level.find((item) => item.id == id);
getTableData(final.taskList);
};

File diff suppressed because it is too large Load Diff