diff --git a/src/api/indexActivity.js b/src/api/indexActivity.js
index c7fac455..8adaca20 100644
--- a/src/api/indexActivity.js
+++ b/src/api/indexActivity.js
@@ -12,6 +12,9 @@ export const deleteActivity = (obj) => http.post('/activity/deleteActivity', { p
//修改活动接口
export const updateActivity = (obj) => http.post('/activity/updateActivity', obj);
+//修改阶段任务信息
+export const updateTask=(obj)=>http.post('/admin/project/editTask',obj)
+
//修改活动是否为必修接口
export const updateActivityToCompulsory = (obj) => http.post('/activity/updateActivityToCompulsory', { params: obj });
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 030878b3..a520aab3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -17,7 +17,7 @@
@click="closeDrawer"
/>
-
-
-
-
+
+
+
@@ -277,6 +277,14 @@ export default {
edit: {
type: Boolean,
default: false,
+ },
+ editActivityId: {
+ type: Boolean,
+ default: false,
+ },
+ projectTaskId: {
+ type: Boolean,
+ default: false,
}
},
setup(props, ctx) {
@@ -309,13 +317,44 @@ export default {
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
+ console.log("活动ID",props.editActivityId);
+ console.log("项目中任务ID",props.projectTaskId);
+ if(bool){
+ if(props.isStudiscuss == false){
+ if(props.edit){
+ //编辑讨论
+ console.log("props.editActivityId",props.editActivityId)
+ let obj = {
+ activityId: props.editActivityId,
+ }
+ api.getActivity(obj).then(res => {
+ console.log('获取讨论信息成功',res.data.data)
+
+ //更新讨论信息
+ state.inputV1 = res.data.data.activityName;
+ state.textV1 = res.data.data.activityNotice;
+ state.textV2 = res.data.data.activityExplain;
+ state.inputV2 = res.data.data.activityDuration;
+ state.inputV3 = res.data.data.activityAddress;
+ state.inputV5 = res.data.data.afterSignIn;
+ state.inputV4 = res.data.data.beforeSignIn;
+ state.radioV1 = res.data.data.standardSettings;
+ state.time[0] = res.data.data.activityStartTime;
+ state.time[1] = res.data.data.activityEndTime;
+ console.log(state.time[0])
+ }).catch(err=>{
+ console.log('获取讨论信息失败',err)
+ })
+
+ }
+ }
+ }
};
const cloradio1 = (value) => {
if (value != "") {
state.radioV1 = "";
}
};
-
//创建活动
const createActivity = () => {
if(!state.inputV1){
@@ -352,14 +391,16 @@ export default {
activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5, //活动开始后多少分钟签到
beforeSignIn: state.inputV4, //活动开始前多少分钟签到
- createTime: "", //创建时间
- createUser: 0, //创建人
signOutTime: state.inputV6, //签退开始时间
standardSettings: state.radioV1, //标准设置
- updateTime: "", //更新时间
- updateUser: 0, //更新人
+
};
- api
+ if(props.edit){
+ //更新编辑活动信息
+ updateActivity();
+ }else{
+ //新建活动信息
+ api
.createActivity(obj)
.then((res) => {
console.log("创建成功", res);
@@ -396,7 +437,7 @@ export default {
}else{
apiTask
.addTask({
- courseId: 0,
+ courseId: res.data.data.activityId,
duration: obj.activityDuration,
flag: true,
name: obj.activityName,
@@ -421,8 +462,36 @@ export default {
.catch((err) => {
console.log("创建失败",err);
})
+ }
+
+ };
+ //更新编辑活动信息
+ const updateActivity = (obj) => {
+ console.log("编辑");
+ api.updateActivity(obj)
+ .then((res) => {
+ console.log("更新成功",res);
+ let taskObj = {
+ courseId: res.data.data.activityId,
+ duration: obj.activityDuration,
+ flag: true,
+ name: obj.activityName,
+ projectId: props.projectId,
+ projectTaskId: props.projectTaskId,
+ stageId: 0,
+ type: 9,
+ }
+ api.updateTask(taskObj).then((res)=> {
+ console.log("更新任务列表成功",res);
+ })
+ .catch((err)=> {
+ console.log("更新任务列表失败",err);
+ })
+ })
+ .catch((err) => {
+ console.log("更新失败",err);
+ })
};
-
return {
...toRefs(state),
afterVisibleChange,
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 5005158b..ccaaad30 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -130,6 +130,10 @@ export default {
editDiscussId: {
type: Number,
default: null,
+ },
+ projectTaskId: {
+ type: Number,
+ default: null,
}
},
setup(props, ctx) {
@@ -150,6 +154,7 @@ export default {
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
+ console.log("项目任务ID",props.projectTaskId);
if(bool){
if(props.isStudiscuss == false){
if(props.edit){
@@ -157,6 +162,7 @@ export default {
console.log("props.editDiscussId",props.editDiscussId)
let formData = new FormData();
formData.append('discussId',props.editDiscussId);
+ console.log("formData",formData);
api.getDiscussDetail(formData).then(res => {
console.log('获取讨论信息成功',res.data.data)
//更新讨论信息
@@ -256,12 +262,13 @@ export default {
api
.updateDiscuss(obj)
.then((res)=> {
- console.log("更新成功",res)
+ console.log("更新成功",res);
+ console.log("项目任务ID",props.projectTaskId)
let taskObj={
courseId: res.data.data.discussId,
name: obj.discussName,
projectId: props.projectId,
- projectTaskId: "",
+ projectTaskId: props.projectTaskId,
stageId: props.stageId,
type: 8,
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index af9b07db..9ecf5d78 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -236,6 +236,7 @@
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:editDiscussId="editDiscussId"
+ v-model:projectTaskId="projectTaskId"
@changeData="updateTableData"
/>
@@ -254,6 +255,8 @@