hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

--项目 阶段修改

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/projectcenter/ProjectManage.vue
View File

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

183
src/views/projectcenter/TaskAdd.vue
View File

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

19
src/views/projectcenter/TaskPage.vue
View File

@@ -323,8 +323,8 @@
<!-- <button class="btn" @click="showFaceIn" v-if="morFaceT"> <!-- <button class="btn" @click="showFaceIn" v-if="morFaceT">
批量面授报名 批量面授报名
</button> --> </button> -->
<router-link to="/taskadd"> <router-link :to="{path:`/taskadd`,query:{projectId:projectId}}">
<button to="/taskadd" class="edit"> <button class="edit">
<img <img
class="editimg" class="editimg"
src="../../assets/images/projectadd/edit.png" src="../../assets/images/projectadd/edit.png"
@@ -367,9 +367,10 @@
/> />
<div></div> <div></div>
</template> </template>
<template v-for="(value, index) in taskSyllabus">
<a-collapse-panel <a-collapse-panel
v-for="(value, index) in taskSyllabus"
:key="index" :key="index"
v-if="value.name"
:header="value.name" :header="value.name"
> >
<div <div
@@ -532,10 +533,11 @@
</div> </div>
</div> </div>
</a-collapse-panel> </a-collapse-panel>
</template>
</a-collapse> </a-collapse>
<!-- 无数据创建任务 v-if="taskSyllabus.length == 0"--> <!-- 无数据创建任务 v-if="taskSyllabus.length == 0"-->
<router-link <router-link
to="/taskadd" :to="{path:`/taskadd`,query:{projectId:projectId}}"
class="taskbox" class="taskbox"
style=" style="
background: linear-gradient(180deg, #ddeaff, #f0f8fe); background: linear-gradient(180deg, #ddeaff, #f0f8fe);
@@ -564,7 +566,7 @@
class="taskbox" class="taskbox"
@click=" @click="
() => { () => {
routered.push({ path: '/taskadd' }); routered.push({ path: `/taskadd`,query:{projectId:projectId} });
} }
" "
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -1795,11 +1797,10 @@ export default {
}, },
setup() { setup() {
const store = useStore(); const store = useStore();
const route = useRoute();
const state = reactive({ const state = reactive({
loading: false, loading: false,
projectId: storage.get("projectId") projectId: route.query.projectId,
? JSON.parse(storage.get("projectId"))
: null,
isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null, isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
// pN: storage.get("pN") ? JSON.parse(storage.get("pN")) : null, // pN: storage.get("pN") ? JSON.parse(storage.get("pN")) : null,
pN: storage.get("pN"), pN: storage.get("pN"),
@@ -2457,7 +2458,7 @@ export default {
//任务大纲渲染 //任务大纲渲染
const getTaskList = () => { const getTaskList = () => {
let objtl = { let objtl = {
projectId: storage.get("projectId"), projectId: state.projectId,
}; };
apitl apitl
.getProjectDetail(objtl) .getProjectDetail(objtl)