feat:合并

This commit is contained in:
songwc
2022-11-07 17:25:00 +08:00
parent 2f093f96c7
commit fe744abde2
3 changed files with 94 additions and 53 deletions

View File

@@ -191,6 +191,10 @@
<add-ref
v-model:addrefVisible="addrefvisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:isRefEdit="isRefEdit"
v-model:EditRefId="EditRefId"
/>
</div>
<!-- 添加外链侧弹窗 -->
@@ -207,6 +211,10 @@
<div>
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:editDiscussId="editDiscussId"
@changeData="updateTableData"
/>
</div>
@@ -224,6 +232,9 @@
<div>
<add-active
v-model:addactiveVisible="addactivevisible"
v-model:projectId="projectId"
v-model:edit="edit"
v-model:chooseStageId="chooseStageId"
@changeData="updateTableData"
/>
</div>
@@ -242,6 +253,10 @@
<add-eval
v-model:addevalVisible="addevalvisible"
@changeData="updateTableData"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:EditEvalId="EditEvalId"
/>
</div>
<!-- 添加测评侧弹窗 -->
@@ -259,6 +274,9 @@
<add-invist
v-model:addinvistVisible="addinvistvisible"
@changeData="updateTableData"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
</div>
<!-- 添加评估侧弹窗 -->
@@ -275,6 +293,7 @@
<add-vote
v-model:addvoteVisible="addvotevisible"
@changeData="updateTableData"
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
@@ -481,6 +500,7 @@
margin-right: 25px;
cursor: pointer;
"
@click="decideType(element.lei, element.courseId)"
>
编辑
</span>
@@ -1059,6 +1079,7 @@ export default {
cretime: value.duration ? value.duration : "-",
checked1: value.flag ? true : false,
checked: false, //是否选中类型
courseId: value.courseId,
};
array.push(obj);
});
@@ -1648,25 +1669,21 @@ export default {
};
//移动任务到阶段
const moveTask = () => {
let arr = state.selectRow;
console.log("选择的行信息", arr);
arr.map((value) => {
console.log("value:", value);
let obj = {
chapterId: state.chooseStageId,
routerTaskIdList: value,
};
apimove
.moveTask(obj)
.then((res) => {
console.log("移动成功", res);
message.destroy();
message.success("移动成功");
})
.catch((err) => {
console.log("移动失败", err);
});
});
let obj = {
stageId: state.chooseStageId,
projectTaskId: state.selectRow,
};
apimove
.moveTask(obj)
.then((res) => {
console.log("移动成功", res);
message.destroy();
message.success("移动成功");
getTask();
})
.catch((err) => {
console.log("移动失败", err);
});
};
//批量删除
const deleteTaskAll = () => {
@@ -1873,6 +1890,14 @@ export default {
showEditRefDrawer(id);
} else if (type == "直播") {
showEditLiveDrawer(id);
} else if (type == "测评") {
showDrawerAddEval(id);
} else if (type == "评估") {
showDrawerAddInvist(id);
} else if (type == "投票") {
showDrawerAddVote(id);
} else if (type == "讨论") {
showDrawerAddDiscuss(id);
}
};
return {