c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-11-01 11:19:19 +08:00
parent fc5d6c21b7
commit 7216481a1a
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class ActivityCultureApplyActivityController {
} }
return Result.success(); return Result.success();
} }
if (tissue.getIsUnseal()!=null && tissue.getIsUnseal() && tissue.getIsEnrollSystem()) { if ( tissue.getIsEnrollSystem()) {
Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
activityCultureService.insertOrUpdate(sysHomeActivity); activityCultureService.insertOrUpdate(sysHomeActivity);
} }
src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java
+1
View File
@@ -122,6 +122,7 @@ public class WelfareProject extends BaseModel implements SysHomeConvert {
@Column @Column
@Comment("最多选几个") @Comment("最多选几个")
@Default("1")
@ColDefine(type = ColType.INT) @ColDefine(type = ColType.INT)
private Integer multiSelectNum; private Integer multiSelectNum;
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+19 -10
View File
@@ -657,14 +657,17 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
userData: JSON.stringify(this.userData) userData: JSON.stringify(this.userData)
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$message.success("保存成功")
this.$emit("goBack") this.$emit("goBack")
this.$message.success("提交成功")
if (this.activity_type === 40002) { if (this.activity_type === 40002) {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") location.href = "/platform/activity/culture/infoManage/union"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
} else if (this.activity_type === 40003) { } else if (this.activity_type === 40003) {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") location.href = "/platform/activity/culture/infoManage/club"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
} else { } else {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") location.href = "/platform/activity/culture/infoManage/school"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
} }
} }
}) })
@@ -702,11 +705,14 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
this.$emit("goBack") this.$emit("goBack")
this.$message.success("提交成功") this.$message.success("提交成功")
if (this.activity_type === 40002) { if (this.activity_type === 40002) {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") location.href = "/platform/activity/culture/infoManage/union"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
} else if (this.activity_type === 40003) { } else if (this.activity_type === 40003) {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") location.href = "/platform/activity/culture/infoManage/club"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
} else { } else {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") location.href = "/platform/activity/culture/infoManage/school"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
} }
} }
}) })
@@ -745,11 +751,14 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
this.$emit("goBack") this.$emit("goBack")
this.$message.success("提交成功") this.$message.success("提交成功")
if (this.activity_type === 40002) { if (this.activity_type === 40002) {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") location.href = "/platform/activity/culture/infoManage/union"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
} else if (this.activity_type === 40003) { } else if (this.activity_type === 40003) {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") location.href = "/platform/activity/culture/infoManage/club"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
} else { } else {
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") location.href = "/platform/activity/culture/infoManage/school"
// commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
} }
} }
}) })