commit

src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html

@@ -144,10 +144,20 @@ layout("/layouts/platform.html"){
                     this.onView(row)
                     return
                 }
-                this.infoVisible = false
-                this.$nextTick(() => {
-                    this.$refs.guava.view(() => {
-                        this.$refs.courseListRef.onOpen(row)
+                // 先校验年度同活动类型报名次数，避免进入课程页后才提示不可报名。
+                this.$axios.post("/platform/trainSignUp/apply/validateYearTrainTypeSignUp", {activityId: row.id}).then((res) => {
+                    if (res.code !== 0) {
+                        this.$alert(res.msg, "提示", {
+                            confirmButtonText: "确定",
+                            type: "warning"
+                        })
+                        return
+                    }
+                    this.infoVisible = false
+                    this.$nextTick(() => {
+                        this.$refs.guava.view(() => {
+                            this.$refs.courseListRef.onOpen(row)
+                        })
                     })
                 })
             },

src/main/resources/views/platform/zhgh/activity/trainSignUp/type/index.html

@@ -24,6 +24,10 @@ layout("/layouts/platform.html"){
 
             <el-card shadow="never" class="mt20">
                 <table-tool label="申请列表">
+                    <el-button type="primary" plain size="small" @click="openAnnualLimit">
+                        <i class="ti-settings"></i>
+                        年度次数配置
+                    </el-button>
                     <el-button type="primary" size="small" @click="openAdd">
                         <i class="ti-plus"></i>
                         新增类型
@@ -75,6 +79,9 @@ layout("/layouts/platform.html"){
                     }
                 })
             },
+            openAnnualLimit() {
+                window.location.href = '/platform/trainSignUp/annualLimit'
+            },
             openAdd() {
                 this.$refs.guava.edit(() => {
                     this.$refs.basicFormRef.initData()