Merge remote-tracking branch 'origin/main'

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

@@ -48,6 +48,19 @@ 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

@@ -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_H02===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"
                        filterable
-                       :clearable="is_A06===true||is_sysadmin===true||(is_H04===true&&is_H02===true)"
+                       :clearable="is_A06===true||is_sysadmin===true||is_CLUB_PRESIDENT===true||(is_H04===true&&is_H02===true)"
                        style="width: 100%">
               <el-option
                   v-for="item in clubOptions"
@@ -482,6 +482,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
     },
@@ -661,9 +664,13 @@ module.exports = {
   async created() {
     this.listSession()
     await this.getRolesAndUnion()
-    this.clubOptions = await this.$businessTool.listCLubByRole()
-    if ((this.is_sysadmin || this.is_A06 || this.is_H02) === false && this.is_H04 === true) {
-      this.unions = this.$businessTool.listUnion(this.unionid)
+    if (this.is_CLUB_PRESIDENT === true && (this.is_sysadmin || this.is_A06 || this.is_H02) === false) {
+      this.clubOptions = await this.$businessTool.listManageClubByRole()
+    } else {
+      this.clubOptions = await this.$businessTool.listCLubByRole()
+    }
+    if ((this.is_sysadmin || this.is_A06 || this.is_H02 || this.is_CLUB_PRESIDENT) === false && this.is_H04 === true) {
+      this.unions = await this.$businessTool.listUnion(this.unionid)
       this.$set(this.pageForm, "unionId", this.unions[0].id)
     } else {
       this.unions = await this.$businessTool.listUnion()
@@ -673,6 +680,9 @@ module.exports = {
         this.$set(this.pageForm, "clubId", this.clubOptions[0].id)
       }
     }
+    if (this.is_H04 === false && this.is_H02 === false && this.is_CLUB_PRESIDENT === true && this.clubOptions.length === 1) {
+      this.$set(this.pageForm, "clubId", this.clubOptions[0].id)
+    }
     await this.flushUnits()
     await this.getActivityGroup()
     this.personTypeOptions = await this.$businessTool.getDictOptions("USER_PERSON_TYPE")

src/main/resources/static/components/module/kh/KhZb.vue

@@ -207,7 +207,7 @@
 
           <el-table-column v-if="!is_view" label="操作"  width="100px">
             <template v-slot="{row,$index}">
-              <el-button size="mini" :disabled="nr.bzs.length<=1 || (!row.canDelete && row.id !== null)" type="danger" icon="el-icon-delete"
+              <el-button size="mini" :disabled="nr.bzs.length<=1 || (!row.canDelete && row.id)" type="danger" icon="el-icon-delete"
                          @click="nr.bzs.splice($index,1)"></el-button>
             </template>
           </el-table-column>

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

@@ -3,8 +3,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
         <div>
             <template>
                 <custom-card>
+                    <!-- :define_key="activity_type===40002?'FGHWHHD':'XHWHHD'" -->
                     <snaker-start slot="header" label="文化活动申报"
-                                  :define_key="activity_type===40002?'FGHWHHD':'XHWHHD'"
+                                  define_key="WHHD"
                                   v-if="activity_type===40002||activity_type===40003"></snaker-start>
                     <el-form :model="formData" :rules="formRules" label-suffix="：" label-width="170px"
                              ref="addForm" v-loading="formLoading">

src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js

@@ -17,7 +17,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
                 
                 <el-card shadow="never" class="mt10">
                      <table-tool label="会员信息">
-                        <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">
+                        <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'SCHOOL_UNION_CHAIRMAN'])">
                             <el-button size="small" type="primary" icon="el-icon-download" @click="exportRegistrationDoc">导出登记表</el-button>
                             <el-button @click="openImport" size="small" type="primary">导入成员</el-button>
                             <el-button size="small" type="primary" @click="openUserAdd(true)">录入成员</el-button>

src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js

@@ -57,7 +57,7 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
                                     <el-dropdown-item :command="{type:'edit',data:row}">
                                         编辑
                                     </el-dropdown-item>
-                                    <el-dropdown-item v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" :command="{type:'delete',data:row}">
+                                    <el-dropdown-item v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'SCHOOL_UNION_CHAIRMAN'])" :command="{type:'delete',data:row}">
                                         删除
                                     </el-dropdown-item>
                                 </el-dropdown-menu>