diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 655b7a3f..030878b3 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -9,7 +9,8 @@ >
-
添加活动
+
编辑活动
+
添加活动
{ ctx.emit("update:addactiveVisible", false); + ctx.emit("update:edit", false); state.radioV1 = ""; state.inputV1 = ""; state.inputV2 = ""; diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 8c92c0e3..2dea4b15 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -123,6 +123,10 @@ export default { chooseStageId: { type: Number, default: null, + }, + editDiscussId: { + type: Number, + default: null, } }, setup(props, ctx) { @@ -156,13 +160,24 @@ export default { createTime: "", //创建时间 createUser: 0, //创建人 discussFlag: "", //活动逻辑删除标识 - discussId: 0, //讨论Id + discussId: props.editDiscussId == null ? 0 : props.editDiscussId, //讨论Id discussTag: "", //是否必修的标识 updateTime: "", //更新时间 updateUser: 0, //更新人 projectId: 0, //项目id }; - api + if(props.edit){ + //console.log("编辑"); + api + .updateDiscuss(obj) + .then((res) => { + console.log("编辑成功", res); + message.success("编辑成功"); + closeDrawer(); + }) + .catch((err) => console.log(err)); + }else{ + api .createDiscuss(obj) .then((res) => { console.log("创建成功", res); @@ -175,7 +190,7 @@ export default { if(props.isStudiscuss){ let editObj1 = { chapterId:props.isactive, - courseId: 0, + courseId: res.data.data.discussId, duration: 0, flag: true, name: obj.discussName, @@ -193,7 +208,7 @@ export default { console.log("项目添加讨论"); apiTask .addTask({ - courseId: 0, + courseId: res.data.data.discussId, duration: 0, flag: true, name: obj.discussName, @@ -217,6 +232,8 @@ export default { .catch((err) => { console.log("创建失败", err); }); + } + }; return { ...toRefs(state), diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index a978fea0..d5cd61a6 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -212,6 +212,7 @@ v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" + v-model:editDiscussId="editDiscussId" @changeData="updateTableData" />
@@ -230,6 +231,7 @@ @@ -1958,6 +1960,9 @@ export default { else if (type == "讨论") { showDrawerAddDiscuss(id) } + else if (type == "活动") { + showDrawerAddActive(id) + } } return { ...toRefs(state),