feat: 模板阶段编辑,删除,新增。模板任务删除,移动

This commit is contained in:
王熙东
2022-11-22 17:20:40 +08:00
parent a8153029af
commit efdfb705d5
4 changed files with 78 additions and 75 deletions

View File

@@ -6,9 +6,9 @@ export const templateEdit = (obj) => http.post('/admin/project/template/edit',ob
// 模板详情 // 模板详情
export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`); export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`);
// 删除阶段 // 删除阶段
export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id}); export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage?stageId=${id}`);
//删除任务 //删除任务
export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask`,{projectTaskIds:id}); export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask?projectTaskIds=${id}`);
// 移动任务到阶段 // 移动任务到阶段
export const moveTask = (obj) => http.post('/admin/project/template/moveTask',obj); export const moveTask = (obj) => http.post('/admin/project/template/moveTask',obj);
// 新建或编辑阶段 // 新建或编辑阶段

View File

@@ -55,7 +55,7 @@
<div class="onerow"> <div class="onerow">
<div class="taskmain">任务大纲</div> <div class="taskmain">任务大纲</div>
<button class="btn" @click="showFaceIn">批量面授报名</button> <button class="btn" @click="showFaceIn">批量面授报名</button>
<router-link to="/manage/temTask" class="edit"> <router-link to="/temTask" class="edit">
<img <img
class="editimg" class="editimg"
src="../../assets/images/projectadd/edit.png" src="../../assets/images/projectadd/edit.png"
@@ -848,7 +848,7 @@ export default defineComponent({
} }
const toEdit = () => { const toEdit = () => {
routered.push({ routered.push({
path: "/manage/templateAdd", path: "/templateAdd",
query: { query: {
projectId: state.projectId, projectId: state.projectId,
name: state.name, name: state.name,

View File

@@ -149,7 +149,7 @@
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" /> <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div> <div class="pub">保存</div>
<div class="line"></div> --> <div class="line"></div> -->
<router-link to="/manage/taskpage"> <router-link to="/taskpage">
<div style="display: flex"> <div style="display: flex">
<img <img
class="img2" class="img2"
@@ -1041,9 +1041,7 @@
import AddInvist from "../../components/drawers/AddInvist.vue"; import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/vote/AddVote.vue"; import AddVote from "../../components/vote/AddVote.vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import * as api from "../../api/indexTaskadd"; import * as api from "../../api/indexTemplate";
import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable"; 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";
@@ -1317,8 +1315,8 @@
console.log("data", data); console.log("data", data);
data.map((value) => { data.map((value) => {
let obj = { let obj = {
id: value.projectTaskId, id: value.templateTaskId,
key: value.projectTaskId, key: value.templateTaskId,
lei: lei:
value.type == 1 value.type == 1
? "在线" ? "在线"
@@ -1351,7 +1349,7 @@
checked: false, //是否选中类型 checked: false, //是否选中类型
courseId: value.courseId, courseId: value.courseId,
projectId: value.projectId, projectId: value.projectId,
stageId: value.stageId, templateStageId: value.templateStageId,
type: value.type, type: value.type,
}; };
array.push(obj); array.push(obj);
@@ -1365,11 +1363,11 @@
let array = []; let array = [];
data.map((value) => { data.map((value) => {
let obj = { let obj = {
id: value.stageId, id: value.templateStageId,
tit: value.name, tit: value.name,
name: value.remark, name: value.remark,
taskList: value.taskList, taskList: value.taskList,
value: value.stageId, value: value.templateStageId,
label: value.name, label: value.name,
}; };
array.push(obj); array.push(obj);
@@ -1491,8 +1489,7 @@
<span <span
style="color:#4EA6FF;cursor:pointer" style="color:#4EA6FF;cursor:pointer"
onClick={() => { onClick={() => {
showDelete(); showDelete(text.record.id);
state.deleteID = text.record.id;
}} }}
> >
删除 删除
@@ -1508,23 +1505,19 @@
//获取任务列表 //获取任务列表
const getTask = () => { const getTask = () => {
// console.log("state.projectId", state.projectId); state.tableData = []
let obj = {
projectId: state.projectId,
// projectId: 28,
};
api api
.getTask(obj) // .templateDetail(state.projectId || 1)
.templateDetail(1)
.then((res) => { .then((res) => {
if (res.status == 200) { 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.projectTemplateInfo.name;
state.projectTitle = res.data.data.projectInfo.name; state.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.picUrl = res.data.data.projectInfo.picUrl;
let leng = res.data.data.stageList.length; let leng = res.data.data.stageList.length;
if (leng > 0) { if (leng > 0) {
let stage = localStorage.getItem("stageId") let stage = localStorage.getItem("templateStageId")
? localStorage.getItem("stageId") ? localStorage.getItem("templateStageId")
: null; : null;
console.log("zhaodaole", stage); console.log("zhaodaole", stage);
// console.log("stage",Object.prototype.toString.call(stage)) // console.log("stage",Object.prototype.toString.call(stage))
@@ -1532,7 +1525,7 @@
if (stage !== "null") { if (stage !== "null") {
console.log(stage); console.log(stage);
let stageList = res.data.data.stageList; //阶段数组 let stageList = res.data.data.stageList; //阶段数组
let result = stageList.find((item) => item.stageId == stage); let result = stageList.find((item) => item.templateStageId == stage);
console.log("又找到了", result); console.log("又找到了", result);
getTableData(result.taskList); getTableData(result.taskList);
} else { } else {
@@ -1540,7 +1533,7 @@
console.log("任务列表", arr); console.log("任务列表", arr);
getTableData(arr); getTableData(arr);
// state.isActive = true; // state.isActive = true;
changebgc(res.data.data.stageList[0].stageId); changebgc(res.data.data.stageList[0].templateStageId);
} }
// 每次都获取了第一条taskList // 每次都获取了第一条taskList
@@ -1560,13 +1553,13 @@
}); });
} }
//给阶段id赋初始值 //给阶段id赋初始值
let stageid = localStorage.getItem("stageId") let stageid = localStorage.getItem("templateStageId")
? localStorage.getItem("stageId") ? localStorage.getItem("templateStageId")
: null; : null;
if (stageid !== "null") { if (stageid !== "null") {
state.chooseStageId = stageid; state.chooseStageId = stageid;
} else { } else {
state.chooseStageId = leng > 0 ? stagearr[0].stageId : null; state.chooseStageId = leng > 0 ? stagearr[0].templateStageId : null;
} }
} }
}) })
@@ -1589,12 +1582,11 @@
//删除任务 //删除任务
const deleteTask = () => { const deleteTask = () => {
let obj = { projectTaskIds: state.deleteID };
api api
.deleteTask(obj) .deleteTask(state.deleteID)
.then((res) => { .then((res) => {
console.log(res, "gggggggggggggggg"); console.log(res, "gggggggggggggggg");
// deleteVoteText(); getTask()
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
@@ -1624,10 +1616,10 @@
} else { } else {
{ {
let obj = { let obj = {
stageId: state.removeStageId, templateStageId: state.removeStageId,
projectTaskId: state.selectRow, projectTemplateTaskId: state.selectRow,
}; };
apimove api
.moveTask(obj) .moveTask(obj)
.then((res) => { .then((res) => {
console.log("移动成功", res); console.log("移动成功", res);
@@ -1635,7 +1627,7 @@
message.success("移动成功"); message.success("移动成功");
console.log(state.removeStageId); console.log(state.removeStageId);
getTask(); getTask();
localStorage.setItem("stageId", state.chooseStageId); localStorage.setItem("templateStageId", state.chooseStageId);
}) })
.catch((err) => { .catch((err) => {
console.log("移动失败", err); console.log("移动失败", err);
@@ -1648,12 +1640,10 @@
const deleteTaskAll = () => { const deleteTaskAll = () => {
let arr = state.selectRow; let arr = state.selectRow;
console.log("选择的行信息", arr); console.log("选择的行信息", arr);
arr.map((value) => { arr.map(() => {
let obj = {
projectTaskIds: value,
};
api api
.deleteTask(obj) .deleteTask(arr)
.then((res) => { .then((res) => {
console.log(res); console.log(res);
message.destroy(); message.destroy();
@@ -1716,11 +1706,11 @@
if (state.updateStageID) { if (state.updateStageID) {
let obj = { let obj = {
name: state.valuesname, name: state.valuesname,
projectId: state.projectId, projectTemplateId: 1,
remark: state.valuesnotice, remark: state.valuesnotice,
stageId:state.updateStageID, stageId:state.updateStageID,
}; };
apistage api
.editStage(obj) .editStage(obj)
.then((res) => { .then((res) => {
console.log("修改阶段成功", res); console.log("修改阶段成功", res);
@@ -1738,10 +1728,11 @@
} else { } else {
let obj = { let obj = {
name: state.valuesname, name: state.valuesname,
projectId: state.projectId, projectTemplateId: 1,
remark: state.valuesnotice, remark: state.valuesnotice,
stageId:0,
}; };
apistage api
.editStage(obj) .editStage(obj)
.then((res) => { .then((res) => {
console.log("添加阶段成功", res); console.log("添加阶段成功", res);
@@ -1771,11 +1762,8 @@
//删除阶段 //删除阶段
const deleteStage = () => { const deleteStage = () => {
console.log("chapterId", state.deleteStageId); console.log("chapterId", state.deleteStageId);
let obj = { api
stageId: state.deleteStageId, .deleteStage(state.deleteStageId)
};
apistage
.deleteStage(obj)
.then((res) => { .then((res) => {
console.log("删除阶段成功", res); console.log("删除阶段成功", res);
message.success("删除阶段成功"); message.success("删除阶段成功");
@@ -1793,10 +1781,6 @@
getTask(); getTask();
}); });
onUpdated(() => { onUpdated(() => {
// getTask();
// setTimeout(() => {
// getTask();
// }, 500);
}); });
onUnmounted(() => { onUnmounted(() => {
document.getElementsByTagName("main")[0].style.background = "#ffffff"; document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1960,7 +1944,7 @@
name: ele.creater, name: ele.creater,
projectId: ele.projectId, projectId: ele.projectId,
projectTaskId: ele.id, projectTaskId: ele.id,
stageId: ele.stageId, templateStageId: ele.templateStageId,
type: ele.type, type: ele.type,
}; };
api api

View File

@@ -620,8 +620,8 @@ export default {
// }; // };
const errorMsgs = { const errorMsgs = {
name: "请输入项目名称", name: "请输入模板名称",
category: "请选择项目分类", category: "请选择模板分类",
picUrl: "请上传项目封面图", picUrl: "请上传项目封面图",
beginTime: "请选择项目开始时间", beginTime: "请选择项目开始时间",
endTime: "请选择项目结束时间", endTime: "请选择项目结束时间",
@@ -636,6 +636,38 @@ export default {
const createProject = () => { const createProject = () => {
console.log("我要编辑项目", isEdit.value); console.log("我要编辑项目", isEdit.value);
let obj = { let obj = {
"name": state.projectInfo.name,
"category": state.projectInfo.category,
"picUrl": "x",
"beginTime": state.projectInfo.rangevalue || 1,
"endTime": state.projectInfo.rangevalue || 1,
"manager": state.projectInfo.manager,
"managerId": state.projectInfo.managerId || 0,
"sourceBelongId": state.projectInfo.sourceBelongId,
"level": state.projectInfo.level,
"systemId": state.projectInfo.systemId,
"boeFlag": state.projectInfo.boeFlag,
"courseSyncFlag": state.projectInfo.courseSyncFlag,
"notice": "",
"noticeFlag": 0,
"projectTemplateId": 0,
"remark": "",
"status": 0,
};
console.log(obj);
for (let i in errorMsgs) {
console.log(obj[i]);
if (obj[i] === "" || obj[i] === undefined) {
message.destroy();
message.warning(errorMsgs[i]);
return;
}
}
api
.templateEdit({
"beginTime": 0, "beginTime": 0,
"boeFlag": 0, "boeFlag": 0,
"category": 0, "category": 0,
@@ -653,20 +685,7 @@ export default {
"sourceBelongId": 0, "sourceBelongId": 0,
"status": 0, "status": 0,
"systemId": 0 "systemId": 0
}; })
console.log(obj);
for (let i in errorMsgs) {
console.log(obj[i]);
if (obj[i] === "" || obj[i] === undefined) {
message.destroy();
message.warning(errorMsgs[i]);
return;
}
}
api
.templateEdit(obj)
.then((res) => { .then((res) => {
console.log(res); console.log(res);
if (res.status == 200 && res.data.code == 200) { if (res.status == 200 && res.data.code == 200) {
@@ -674,7 +693,7 @@ export default {
message.success("编辑成功"); message.success("编辑成功");
setTimeout(() => { setTimeout(() => {
router.push({ router.push({
path: "/manage/projectmanage", path: "/projectmanage",
}); });
}, 1000); }, 1000);
} else { } else {