From 9fce5ac21282115166085dfaf6877c2bdc7e3894 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Wed, 30 Oct 2024 17:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E6=A4=8D=E4=BD=93=E8=82=B2=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=BB=84=E9=98=9F=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../school/ActivityApplyController.java       |  9 +++++
 .../activity/school/ActivityApply.html        | 35 +++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java
index 012f4c6..1b6b7e0 100644
--- a/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java
+++ b/src/main/java/io/v/nutz/activity/controller/school/ActivityApplyController.java
@@ -870,5 +870,14 @@ public class ActivityApplyController {
         return list;
     }
 
+    @At
+    @ViReturn
+    @RequiresPermissions("activity.apply")
+    @Ok("json:{ignoreNull:true}")
+    public Object getUnits() {
+        List<Sys_unit> sysUnits = simpleService.dao().query(Sys_unit.class, Cnd.where("unitlevel", "=", 2).asc("unitcode"));
+        return sysUnits;
+    }
+
 
 }
diff --git a/src/main/resources/views/platform/activity/school/ActivityApply.html b/src/main/resources/views/platform/activity/school/ActivityApply.html
index 113ff5c..76a4204 100644
--- a/src/main/resources/views/platform/activity/school/ActivityApply.html
+++ b/src/main/resources/views/platform/activity/school/ActivityApply.html
@@ -599,6 +599,11 @@ layout("/layouts/platform.html"){
                                                v-if="substituteNum>0">
                                         设置替补
                                     </el-button>
+                                    <el-button @click="setAthletes" icon="el-icon-check"
+                                               plain
+                                               size="small" type="primary">
+                                        设置运动员
+                                    </el-button>
                                     <!--     <el-button icon="el-icon-check" size="small"
                                                     plain type="primary"
                                                     @click="changeTeam" v-if="projectType==2&&teams.length>1">
@@ -1180,7 +1185,6 @@ layout("/layouts/platform.html"){
                 this.selection.forEach(v => {
                     v.identity.unshift('3')
                 })
-
                 this.$refs.multipleTable.clearSelection();
                 this.leader = 3
             },
@@ -1228,6 +1232,25 @@ layout("/layouts/platform.html"){
 
                 this.$refs.multipleTable.clearSelection();
             },
+            setAthletes() {
+                if (!this.selection.length) {
+                    this.$notify({
+                        title: '警告',
+                        message: '请先勾选需要设置的用户！',
+                        type: 'warning'
+                    })
+                    return
+                }
+
+                this.selection.forEach(v => {
+                    if (!v.identity.includes('1')) {
+                        v.identity = []
+                        v.identity.push('1')
+                    }
+                })
+
+                this.$refs.multipleTable.clearSelection()
+            },
             setSubstitute() {
                 if (!this.selection.length) {
                     this.$notify({
@@ -2312,6 +2335,14 @@ layout("/layouts/platform.html"){
                     }
                 }, "json");
             },
+            async getUnits() {
+                const resp = await $.post(loc() + "/getUnits")
+                if (resp.code === 0) {
+                    this.unitOptions = resp.data
+                } else {
+                    this.notifyWarning(resp.msg)
+                }
+            }
         },
         async created() {
             await this.activityInfoData()
@@ -2320,7 +2351,7 @@ layout("/layouts/platform.html"){
             await this.userLeaderCoach()
             await this.changeActivit()
             this.planList = await activity.getSchoolActivityPlan()
-            this.unitOptions = await getUnits(null)
+            this.getUnits()
 
 
         }