commit

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);
         }

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);

src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js

@@ -57,6 +57,20 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                                                           v-model="formData.address"></el-input>
                                             </el-form-item>
                                         </el-col>
+                                        <el-col :span="12" v-if="activity_type===40003">
+                                            <el-form-item prop="clubId" label="活动所属协会">
+                                                <el-select v-model="formData.clubId" clearable filterable multiple
+                                                           placeholder="请选择活动所属协会"
+                                                           style="width: 100%">
+                                                    <el-option
+                                                            v-for="item in clubOptions"
+                                                            :key="item.id"
+                                                            :label="item.name"
+                                                            :value="item.id">
+                                                    </el-option>
+                                                </el-select>
+                                            </el-form-item>
+                                        </el-col>
 
                                         <el-col :span="12">
                                             <el-form-item label="联系人" prop="userId">
@@ -164,6 +178,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                                                 </div>
                                             </el-form-item>
                                         </el-col>
+                                     
                                         <el-col :span="12">
                                             <el-form-item prop="hostUnitIds" label="主办单位">
                                                 <el-select v-model="formData.hostUnitIds" clearable filterable multiple
@@ -180,7 +195,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                                         </el-col>
                                         <el-col :span="12">
                                             <el-form-item prop="undertakeUnitIds" label="承办单位">
-                                                <el-select v-model="formData.undertakeUnitIds" clearable filterable multiple
+                                                <el-select v-model="formData.undertakeUnitIds" clearable filterable
+                                                           multiple
                                                            placeholder="请选择承办单位"
                                                            style="width: 100%">
                                                     <el-option
@@ -576,7 +592,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
                 plannedDate: [{required: true, message: "必填", trigger: ["blur", "change"]}],
                 time: [{required: true, message: "必填", trigger: ["blur", "change"]}],
                 cover: [{required: true, message: "必填", trigger: ["blur", "change"]}],
-                signUpMethod: [{required: true, message: "必填", trigger: ["blur", "change"]}]
+                signUpMethod: [{required: true, message: "必填", trigger: ["blur", "change"]}],
+                clubId: [{required: true, message: "必填", trigger: ["blur", "change"]}]
             },
 
             projectTypeList: [],
@@ -629,6 +646,14 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
         },
         // 保存
         onSave() {
+            if (!this.formData.projectTypeCode) {
+                this.$message.error("请选择活动项目类型")
+                return
+            }
+            if (!this.formData.clubId && this.activity_type === 40003) {
+                this.$message.error("请选择活动所属协会")
+                return
+            }
             this.$confirm("您确定保存吗？", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -675,93 +700,101 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
         },
         // 提交
         onSubmit() {
-            this.$confirm("您确定保存吗？", "提示", {
+            this.$refs["addForm"].validate((valid) => {
-                confirmButtonText: "确定",
+                if (valid) {
-                cancelButtonText: "取消",
+                    this.$confirm("您确定提交吗？", "提示", {
-                type: "warning"
+                        confirmButtonText: "确定",
-            }).then(() => {
+                        cancelButtonText: "取消",
-                const formData = JSON.parse(JSON.stringify(this.formData))
+                        type: "warning"
-                formData.activity_type = this.activity_type
+                    }).then(() => {
-                const {time, applyTime2, plannedDate} = formData
+                        const formData = JSON.parse(JSON.stringify(this.formData))
-                if (applyTime2 && applyTime2.length) {
+                        formData.activity_type = this.activity_type
-                    formData.applyStartTime = applyTime2[0]
+                        const {time, applyTime2, plannedDate} = formData
-                    formData.applyEndTime = applyTime2[1]
+                        if (applyTime2 && applyTime2.length) {
-                    formData.applyTime2 = null
+                            formData.applyStartTime = applyTime2[0]
-                }
+                            formData.applyEndTime = applyTime2[1]
-                if (time && time.length) {
+                            formData.applyTime2 = null
-                    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")
                         }
-                    }
+                        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("您确定保存吗？", "提示", {
+            this.$refs["addForm"].validate((valid) => {
-                confirmButtonText: "确定",
+                if (valid) {
-                cancelButtonText: "取消",
+                    this.$confirm("您确定提交吗？", "提示", {
-                type: "warning"
+                        confirmButtonText: "确定",
-            }).then(() => {
+                        cancelButtonText: "取消",
-                const formData = JSON.parse(JSON.stringify(this.formData))
+                        type: "warning"
-                formData.activity_type = this.activity_type
+                    }).then(() => {
-                const {time, applyTime2, plannedDate} = formData
+                        const formData = JSON.parse(JSON.stringify(this.formData))
-                if (applyTime2 && applyTime2.length) {
+                        formData.activity_type = this.activity_type
-                    formData.applyStartTime = applyTime2[0]
+                        const {time, applyTime2, plannedDate} = formData
-                    formData.applyEndTime = applyTime2[1]
+                        if (applyTime2 && applyTime2.length) {
-                    formData.applyTime2 = null
+                            formData.applyStartTime = applyTime2[0]
-                }
+                            formData.applyEndTime = applyTime2[1]
-                if (time && time.length) {
+                            formData.applyTime2 = null
-                    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")
                         }
-                    }
+                        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)
+                if (data.undertakeUnitIds) data.undertakeUnitIds = JSON.parse(data.undertakeUnitIds)
-                data.hostUnitIds = JSON.parse(data.hostUnitIds)
+                if (data.hostUnitIds) data.hostUnitIds = JSON.parse(data.hostUnitIds)
                 this.formData = data
                 if (!this.formData.unionUserNumberLimit) {
                     this.getUnionData().then((data) => {