commit

src/main/resources/static/assets/platform/js/tool/businessTool.js

@@ -48,6 +48,18 @@ const businessTool = {
                 }
             })
     },
+    listManageClubByRole() {
+        return commonUtil
+            .axiosService()
+            .post("/platform/club/common/listManageClubByRole", {})
+            .then((resp) => {
+                if (resp.code === 0) {
+                    return resp.data
+                } else {
+                    return []
+                }
+            })
+    },
     /**
      * 获取字典数据,不包含禁用
      * @param code

src/main/resources/static/components/module/activity/UserScope.vue

@@ -144,7 +144,7 @@
                                         flushUnits()
                                         doSearch()
                                     "
-                    :clearable="is_A06 === true || is_sysadmin === true"
+                    clearable
                     filterable
                     placeholder="所属工会"
                     style="width: 100%"
@@ -216,7 +216,7 @@
                   </el-select>
                 </el-col>
                 <el-col :span="12">
-                  <el-select placeholder="请选择教代会" v-model="pageForm.sessionId" clearable style="width: 100%">
+                  <el-select @change="doSearch" @clear="doSearch" placeholder="请选择教代会" v-model="pageForm.sessionId" clearable style="width: 100%">
                     <el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
                                :key="item.id"></el-option>
                   </el-select>
@@ -228,12 +228,12 @@
         </template>
 
         <el-row class="query-row"
-                v-if="is_A06===true||is_sysadmin===true||is_H02===true">
+                v-if="is_A06===true||is_sysadmin===true||is_CLUB_PRESIDENT===true">
           <el-col class="query-title">社团：</el-col>
           <el-col class="query-content">
-            <el-select v-model="pageForm.clubId" placeholder="请选择社团" @change="doSearch"
+            <el-select v-model="pageForm.clubId" placeholder="请选择社团" @change="doSearch" @clear="doSearch"
                        filterable
-                       :clearable="is_A06===true||is_sysadmin===true||(is_H04===true&&is_H02===true)"
+                       clearable
                        style="width: 100%">
               <el-option
                   v-for="item in clubOptions"
@@ -250,6 +250,7 @@
           <el-col class="query-content">
             <el-select
                 @change="doSearch()"
+                @clear="doSearch()"
                 placeholder="请选择活动组别范围之外的人员"
                 clearable
                 style="width: 100%"
@@ -493,6 +494,9 @@ module.exports = {
     is_H02() {
       return this.roleData.is_H02
     },
+    is_CLUB_PRESIDENT() {
+      return this.roleData.is_CLUB_PRESIDENT
+    },
     is_sysadmin() {
       return this.roleData.is_sysadmin
     },
@@ -709,18 +713,15 @@ module.exports = {
   async created() {
     this.listSession()
     await this.getRolesAndUnion()
-    this.clubOptions = await this.$businessTool.listClubByRole()
+    this.clubOptions = await this.$businessTool.listManageClubByRole()
     if ((this.is_sysadmin || this.is_A06 || this.is_H02) === false && this.is_H04 === true) {
-      this.unions = this.$businessTool.listUnion(this.unionid)
-      this.$set(this.pageForm, "unionId", this.unions[0].id)
+      this.unions = await this.$businessTool.listUnion(this.unionid)
+      if (this.unions.length > 0 && this.is_CLUB_PRESIDENT !== true) {
+        this.$set(this.pageForm, "unionId", this.unions[0].id)
+      }
     } else {
       this.unions = await this.$businessTool.listUnion()
     }
-    if (this.is_H04 === false && this.is_H02 === true) {
-      if (this.clubOptions.length > 0) {
-        this.$set(this.pageForm, "clubId", this.clubOptions[0].id)
-      }
-    }
     await this.flushUnits()
     await this.getActivityGroup()
     this.personTypeOptions = await this.$businessTool.getDictOptions("USER_PERSON_TYPE")