diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index f98879e..afeb251 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -149,7 +149,7 @@ public class ActivityCultureApplyActivityController { } return Result.success(); } - if ( tissue.getIsEnrollSystem()) { + if (tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityCultureService.insertOrUpdate(sysHomeActivity); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index 9ba10d9..2d8d4bc 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -137,6 +137,8 @@ public class ActivityCultureAuditActivityController { public Result doReview(@Param("data") String param, String id) { Dict args = Json.fromJson(Dict.class, param); ActivityTissue tissue = activityCultureService.dao().fetch(ActivityTissue.class, id); + tissue.setIsUnseal(true); + activityCultureService.update(tissue); if (args.getInt("submitType") == 1) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityCultureService.insertOrUpdate(sysHomeActivity); diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index f0a4ea0..050380e 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -57,6 +57,20 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { v-model="formData.address"> + + + + + + + + @@ -164,6 +178,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { + - { - const formData = JSON.parse(JSON.stringify(this.formData)) - formData.activity_type = this.activity_type - const {time, applyTime2, plannedDate} = formData - if (applyTime2 && applyTime2.length) { - formData.applyStartTime = applyTime2[0] - formData.applyEndTime = applyTime2[1] - formData.applyTime2 = null - } - if (time && time.length) { - formData.startTime = formData.time[0] - formData.endTime = formData.time[1] - formData.time = null - } - if (plannedDate && plannedDate.length) { - formData.startPlannedDate = formData.plannedDate[0] - formData.endPlannedDate = formData.plannedDate[1] - formData.plannedDate = null - } - this.$axios.post('/platform/activity/culture/applyActivity/submit', { - data: JSON.stringify(formData) - }).then(res => { - if (res.code === 0) { - this.$emit("goBack") - this.$message.success("提交成功") - if (this.activity_type === 40002) { - location.href = "/platform/activity/culture/infoManage/union" - // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") - } else if (this.activity_type === 40003) { - location.href = "/platform/activity/culture/infoManage/club" - // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") - } else { - location.href = "/platform/activity/culture/infoManage/school" - // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + this.$refs["addForm"].validate((valid) => { + if (valid) { + this.$confirm("您确定提交吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const formData = JSON.parse(JSON.stringify(this.formData)) + formData.activity_type = this.activity_type + const {time, applyTime2, plannedDate} = formData + if (applyTime2 && applyTime2.length) { + formData.applyStartTime = applyTime2[0] + formData.applyEndTime = applyTime2[1] + formData.applyTime2 = null } - } - }) + if (time && time.length) { + formData.startTime = formData.time[0] + formData.endTime = formData.time[1] + formData.time = null + } + if (plannedDate && plannedDate.length) { + formData.startPlannedDate = formData.plannedDate[0] + formData.endPlannedDate = formData.plannedDate[1] + formData.plannedDate = null + } + this.$axios.post('/platform/activity/culture/applyActivity/submit', { + data: JSON.stringify(formData) + }).then(res => { + if (res.code === 0) { + this.$emit("goBack") + this.$message.success("提交成功") + if (this.activity_type === 40002) { + location.href = "/platform/activity/culture/infoManage/union" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") + } else if (this.activity_type === 40003) { + location.href = "/platform/activity/culture/infoManage/club" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") + } else { + location.href = "/platform/activity/culture/infoManage/school" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + } + } + }) + }) + } }) }, // 再次提交 onFinishTask() { - this.$confirm("您确定保存吗?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - const formData = JSON.parse(JSON.stringify(this.formData)) - formData.activity_type = this.activity_type - const {time, applyTime2, plannedDate} = formData - if (applyTime2 && applyTime2.length) { - formData.applyStartTime = applyTime2[0] - formData.applyEndTime = applyTime2[1] - formData.applyTime2 = null - } - if (time && time.length) { - formData.startTime = formData.time[0] - formData.endTime = formData.time[1] - formData.time = null - } - if (plannedDate && plannedDate.length) { - formData.startPlannedDate = formData.plannedDate[0] - formData.endPlannedDate = formData.plannedDate[1] - formData.plannedDate = null - } - this.$axios.post('/platform/activity/culture/applyActivity/submitAgain', { - data: JSON.stringify(formData), - taskId: this.taskId - }).then(res => { - if (res.code === 0) { - this.$emit("goBack") - this.$message.success("提交成功") - if (this.activity_type === 40002) { - location.href = "/platform/activity/culture/infoManage/union" - // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") - } else if (this.activity_type === 40003) { - location.href = "/platform/activity/culture/infoManage/club" - // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") - } else { - location.href = "/platform/activity/culture/infoManage/school" - // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + this.$refs["addForm"].validate((valid) => { + if (valid) { + this.$confirm("您确定提交吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const formData = JSON.parse(JSON.stringify(this.formData)) + formData.activity_type = this.activity_type + const {time, applyTime2, plannedDate} = formData + if (applyTime2 && applyTime2.length) { + formData.applyStartTime = applyTime2[0] + formData.applyEndTime = applyTime2[1] + formData.applyTime2 = null } - } - }) + if (time && time.length) { + formData.startTime = formData.time[0] + formData.endTime = formData.time[1] + formData.time = null + } + if (plannedDate && plannedDate.length) { + formData.startPlannedDate = formData.plannedDate[0] + formData.endPlannedDate = formData.plannedDate[1] + formData.plannedDate = null + } + this.$axios.post('/platform/activity/culture/applyActivity/submitAgain', { + data: JSON.stringify(formData), + taskId: this.taskId + }).then(res => { + if (res.code === 0) { + this.$emit("goBack") + this.$message.success("提交成功") + if (this.activity_type === 40002) { + location.href = "/platform/activity/culture/infoManage/union" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") + } else if (this.activity_type === 40003) { + location.href = "/platform/activity/culture/infoManage/club" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") + } else { + location.href = "/platform/activity/culture/infoManage/school" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + } + } + }) + }) + } }) }, async remoteMethod(query) { @@ -968,8 +1001,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { if (data.startPlannedDate) data.plannedDate = [data.startPlannedDate, data.endPlannedDate] this.userData = clone(data.tissuePersonList) data.unionUserNumberLimit = JSON.parse(data.unionUserNumberLimit) - data.undertakeUnitIds = JSON.parse(data.undertakeUnitIds) - data.hostUnitIds = JSON.parse(data.hostUnitIds) + if (data.undertakeUnitIds) data.undertakeUnitIds = JSON.parse(data.undertakeUnitIds) + if (data.hostUnitIds) data.hostUnitIds = JSON.parse(data.hostUnitIds) this.formData = data if (!this.formData.unionUserNumberLimit) { this.getUnionData().then((data) => {