协会

src/main/java/io/v/nutz/base/utils/Roles.java

@@ -32,7 +32,7 @@ public interface Roles {
     String WELFARE_UNIT_MANAGE = "bfd195fe366e4f308230259bbe3ca9b8";
 
     /**
-     * 社团负责人
+     * 协会负责人
      */
     String CLUB_FZR = "c17d7a777dd24d36b4b268037b959faf";
 

src/main/java/io/v/nutz/base/utils/SmsTemplate.java

@@ -91,7 +91,7 @@ public class SmsTemplate {
     public static final String CLUB_EXAMINE_SCHOOL_FHXG_TEMPLATE = "{}{}年度考核审核未通过，请登陆“智慧工会”进行修改补充。";
 
     //校工会审核完注销发送给会长
-    public static final String CLUB_EXAMINE_SCHOOL_ZX_TEMPLATE = "抱歉通知您，{}{}年度年审考核未通过！按照《中国地质大学（武汉）教职工社团管理办法》（地大工字〔2022〕17号）相关规定，该社团将予以注销，敬请知悉。";
+    public static final String CLUB_EXAMINE_SCHOOL_ZX_TEMPLATE = "抱歉通知您，{}{}年度年审考核未通过！按照《中国地质大学（武汉）教职工协会管理办法》（地大工字〔2022〕17号）相关规定，该协会将予以注销，敬请知悉。";
 
 
 }

src/main/java/io/v/nutz/base/utils/Vi.java

@@ -103,7 +103,7 @@ public class Vi {
     }
 
     /**
-     * @return 当前登录用户的所负责的社团id
+     * @return 当前登录用户的所负责的协会id
      */
     public String getClubId() {
         Sys_user_role userRole = sysUserRoleService.fetch(Cnd.where("userId", "=", ShiroUtil.getPrincipalProperty("id")).and("roleId", "=", Roles.club01));
@@ -111,7 +111,7 @@ public class Vi {
     }
 
     /**
-     * @return 当前登录用户管理的协会社团
+     * @return 当前登录用户管理的协会协会
      */
     public String getMangeClubStr() {
         return "(SELECT sur.stid FROM sys_user_role sur WHERE sur.userId = '" + ShiroUtil.getPrincipalProperty("id") + "' and sur.roleId = '" + Roles.club01 + "')";

src/main/java/io/v/nutz/sys/constant/club/ClubRegistAuditState.java

@@ -73,7 +73,7 @@ public class ClubRegistAuditState {
     public static final Integer XGH_REJECTED = 890;
 
     /**
-     * 待社团确定相关资料
+     * 待协会确定相关资料
      */
     public static final Integer ST_CONFIRM = 900;
 

src/main/java/io/v/nutz/sys/controllers/platform/AgendaController.java

@@ -40,7 +40,7 @@ public class AgendaController {
         list.add(new NutMap().addv("iconClass", "fa fa-handshake-o").addv("label", "困难帮扶申请").addv("url", "/platform/fw/difficulty/apply").addv("color", "#E0891D"));
         list.add(new NutMap().addv("iconClass", "fa el-icon-edit").addv("label", "活动报名").addv("url", "/platform/hd/hdbm").addv("color", "#3EA3B1"));
         list.add(new NutMap().addv("iconClass", "fa el-icon-edit").addv("label", "活动报销申请").addv("url", "/platform/jf/activity_bx/apply").addv("color", "#E5821B"));
-        list.add(new NutMap().addv("iconClass", "fa fa-bicycle").addv("label", "加入社团").addv("url", "/platform/sys/club/sq").addv("color", "#0294A9"));
+        list.add(new NutMap().addv("iconClass", "fa fa-bicycle").addv("label", "加入协会").addv("url", "/platform/sys/club/sq").addv("color", "#0294A9"));
         list.add(new NutMap().addv("iconClass", "fa fa-trophy").addv("label", "会籍变更").addv("url", "/platform/member/change/apply").addv("color", "#FB8C00"));
 //        list.add(new NutMap().addv("iconClass", "fa el-icon-add-location").addv("label", "活动场地预约").addv("url", "/platform/activity/site/reserve").addv("color", "#20A4C9"));
 //        list.add(new NutMap().addv("iconClass", "fa el-icon-school").addv("label", "会员高级管理").addv("url", "/platform/member/change/mange").addv("color", "#3D97BB"));

src/main/java/io/v/nutz/sys/controllers/platform/caredata/UnionCareDataCon.java

@@ -208,7 +208,7 @@ public class UnionCareDataCon {
                 put("num", baseService.count(sql2));
             }});
             list.add(new HashMap<String, Object>() {{
-                put("type", "社团活动");
+                put("type", "协会活动");
                 put("num", baseService.count(sql3));
             }});
 
@@ -259,7 +259,7 @@ public class UnionCareDataCon {
 
                 list.add(new HashMap<String, Object>() {{
                     put("year", year);
-                    put("type", "社团活动");
+                    put("type", "协会活动");
                     put("num", sysUserService.list(sql3.setParam("year", year)).get(0).getDouble("jf"));
                 }});
             }

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java

@@ -48,7 +48,7 @@ import static org.nutz.boot.starter.ftp.FtpStarter.*;
 /**
  * @Author JyuHsin
  * @Date 2022/4/17
- * @Description 社团人数统计
+ * @Description 协会人数统计
  */
 @IocBean
 @At("/platform/sys/club/clubUserCount")
@@ -248,7 +248,7 @@ public class ClubUserCountController {
         cnd.andEX("c.status", "=", 5);
         sql.setCondition(cnd);
         List<NutMap> listMap = baseService.listMap(sql);
-        //获取所有社团
+        //获取所有协会
         Cnd stCnd = Cnd.NEW();
         stCnd.andEX("id", "=", clubId);
         List<Sys_club> clubList = dao.query(Sys_club.class, stCnd);
@@ -289,7 +289,7 @@ public class ClubUserCountController {
                 + URLEncoder.encode("上传资料数据.zip", "UTF-8"));
 
         LinkedHashMap<String, List<Sys_file>> fileList = new LinkedHashMap<>();
-        //查询社团
+        //查询协会
         List<Sys_club> clubList = dao.query(Sys_club.class, Cnd.NEW().andEX("id", "=", clubId));
         clubList.forEach(item -> {
             List<Sys_file> file = new ArrayList<>();
@@ -304,7 +304,7 @@ public class ClubUserCountController {
             fileList.put(item.getId(), file);
         });
 
-        //社团年审附件
+        //协会年审附件
         List<sys_club_examine_register> examineList = dao.query(sys_club_examine_register.class,
                 Cnd.NEW().andEX("clubId", "=", clubId)
                         .and("year(registerDate)", "=", DateUtil.thisYear()));
@@ -316,7 +316,7 @@ public class ClubUserCountController {
             }
         });
 
-        //社团评优附件
+        //协会评优附件
         List<SysClubEvaluate> evaluateList = dao.query(SysClubEvaluate.class, Cnd.NEW().andEX("clubId", "=", clubId)
                 .and("year(applyTime)", "=", DateUtil.thisYear()));
         evaluateList.forEach(item -> {
@@ -418,16 +418,16 @@ public class ClubUserCountController {
         List<NutMap> list = baseService.listMap(sql);
 
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
-        exportEntities.add(new ExcelExportEntity("社团名称", "name", 20));
+        exportEntities.add(new ExcelExportEntity("协会名称", "name", 20));
         exportEntities.add(new ExcelExportEntity("编码", "code", 20));
-        exportEntities.add(new ExcelExportEntity("社团总人数", "total", 20));
+        exportEntities.add(new ExcelExportEntity("协会总人数", "total", 20));
         exportEntities.add(new ExcelExportEntity("在职人数", "work", 20));
         exportEntities.add(new ExcelExportEntity("退休人数", "retire", 20));
         exportEntities.add(new ExcelExportEntity("男", "man", 20));
         exportEntities.add(new ExcelExportEntity("女", "woman", 20));
 
         try {
-            String disposition = "attachment;filename=" + URLEncoder.encode("社团统计表.xls", "utf-8");
+            String disposition = "attachment;filename=" + URLEncoder.encode("协会统计表.xls", "utf-8");
             response.setCharacterEncoding("utf-8");
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", disposition);

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java

@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 /**
  * @Author: V
  * @DateTime: 2020/8/15 14:12
- * @Description: 社团管理
+ * @Description: 协会管理
  */
 @IocBean
 @At("/platform/sys/club/mange")
@@ -75,7 +75,7 @@ public class SysClubCon {
 
     @At
     public Object updateSf(String id, Integer sf, String clubId) {
-        //查询社团是否存在会长或者秘书长
+        //查询协会是否存在会长或者秘书长
         if (sf == 1 || sf == 4) {
             int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", clubId)
                     .and("sf", "=", sf).and("status", "!=", 4)
@@ -91,11 +91,11 @@ public class SysClubCon {
         //如果变更为会员，则直接变更
         if (sf == 2) {
             sysClubUserService.update(Chain.make("sf", sf), Cnd.where("id", "=", id));
-            //变更为会员则需要清除社团负责人角色
+            //变更为会员则需要清除协会负责人角色
             dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId).and("userid", "=", fetch.getUserid())
                     .and("roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)));
         } else {
-            //变更社团负责人，如果是管理员直接变更完成
+            //变更协会负责人，如果是管理员直接变更完成
             if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) {
                 //先清除原始身份的角色
                 dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId).and("userid", "=", fetch.getUserid())
@@ -114,11 +114,11 @@ public class SysClubCon {
                 dao.update(fetch);
 
             } else {
-                //社团负责人变更的，则需要校工会审核
+                //协会负责人变更的，则需要校工会审核
                 sysClubUserService.update(Chain.make("changeSf", sf).add("state", 1).add("sfChangeTime", DateUtil.getDateTime())
                         , Cnd.where("id", "=", id));
                 //发短信
-                //查询校社团管理员
+                //查询校协会管理员
                 Sql sql = Sqls.create("""
                     select
                         u.userName,
@@ -311,8 +311,8 @@ public class SysClubCon {
                         if (Strings.isNotBlank(v.getCode())) {
                             Sys_club club = sysClubService.fetch(Cnd.where("code", "=", v.getCode()));
                             if (club == null) {
-                                setObj(v.getName() + "不存在请检查社团编号和社团名称");
-                                throw new RuntimeException(v.getName() + "不存在请检查社团编号和社团名称");
+                                setObj(v.getName() + "不存在请检查协会编号和协会名称");
+                                throw new RuntimeException(v.getName() + "不存在请检查协会编号和协会名称");
                             }
                             Sys_user user = baseService.dao().fetch(Sys_user.class, Cnd.where("loginname", "=", v.getLoginname()));
 
@@ -323,8 +323,8 @@ public class SysClubCon {
                             }
                             Sys_club_user sys_club_user = sysClubUserService.fetch(Cnd.where("userid", "=", user.getId()).and("clubid", "=", club.getId()));
                             if (sys_club_user != null) {
-                                setObj(v.getIndex() + "行数据用户已加入了" + v.getName() + "社团请删除后在导入");
-                                throw new RuntimeException(v.getIndex() + "行数据用户已加入了" + v.getName() + "社团请删除后在导入");
+                                setObj(v.getIndex() + "行数据用户已加入了" + v.getName() + "协会请删除后在导入");
+                                throw new RuntimeException(v.getIndex() + "行数据用户已加入了" + v.getName() + "协会请删除后在导入");
                             }
                             Sys_club_user club_user = new Sys_club_user();
                             club_user.setClubid(club.getId());

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java

@@ -39,7 +39,7 @@ import java.util.List;
 /**
  * @Author: V
  * @DateTime: 2020/8/17 14:03
- * @Description: 社团成员管理
+ * @Description: 协会成员管理
  */
 @IocBean
 @At("/platform/sys/club/users")
@@ -77,7 +77,7 @@ public class SysClubUserCon {
     private MsgApi msgApi;
 
     /**
-     * 获取我负责的社团
+     * 获取我负责的协会
      *
      * @return
      */
@@ -95,8 +95,8 @@ public class SysClubUserCon {
     }
 
     /**
-     * type=1社团信息管理菜单
-     * type=2社团录入菜单
+     * type=1协会信息管理菜单
+     * type=2协会录入菜单
      * type=3综合录入菜单
      */
     @At
@@ -151,7 +151,7 @@ public class SysClubUserCon {
         if (radioType != null && 1 == radioType) {
             cnd.and("scu.sf", "!=", "2");
         }
-        //查询社团成员
+        //查询协会成员
         if (radioType != null && 2 == radioType) {
             cnd.and("scu.sf", "=", "2");
         }
@@ -183,7 +183,7 @@ public class SysClubUserCon {
     public Object delUser(String id, Integer sf) {
         Sys_club_user fetch = dao.fetch(Sys_club_user.class, id);
         sysClubUserService.clear(Cnd.where("id", "=", id));
-        //删除社团负责人的角色
+        //删除协会负责人的角色
         sysUserRoleService.clear(Cnd.NEW().and("userId", "=", fetch.getUserid())
                 .and("roleId", "=", getRoleId(sf)).and("stid", "=", fetch.getClubid()));
         sysUserService.clearCache();
@@ -228,7 +228,7 @@ public class SysClubUserCon {
     @RequiresAuthentication
     public Object doAddUser(String clubid, String[] users, Integer sf, Boolean isjf) {
 
-        //查询社团是否存在会长或者秘书长
+        //查询协会是否存在会长或者秘书长
         if (sf == 1 || sf == 4) {
             int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", clubid)
                     .and("sf", "=", sf).and("status", "!=", 4)
@@ -247,7 +247,7 @@ public class SysClubUserCon {
             status = 3;
         }
 
-        //查询校社团管理员
+        //查询校协会管理员
         Sql sql = Sqls.create("""
                 select
                     u.userName,

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java

@@ -203,7 +203,7 @@ public class ClubApplyAuditController {
         return null;
     }
 
-    //获取当前登录用户负责的社团
+    //获取当前登录用户负责的协会
     @At
     @ViReturn
     @RequiresAuthentication
@@ -254,7 +254,7 @@ public class ClubApplyAuditController {
         return sysClubService.listPage(pageNumber, pageSize, sql);
     }
 
-    //获取社团已审或者未审人员
+    //获取协会已审或者未审人员
     @At
     @ViReturn
     @RequiresAuthentication

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java

@@ -152,7 +152,7 @@ public class ClubApplyInController {
         //完成申请人的任务（申请拒绝的情况）
         ClubUserApplyToDoHandler.COMPLETE_APPLY_TASK.exec(clubUser);
 
-        //根据社团id查询社团负责人，发短信
+        //根据协会id查询协会负责人，发短信
         Sql sql = Sqls.create("""
                 SELECT
                     u.loginname as loginName,
@@ -206,7 +206,7 @@ public class ClubApplyInController {
         //撤销删除待办流程
         ClubUserApplyToDoHandler.DELETE_PROCESS.exec(dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", id).and("userid", "=", ShiroUtil.getPlatformUid())));
         sysClubUserService.clear(Cnd.where("clubid", "=", id).and("userid", "=", ShiroUtil.getPlatformUid()));
-        //撤销给社团负责人发短信
+        //撤销给协会负责人发短信
         Sql sql = Sqls.create("""
                 SELECT
                     u.loginname as loginName,
@@ -240,7 +240,7 @@ public class ClubApplyInController {
     }
 
     /**
-     * 获取当前登录用户已经参加的社团
+     * 获取当前登录用户已经参加的协会
      *
      * @return java.lang.Object
      * @author JyuHsin

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateApplyController.java

@@ -32,7 +32,7 @@ import java.util.List;
 /**
  * @Author JyuHsin
  * @Date 2023/3/31
- * @Description 社团评优申请
+ * @Description 协会评优申请
  */
 @IocBean
 @At("/platform/sys/club/clubEvaluateApply")
@@ -86,7 +86,7 @@ public class ClubEvaluateApplyController {
         return null;
     }
 
-    //获取当前登录用户管理的社团并且年度审核通过的
+    //获取当前登录用户管理的协会并且年度审核通过的
     @At
     @ViReturn
     @RequiresAuthentication

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateHzAuditController.java

@@ -57,7 +57,7 @@ public class ClubEvaluateHzAuditController {
                            @Param(value = "isAudit", required = false) Boolean isAudit) {
         Cnd cnd = Cnd.NEW();
         if (!ShiroUtil.hasRole("sysadmin")){
-            //查询当前登录用户是哪个社团的秘书长
+            //查询当前登录用户是哪个协会的秘书长
             cnd.and("ce.clubId", "in", "(select stid from sys_user_role where userid='%s' and roleid='%s')"
                     .formatted(ShiroUtil.getPrincipalProperty("id"), Roles.club01));
         }

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateMszAuditController.java

@@ -56,7 +56,7 @@ public class ClubEvaluateMszAuditController {
                            @Param(value = "isAudit", required = false) Boolean isAudit) {
         Cnd cnd = Cnd.NEW();
         if (!ShiroUtil.hasRole("sysadmin")){
-            //查询当前登录用户是哪个社团的秘书长
+            //查询当前登录用户是哪个协会的秘书长
             cnd.and("ce.clubId", "in", "(select stid from sys_user_role where userid='%s' and roleid='%s')"
                     .formatted(ShiroUtil.getPrincipalProperty("id"), Roles.club03));
         }

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/examine/ClubExamineRegisterAgentController.java

@@ -48,7 +48,7 @@ public class ClubExamineRegisterAgentController {
     @ViReturn
     @RequiresAuthentication
     public Object getAgenda() {
-        final String title = "【社团年度审核】";
+        final String title = "【协会年度审核】";
         List<NutMap> result = new ArrayList<>();
 
 

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/examine/ClubExamineRegisterController.java

@@ -51,7 +51,7 @@ public class ClubExamineRegisterController {
     @RequiresAuthentication
     public Object getClubUserNum(String clubId) {
         if (Strings.isBlank(clubId)) {
-            return Result.error("暂无社团无法查询成员变化情况");
+            return Result.error("暂无协会无法查询成员变化情况");
         }
         return Result.success(clubExamineRegisterService.getClubUserNum(clubId));
     }
@@ -127,7 +127,7 @@ public class ClubExamineRegisterController {
      * @param id
      * @return java.lang.Object
      * @author zhf
-     * @description找出社团会费收入
+     * @description找出协会会费收入
      */
     @At
     @ViReturn

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/examine/ClubExamineRegisterFzrAuditController.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 
 /**
  * @ClassName ClubExamineRegisterFzrAuditController
- * @Description TODO社团负责人审核
+ * @Description TODO协会负责人审核
  * @Author zhf
  * @Date 2023/3/27 18:10
  */

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/examine/ClubExamineRegisterManageController.java

@@ -162,7 +162,7 @@ public class ClubExamineRegisterManageController {
                 .bind("activityQk", activityQk).build();
 
         try {
-            String fileName = Globals.MyConfig.getString("GxName") + "教职工社团年度考核登记表";
+            String fileName = Globals.MyConfig.getString("GxName") + "教职工协会年度考核登记表";
             response.addHeader("Content-Type", "application/octet-stream");
             response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".docx");
             XWPFTemplate.compile(officeTemplateUtil.getPath("club_examine_register"), config).render(map).writeAndClose(response.getOutputStream());

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubInfoManageController.java

@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 /**
  * @Author JyuHsin
  * @Date 2022/4/14
- * @Description 社团信息维护
+ * @Description 协会信息维护
  */
 @IocBean
 @At("/platform/sys/club/clubInfoManage")

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/needItems/ClubNeedItemsController.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 @Ok("json")
 public class ClubNeedItemsController {
 
-    //社团注册
+    //协会注册
     private static final String CLUB_REGIST_XT = "/platform/sys/club/xtAudit";
     private static final String CLUB_REGIST_FZX = "/platform/sys/club/xldAudit";
     private static final String CLUB_REGIST_XGH = "/platform/sys/club/xghReply";
@@ -34,10 +34,10 @@ public class ClubNeedItemsController {
     //申请入会
     private static final String CLUB_APPLY_HZ = "/platform/sys/club/sh/clubsh";
 
-    //社团管理
+    //协会管理
     private static final String CLUB_MANAGE_SCHOOL = "/platform/sys/club/clubManagePersonAudit";
 
-    //社团评优
+    //协会评优
     private static final String CLUB_EVALUATE_MSZ = "/platform/sys/club/clubEvaluateMszAudit";
     private static final String CLUB_EVALUATE_HZ = "/platform/sys/club/clubEvaluateHzAudit";
     private static final String CLUB_EVALUATE_SCHOOL = "/platform/sys/club/clubEvaluateSchoolAudit";
@@ -51,7 +51,7 @@ public class ClubNeedItemsController {
     @ViReturn
     @RequiresAuthentication
     public Object getClubRegistAgent() {
-        final String title = "【社团注册申请】";
+        final String title = "【协会注册申请】";
         List<NutMap> result = new ArrayList<>();
 
         result.add(new NutMap().setv("title", title).setv("url", CLUB_REGIST_XT).setv("iconClass", vi.getIconByPath(CLUB_REGIST_XT)).setv("label", "待宣体办公室审核").setv("number", getClubRegistCount(false, "", 810)));
@@ -80,7 +80,7 @@ public class ClubNeedItemsController {
     @ViReturn
     @RequiresAuthentication
     public Object getClubApplyAgent() {
-        final String title = "【社团入会申请】";
+        final String title = "【协会入会申请】";
         List<NutMap> result = new ArrayList<>();
 
         result.add(new NutMap().setv("title", title).setv("url", CLUB_APPLY_HZ).setv("iconClass", vi.getIconByPath(CLUB_APPLY_HZ)).setv("label", "待会长审核").setv("number", getClubApplyCount(Roles.club01, 1)));
@@ -109,7 +109,7 @@ public class ClubNeedItemsController {
     @ViReturn
     @RequiresAuthentication
     public Object getClubManageAgent() {
-        final String title = "【社团理事成员】";
+        final String title = "【协会理事成员】";
         List<NutMap> result = new ArrayList<>();
 
         result.add(new NutMap().setv("title", title).setv("url", CLUB_MANAGE_SCHOOL).setv("iconClass", vi.getIconByPath(CLUB_MANAGE_SCHOOL)).setv("label", "待校工会审核").setv("number", getClubManageCount()));
@@ -130,7 +130,7 @@ public class ClubNeedItemsController {
     @ViReturn
     @RequiresAuthentication
     public Object getClubEvaluateAgent() {
-        final String title = "【社团评优】";
+        final String title = "【协会评优】";
         List<NutMap> result = new ArrayList<>();
 
         result.add(new NutMap().setv("title", title).setv("url", CLUB_EVALUATE_MSZ).setv("iconClass", vi.getIconByPath(CLUB_EVALUATE_MSZ)).setv("label", "待秘书长审核").setv("number", getClubEvaluateCount(true, Roles.club03, 2010)));

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubConfirmController.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 /**
  * @Author JyuHsin
  * @Date 2022/4/14
- * @Description 社团确认
+ * @Description 协会确认
  */
 @IocBean
 @At("/platform/sys/club/clubConfirm")

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java

@@ -31,7 +31,7 @@ import java.util.Objects;
 /**
  * @Author JyuHsin
  * @Date 2022/4/14
- * @Description 社团注册申请
+ * @Description 协会注册申请
  */
 @IocBean
 @At("/platform/sys/club/clubRegistApply")
@@ -89,7 +89,7 @@ public class ClubRegistApplyController {
 
         Sys_club sysClub = sysClubService.insertWith(club, "sponsors");
 
-        //插入新建社团时填入的理事机构
+        //插入新建协会时填入的理事机构
         List<Sys_club_user> clubUsers = new ArrayList<>();
 
         List<Sys_user_role> userRoles = new ArrayList<>();
@@ -106,7 +106,7 @@ public class ClubRegistApplyController {
                 cUser.setIsNormal(true);
                 clubUsers.add(cUser);
 
-                //如果是管理员创建的社团，直接加角色
+                //如果是管理员创建的协会，直接加角色
                 if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) {
                     Sys_user_role uRole = new Sys_user_role();
                     uRole.setUserId(item.getString("userId"));
@@ -184,7 +184,7 @@ public class ClubRegistApplyController {
             }
             clubUsers.add(cUser);
 
-            //如果是管理员创建的社团，直接加角色
+            //如果是管理员创建的协会，直接加角色
             if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) {
                 Sys_user_role uRole = new Sys_user_role();
                 uRole.setUserId(item.getString("userId"));

src/main/java/io/v/nutz/sys/models/SysClubEvaluate.java

@@ -22,7 +22,7 @@ public class SysClubEvaluate {
     private String id;
 
     @Column
-    @Comment("社团id")
+    @Comment("协会id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 

src/main/java/io/v/nutz/sys/models/SysClubUserHistory.java

@@ -16,7 +16,7 @@ public class SysClubUserHistory extends BaseModel {
     private String id;
 
     @Column
-    @Comment("社团id")
+    @Comment("协会id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 
@@ -26,7 +26,7 @@ public class SysClubUserHistory extends BaseModel {
     private String userId;
 
     @Column
-    @Comment("用户备份时的社团身份")
+    @Comment("用户备份时的协会身份")
     @ColDefine(type = ColType.INT)
     private Integer sf;
 

src/main/java/io/v/nutz/sys/models/Sys_club.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * @Author: V
  * @DateTime: 2020/8/15 13:52
- * @Description: 社团
+ * @Description: 协会
  */
 @Data
 @Table("Sys_club")
@@ -22,17 +22,17 @@ public class Sys_club {
     private String id;
 
     @Column
-    @Comment("社团名称")
+    @Comment("协会名称")
     @ColDefine(type = ColType.VARCHAR, width = 100)
     private String name;
 
     @Column
-    @Comment("社团编码")
+    @Comment("协会编码")
     @ColDefine(type = ColType.VARCHAR, width = 100)
     private String code;
 
     @Column
-    @Comment("社团类型")
+    @Comment("协会类型")
     @ColDefine(type = ColType.VARCHAR, width = 30)
     private String type;
 
@@ -52,12 +52,12 @@ public class Sys_club {
     private String concatPersonEmail;
 
     @Column
-    @Comment("社团介绍")
+    @Comment("协会介绍")
     @ColDefine(type = ColType.TEXT)
     private String stjs;
 
     @Column
-    @Comment("社团宗旨")
+    @Comment("协会宗旨")
     @ColDefine(type = ColType.TEXT)
     private String stzz;
 

src/main/java/io/v/nutz/sys/models/Sys_club_user.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * @Author: V
  * @DateTime: 2020/8/15 16:39
- * @Description: 社团成员
+ * @Description: 协会成员
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -27,7 +27,7 @@ public class Sys_club_user extends BaseModel {
     private String id;
 
     @Column
-    @Comment("社团id")
+    @Comment("协会id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubid;
 
@@ -67,12 +67,12 @@ public class Sys_club_user extends BaseModel {
     private String yearClubAuditId;
 
     @Column
-    @Comment("年审状态（1 待社团审核 2 社团审核不通过 5 通过）")
+    @Comment("年审状态（1 待协会审核 2 协会审核不通过 5 通过）")
     @ColDefine(type = ColType.INT, width = 4)
     private Integer yearAuditStatus;
 
     @Column
-    @Comment("状态（1 待社团审核 2 社团审核不通过 3 待校工会审核 4 校工会审核不通过 5 通过）")
+    @Comment("状态（1 待协会审核 2 协会审核不通过 3 待校工会审核 4 校工会审核不通过 5 通过）")
     @ColDefine(type = ColType.INT, width = 4)
     private Integer status;
 

src/main/java/io/v/nutz/sys/models/Sys_user_role.java

@@ -72,7 +72,7 @@ public class Sys_user_role implements Serializable {
 
     @Column
     @ColDefine(type = ColType.VARCHAR, width = 32)
-    @Comment("社团id")
+    @Comment("协会id")
     private String stid;
 
     @Column

src/main/java/io/v/nutz/sys/models/sys_club_examine_register.java

@@ -29,12 +29,12 @@ public class sys_club_examine_register {
     private String userId;
 
     @Column
-    @Comment("社团id")
+    @Comment("协会id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 
     @Column
-    @Comment("社团名称")
+    @Comment("协会名称")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubName;
 
@@ -84,7 +84,7 @@ public class sys_club_examine_register {
     private int auditId;
 
     @Column
-    @Comment("社团负责人审核意见id")
+    @Comment("协会负责人审核意见id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String stAuditId;
 

src/main/java/io/v/nutz/sys/services/ClubExamineRegisterService.java

@@ -14,7 +14,7 @@ public interface ClubExamineRegisterService extends ViService {
      * @param clubId
      * @return java.util.List<org.nutz.lang.util.NutMap>
      * @author zhf
-     * @description 社团成员变化情况
+     * @description 协会成员变化情况
      */
     List<NutMap> getClubUserNum(String clubId);
 
@@ -32,7 +32,7 @@ public interface ClubExamineRegisterService extends ViService {
      * @param id
      * @return java.lang.Object
      * @author zhf
-     * @description找出社团会费收入
+     * @description找出协会会费收入
      */
     Object getClubMemberMoney(String id);
 

src/main/java/io/v/nutz/task/job/club/ClubUserJob.java

@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 每天晚上23:59:59查询社团名单，如果在职变为拨付，如果退休变为不拨付
+ * 每天晚上23:59:59查询协会名单，如果在职变为拨付，如果退休变为不拨付
  * 如果时间为每年的12月31日，则备份一次所有拨付名单
  */
 @IocBean
@@ -40,7 +40,7 @@ public class ClubUserJob implements Job {
 
         List<Sys_user> userList = dao.query(Sys_user.class, Cnd.NEW());
         Map<String, Sys_user> userMap = userList.stream().collect(Collectors.toMap(Sys_user::getId, o -> o));
-        //查询所有社团名单
+        //查询所有协会名单
         List<Sys_club_user> clubUserList = dao.query(Sys_club_user.class, Cnd.where("status", "=", 5)
                 .and("isNormal", "=", true)
                 .and(new Static(" clubid in (select id from sys_club where isjs = false and state = %s)".formatted(ClubRegistAuditState.SCHOOL_PASS))));

src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java

@@ -53,12 +53,12 @@ public class ActivityPlan {
     private Double money;
 
     @Column
-    @Comment("计划类型(1-校活动、2-分工会活动、3协会社团活动)")
+    @Comment("计划类型(1-校活动、2-分工会活动、3协会协会活动)")
     @ColDefine(type = ColType.VARCHAR, width = 7)
     private String type;
 
     @Column
-    @Comment("分工会ID或社团ID")
+    @Comment("分工会ID或协会ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String tissueId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java

@@ -158,7 +158,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
     private Boolean close;
 
     @Column
-    @Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）")
+    @Comment("活动级别（40001-校级、40002-分工会、40003-协会或协会）")
     @ColDefine(type = ColType.INT, width = 10)
     private Integer activityLevel;
 
@@ -182,7 +182,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
     private String belongUnionId;
 
     @Column
-    @Comment("活动所属社团")
+    @Comment("活动所属协会")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String belongClubId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java

@@ -17,12 +17,12 @@ import java.util.List;
 /**
  * @author: Aaron
  * @create: 2021-03-09 13:57
- * @description: 社团或分工会活动校工会活动
+ * @description: 协会或分工会活动校工会活动
  **/
 
 @Data
 @Table("activity_tissue")
-@Comment("社团或分工会活动校工会活动")
+@Comment("协会或分工会活动校工会活动")
 public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert {
 
     @Column
@@ -138,7 +138,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
     private String unionId;
 
     @Column
-    @Comment("创建人所属社团")
+    @Comment("创建人所属协会")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java

@@ -22,7 +22,7 @@ public class ActivityTissuePerson {
     private String id;
 
     @Column
-    @Comment("分工会或社团活动ID")
+    @Comment("分工会或协会活动ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String tissueId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java

@@ -44,7 +44,7 @@ public class ActivityYearSummary {
     private String summaryType;
 
     @Column
-    @Comment("总结来源（1-校活动、2-分工会活动、3协会社团活动）")
+    @Comment("总结来源（1-校活动、2-分工会活动、3协会协会活动）")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String summaryFrom;
 

src/main/java/io/v/nutz/zhgh/jf/controller/club/ClubDataInputController.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 /**
  * @Author:xsb
- * @Description: 社团模板数据导入
+ * @Description: 协会模板数据导入
  * @Date:Created in 19:45 2021/2/1
  */
 @IocBean
@@ -40,10 +40,10 @@ import java.util.stream.Collectors;
 public class ClubDataInputController {
 
 
-    @Inject  // 已交社团
+    @Inject  // 已交协会
     private jfClubService jfClubService;
 
-    @Inject  // 系统原本社团
+    @Inject  // 系统原本协会
     private SysClubService sysClubService;
 
 
@@ -65,7 +65,7 @@ public class ClubDataInputController {
             file = new File("src/main/resources/docTemplate/clubQuota.xlsx");
             fin = new FileInputStream(file);
             // 设置浏览器以下载的方式处理该文件名
-            String fileName = "批量导入社团预算分配" + ".xlsx";
+            String fileName = "批量导入协会预算分配" + ".xlsx";
             response.setHeader("Content-Disposition", "attachment;filename="
                     .concat(String.valueOf(URLEncoder.encode(fileName, "UTF-8"))));
 
@@ -92,9 +92,9 @@ public class ClubDataInputController {
         int count = 0;
         int success_count = 0;
         try {
-            // 查出现在已交社团表中的已交社团
+            // 查出现在已交协会表中的已交协会
             List<jf_club> jf_clubs = jfClubService.query();
-            // 查出所有系统社团
+            // 查出所有系统协会
             List<Sys_club> sysClubs = sysClubService.query();
             Map<String, String> collect = sysClubs.stream().collect(Collectors.toMap(v -> v.getName(), v -> v.getId()));
             //获得excel表格中的数据并封装成一个个对象
@@ -111,10 +111,10 @@ public class ClubDataInputController {
 
                     jf_club yj_club = jf_clubs.stream().filter(v -> v.getYear().equals(obj.getYear()) && v.getClub_id().equals(obj.getClub_id())).findFirst().orElse(null);
 
-                    // 遍历所有的已交社团
+                    // 遍历所有的已交协会
                     boolean has = jf_clubs.stream().anyMatch(v -> v.getYear().equals(obj.getYear()) && v.getClub_id().equals(obj.getClub_id()));
                     if (has) {
-                        yj_club.setClub_id(obj.getClub_id()); //社团id
+                        yj_club.setClub_id(obj.getClub_id()); //协会id
                         yj_club.setState(1); //状态1
                         yj_club.setHistory_member(obj.getHistory_member()); //历史会员人数
                         yj_club.setHistory_club_avg(obj.getHistory_club_avg()); //历史品均值

src/main/java/io/v/nutz/zhgh/jf/controller/club/clubController.java

@@ -30,7 +30,7 @@ import java.util.List;
 /**
  * @author zhf
  * @date 2020/11/5 10:24
- * @description 社团活动经费分配
+ * @description 协会活动经费分配
  */
 @IocBean
 @At("/platform/jf/st/fp")

src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java

@@ -133,7 +133,7 @@ public class ActivityReimbursementBoardController {
 
                 list.add(new NutMap() {{
                     put("year", year);
-                    put("type", "社团活动");
+                    put("type", "协会活动");
                     put("num", activityBxService.count(sql3.setParam("year", year)));
                 }});
             }
@@ -164,7 +164,7 @@ public class ActivityReimbursementBoardController {
                 put("num", activityBxService.count(sql2));
             }});
             list.add(new NutMap() {{
-                put("type", "社团活动");
+                put("type", "协会活动");
                 put("num", activityBxService.count(sql3));
             }});
             return Result.success().addData(list);
@@ -207,7 +207,7 @@ public class ActivityReimbursementBoardController {
 
                 list.add(new NutMap() {{
                     put("year", year);
-                    put("type", "社团经费");
+                    put("type", "协会经费");
                     put("num", activityBxService.list(sql3.setParam("year", year)).get(0).getDouble("jf"));
                 }});
             }
@@ -237,7 +237,7 @@ public class ActivityReimbursementBoardController {
                 put("num", activityBxService.count(unionSql));
             }});
             list.add(new NutMap() {{
-                put("type", "社团经费");
+                put("type", "协会经费");
                 put("num", activityBxService.count(clubSql));
             }});
             return Result.success().addData(list);

src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java

@@ -164,7 +164,7 @@ public class ActivityBx {
     private Integer apply_type;
 
     @Column
-    @Comment("活动类型（1.基层工会，3.校工会，2.社团）")
+    @Comment("活动类型（1.基层工会，3.校工会，2.协会）")
     @ColDefine(type = ColType.INT, width = 10)
     private Integer activity_type;
 

src/main/java/io/v/nutz/zhgh/jf/model/jf_club.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
  * @author: Aaron
  * @create: 2020-08-18 15:01
- * @description: 社团预算管理
+ * @description: 协会预算管理
  **/
 @Table("jf_club")
 @Data
@@ -26,7 +26,7 @@ public class jf_club implements Serializable {
 
 
     @Column
-    @Comment("社团ID")
+    @Comment("协会ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String club_id;
 
@@ -37,7 +37,7 @@ public class jf_club implements Serializable {
     private Integer year;
 
     @Column
-    @Comment("社团活动费")
+    @Comment("协会活动费")
     @ColDefine(type = ColType.INT)
     private Integer club_activity_cost;
 

src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java

@@ -228,7 +228,7 @@ public class applyNewController {
             int count = baseService.dao().count(Sys_club_user.class, Cnd.where("userid", "=", ShiroUtil.getPrincipalProperty("id"))
                     .and("sf", "=", 1));
             if (count == 0) {
-                return Result.error("协会/社团报销只能由会长操作");
+                return Result.error("协会/协会报销只能由会长操作");
             }
         }
         return Result.success();

src/main/java/io/v/nutz/zhgh/reimbursement/models/ReimbursementNew.java

@@ -60,7 +60,7 @@ public class ReimbursementNew {
     private String unitId;
 
     @Column
-    @Comment("社团id")
+    @Comment("协会id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 
@@ -299,7 +299,7 @@ public class ReimbursementNew {
     private String activity_number;
 
     @Column
-    @Comment("活动类型（1.基层工会，2.校工会，3.社团）")
+    @Comment("活动类型（1.基层工会，2.校工会，3.协会）")
     @ColDefine(type = ColType.INT, width = 2)
     private Integer activity_type;
 

src/main/java/io/v/nutz/zhgh/xhkh/controller/XhKhZpController.java

@@ -86,7 +86,7 @@ public class XhKhZpController {
 
 
     /**
-     * 查社团名称
+     * 查协会名称
      * @return
      */
     @At

src/main/resources/static/assets/platform/module/activity/activity.js

@@ -27,7 +27,7 @@ window.activity = {
         activityLevel: {
             1: '校级',
             2: '分工会',
-            3: '社团或协会'
+            3: '协会或协会'
         },
         combinationMethod: {
             1: '单项报名人数',
@@ -67,4 +67,4 @@ window.activity = {
             return false
         },
     },
-}
+}

src/main/resources/static/components/activity/school/AddActivity.vue

@@ -18,12 +18,12 @@
                 <template v-if="is_sysadmin">
                   <el-radio :label="40001" border>校级</el-radio>
                   <el-radio :label="40002" border>分工会</el-radio>
-                  <el-radio :label="40003" border>社团或协会</el-radio>
+                  <el-radio :label="40003" border>协会或协会</el-radio>
                 </template>
                 <template v-if="!is_sysadmin">
                   <el-radio :label="40001" border v-if="is_a06">校级</el-radio>
                   <el-radio v-if="is_union" :label="40002" border>分工会</el-radio>
-                  <el-radio :label="40003" border v-if="is_club">社团或协会</el-radio>
+                  <el-radio :label="40003" border v-if="is_club">协会或协会</el-radio>
                 </template>
 
               </el-radio-group>

src/main/resources/static/components/activity/school/planInfo.vue

@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="计划类型">
-              {{ viewData.type == 1 ? '校活动计划' : viewData.type == 2 ? '分工会活动计划' : '协会(社团)计划' }}
+              {{ viewData.type == 1 ? '校活动计划' : viewData.type == 2 ? '分工会活动计划' : '协会计划' }}
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -46,7 +46,7 @@
         {{ viewData.money }}
       </el-descriptions-item>
       <el-descriptions-item label="计划类型">
-        {{ viewData.type == 40001 ? '校活动计划' : viewData.type == 40002 ? '分工会活动计划' : '协会(社团)计划' }}
+        {{ viewData.type == 40001 ? '校活动计划' : viewData.type == 40002 ? '分工会活动计划' : '协会计划' }}
       </el-descriptions-item>
       <el-descriptions-item label="计划内容" :span="2">
         <div v-html="viewData.content"></div>
@@ -95,4 +95,4 @@ module.exports = {
 </script>
 
 <style>
-</style>
+</style>

src/main/resources/static/components/activity/school/tissueInfo.vue

@@ -35,7 +35,7 @@
 
           <el-col :span="12">
             <el-form-item label="活动类型">
-              {{ viewData.type === 1 ? '分工会活动' : viewData.type === 2 ? '协会社团活动' : '校工会活动' }}
+              {{ viewData.type === 1 ? '分工会活动' : viewData.type === 2 ? '协会协会活动' : '校工会活动' }}
             </el-form-item>
           </el-col>
 
@@ -130,7 +130,7 @@
             <el-form-item v-if="viewData.type===1" label="所属工会">
               {{ !viewData.unionname ? '暂无' : viewData.unionname }}
             </el-form-item>
-            <el-form-item v-if="viewData.type===2" label="所属社团">
+            <el-form-item v-if="viewData.type===2" label="所属协会">
               {{ !viewData.clubName ? '暂无' : viewData.clubName }}
             </el-form-item>
             <el-form-item v-if="viewData.type===3" label="所属组织">

src/main/resources/static/components/club/clubEvaluateInfo.vue

@@ -6,13 +6,13 @@
       <vi-title title="基础信息"></vi-title>
 
       <el-descriptions :column="3" border class="table_fixed">
-        <el-descriptions-item :span="3" label="社团名称">
+        <el-descriptions-item :span="3" label="协会名称">
           {{viewData.name}}
         </el-descriptions-item>
-        <el-descriptions-item label="社团编码">
+        <el-descriptions-item label="协会编码">
           {{viewData.code}}
         </el-descriptions-item>
-        <el-descriptions-item label="社团类型">
+        <el-descriptions-item label="协会类型">
           {{viewData.typeName}}
         </el-descriptions-item>
         <el-descriptions-item label="成立时间">

src/main/resources/static/components/club/clubRegistInfo.vue

@@ -3,22 +3,22 @@
   <el-tabs tab-position="top" v-model="clubInfo" v-loading="loading">
     <el-tab-pane label="基础信息" name="1">
 
-      <vi-title title="社团信息"></vi-title>
+      <vi-title title="协会信息"></vi-title>
 
       <el-descriptions :column="4" border class="table_fixed">
-        <el-descriptions-item label="社团名称">
+        <el-descriptions-item label="协会名称">
           {{viewData.name}}
         </el-descriptions-item>
         <el-descriptions-item label="申请时间">
           {{viewData.create_time}}
         </el-descriptions-item>
-        <el-descriptions-item label="社团编码">
+        <el-descriptions-item label="协会编码">
           {{viewData.code}}
         </el-descriptions-item>
         <el-descriptions-item label="发起人">
           {{ viewData.sponsorName }}
         </el-descriptions-item>
-        <el-descriptions-item label="社团类型">
+        <el-descriptions-item label="协会类型">
           {{ viewData.typeName }}
         </el-descriptions-item>
         <el-descriptions-item label="报名联系人">
@@ -44,11 +44,11 @@
           {{viewData.stateName}}
         </el-descriptions-item>
         <el-descriptions-item span="4">
-          <template slot="label">社团介绍</template>
+          <template slot="label">协会介绍</template>
           <div class="text-left" v-html="viewData.stjs"></div>
         </el-descriptions-item>
         <el-descriptions-item span="4">
-          <template slot="label">社团宗旨</template>
+          <template slot="label">协会宗旨</template>
           <div class="text-left" v-html="viewData.stzz"></div>
         </el-descriptions-item>
         <el-descriptions-item span="2">

src/main/resources/static/components/club/clubRegisterInfo.vue

@@ -5,7 +5,7 @@
 
       <vi-title title="基础信息"></vi-title>
       <el-descriptions :column="3" border class="table_fixed">
-        <el-descriptions-item label="社团名称">
+        <el-descriptions-item label="协会名称">
           {{ viewData.register.clubName }}
         </el-descriptions-item>
         <el-descriptions-item label="成立时间">
@@ -35,7 +35,7 @@
         </el-descriptions-item>
       </el-descriptions>
 
-      <vi-title title="社团成员变化情况" class="mt20"></vi-title>
+      <vi-title title="协会成员变化情况" class="mt20"></vi-title>
       <el-table :data="viewData.changeUserNum" max-height="300">
         <el-table-column label="序号" type="index"
                          width="50"></el-table-column>

src/main/resources/static/components/reimbursement/reimbursementNew.vue

@@ -187,7 +187,7 @@
 
             <el-col v-if="viewData.reimbursementItemId=='fyhd'" :span="12">
               <el-form-item label="活动类型">
-                {{ viewData.activity_type === '1' ? '分工会活动' : viewData.activity_type === '2' ? '校工会活动' : '协会(社团)活动' }}
+                {{ viewData.activity_type === '1' ? '分工会活动' : viewData.activity_type === '2' ? '校工会活动' : '协会活动' }}
               </el-form-item>
             </el-col>
 
@@ -345,4 +345,4 @@ module.exports = {
 .item-form {
   padding: 0 25px;
 }
-</style>
+</style>

src/main/resources/views/mobile/club/clubAudit.html

@@ -100,7 +100,7 @@ layout("/mobile/platform.html"){
 
     <!--top栏-->
     <van-nav-bar
-            title="社团审核"
+            title="协会审核"
             left-arrow
             placeholder
             fixed
@@ -157,7 +157,7 @@ layout("/mobile/platform.html"){
                     <div style="margin-top: 10px">
                         <van-row>
                             <van-col span="24">
-                                <span style="color: grey">社团名称：</span>
+                                <span style="color: grey">协会名称：</span>
                                 <span>{{o.clubname}}</span>
                             </van-col>
                         </van-row>
@@ -363,7 +363,7 @@ layout("/mobile/platform.html"){
             data.forEach(item => {
                 this.clubOptions.push({text: item.name, value: item.id})
             })
-            this.clubOptions.unshift({text: '全部社团'})
+            this.clubOptions.unshift({text: '全部协会'})
             const userType = await getDictOptions('UserType')
             userType.forEach(item => {
                 this.userTypeOptions.push({text: item.name, value: item.code})

src/main/resources/views/mobile/club/inClub.html

@@ -142,7 +142,7 @@ layout("/mobile/platform.html"){
 
     <!--top栏-->
     <van-nav-bar
-            title="加入社团"
+            title="加入协会"
             left-arrow
             placeholder
             fixed
@@ -157,7 +157,7 @@ layout("/mobile/platform.html"){
                 shape="round"
                 maxlength="10"
                 @search="doSearch"
-                placeholder="请输入社团名称进行查询"
+                placeholder="请输入协会名称进行查询"
         >
         </van-search>
 
@@ -188,8 +188,8 @@ layout("/mobile/platform.html"){
                             <div style="color: grey">{{o.location}}</div>
                         </div>
                         <div style="color: #1867b0; white-space: nowrap;">
-                            <span v-if="o.status==1">待社团审核</span>
-                            <span v-if="o.status==2" style="color: red">社团拒绝</span>
+                            <span v-if="o.status==1">待协会审核</span>
+                            <span v-if="o.status==2" style="color: red">协会拒绝</span>
                             <span v-if="o.status==3">待校工会审核</span>
                             <span v-if="o.status==4" style="color: red">校工会拒绝</span>
                             <span v-if="o.status==5" style="color: green">审核通过</span>
@@ -258,7 +258,7 @@ layout("/mobile/platform.html"){
                 基础信息
             </div>
             <div class="van-card-body">
-                <van-cell title="社团名称">{{ detailData.name }}</van-cell>
+                <van-cell title="协会名称">{{ detailData.name }}</van-cell>
                 <van-cell title="成立时间">{{ detailData.foundtime }}</van-cell>
                 <van-cell title="报名联系人">{{ detailData.fzrname }}</van-cell>
                 <van-cell title="所属单位">{{ detailData.fzr_unit_name }}</van-cell>

src/main/resources/views/mobile/club/schoolAudit.html

@@ -105,7 +105,7 @@ layout("/mobile/platform.html"){
         <van-search
                 @search="doSearch"
                 maxlength="10"
-                placeholder="请输入社团名称进行查询"
+                placeholder="请输入协会名称进行查询"
                 shape="round"
                 v-model="pageForm.searchKeyword"
         >
@@ -137,8 +137,8 @@ layout("/mobile/platform.html"){
                             <div style="color: grey">{{o.location}}</div>
                         </div>
                         <!--<div style="color: #1867b0; white-space: nowrap;">
-                            <span v-if="o.status==1">待社团审核</span>
-                            <span v-if="o.status==2" style="color: red">社团拒绝</span>
+                            <span v-if="o.status==1">待协会审核</span>
+                            <span v-if="o.status==2" style="color: red">协会拒绝</span>
                             <span v-if="o.status==3">待校工会审核</span>
                             <span v-if="o.status==4" style="color: red">校工会拒绝</span>
                             <span v-if="o.status==5" style="color: green">审核通过</span>

src/main/resources/views/platform/activity/summary/club/clubSummary.html

@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
                 </div>
 
                 <div class="search-item">
-                    <div class="search-item-label">协会(社团)</div>
+                    <div class="search-item-label">协会</div>
                     <div class="search-item-option">
-                        <el-select v-model="pageForm.tissueId" placeholder="请选择协会（社团）" style="width: 100%;">
+                        <el-select v-model="pageForm.tissueId" placeholder="请选择协会" style="width: 100%;">
                             <el-option v-for="item in unionOptions" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </div>
@@ -61,7 +61,7 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column prop="year" label="年度">
                 </el-table-column>
-                <el-table-column sortable prop="name" label="协会（社团）">
+                <el-table-column sortable prop="name" label="协会">
                 </el-table-column>
                 <el-table-column sortable prop="typename" label="总结类型">
                 </el-table-column>
@@ -109,7 +109,7 @@ layout("/layouts/platform.html"){
                     <el-descriptions-item label="年度">
                         {{viewData.year}}
                     </el-descriptions-item>
-                    <el-descriptions-item label="协会（社团）">
+                    <el-descriptions-item label="协会">
                         {{viewData.name}}
                     </el-descriptions-item>
                     <el-descriptions-item label="总结类型">

src/main/resources/views/platform/activity/summary/common/addSummaryCommon.html

@@ -27,8 +27,8 @@
     </el-row>
     <el-row v-if="summaryFrom === '3'" :gutter="10" type="flex">
         <el-col :span="24">
-            <el-form-item label="协会（社团）" prop="tissueId">
-                <el-select v-model="formData.tissueId" placeholder="请选择协会（社团）" style="width: 100%;">
+            <el-form-item label="协会" prop="tissueId">
+                <el-select v-model="formData.tissueId" placeholder="请选择协会" style="width: 100%;">
                     <el-option v-for="item in clubOptions" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
@@ -54,4 +54,4 @@
 <el-row class="mt10" justify="end" type="flex">
     <el-button @click="cancel">取消</el-button>
     <el-button @click="doHandle" type="primary">提交</el-button>
-</el-row>
+</el-row>

src/main/resources/views/platform/activity/union/ActivityUnionManage.html

@@ -93,7 +93,7 @@ layout("/layouts/platform.html"){
 
                         <template v-else-if="column.prop=='type'" scope="{row}">
                             <span v-if="row.type==40001">分工会活动计划</span>
-                            <span v-if="row.type==40003">协会(社团)活动计划</span>
+                            <span v-if="row.type==40003">协会活动计划</span>
                             <span v-if="row.type==40003">校工会活动计划</span>
                         </template>
 
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
                         <el-form-item prop="type" label="活动类型">
                             <el-radio-group v-model="formData.type">
                                 <el-radio label="1" border>分工会活动</el-radio>
-                                <el-radio label="2" border>协会(社团)活动</el-radio>
+                                <el-radio label="2" border>协会活动</el-radio>
                             </el-radio-group>
                         </el-form-item>
                     </el-col>

src/main/resources/views/platform/activity/union/ActivityUnionPlan.html

@@ -98,7 +98,7 @@ layout("/layouts/platform.html"){
 
                         <template v-else-if="column.prop=='type'" scope="{row}">
                             <span v-if="row.type==40001">分工会活动计划</span>
-                            <span v-if="row.type==40003">协会(社团)活动计划</span>
+                            <span v-if="row.type==40003">协会活动计划</span>
                             <span v-if="row.type==40003">校工会活动计划</span>
                         </template>
 
@@ -145,7 +145,7 @@ layout("/layouts/platform.html"){
                 <el-form-item prop="type" label="活动类型">
                     <el-radio-group v-model="formData.type">
                         <el-radio label="2" border>分工会活动计划</el-radio>
-                        <el-radio label="3" border>协会(社团)活动计划</el-radio>
+                        <el-radio label="3" border>协会活动计划</el-radio>
                     </el-radio-group>
                 </el-form-item>
 

src/main/resources/views/platform/activity/union/addPlanCommon.html

@@ -5,7 +5,7 @@
     <!-- <el-form-item prop="type" label="活动类型">
          <el-radio-group v-model="formData.type">
              <el-radio label="2" border>分工会活动计划</el-radio>
-             <el-radio label="3" border>协会(社团)活动计划</el-radio>
+             <el-radio label="3" border>协会活动计划</el-radio>
          </el-radio-group>
      </el-form-item>-->
 
@@ -62,4 +62,4 @@
 <el-row class="mt10" justify="end" type="flex">
     <el-button @click="cancel">取消</el-button>
     <el-button @click="doHandle" type="primary">提交</el-button>
-</el-row>
+</el-row>

src/main/resources/views/platform/activity/union/layoutPlan.html

@@ -39,9 +39,9 @@
                     </div>
 
                     <div v-if="window.type === 40003" class="search-item">
-                        <div class="search-item-label">协会(社团)</div>
+                        <div class="search-item-label">协会</div>
                         <div class="search-item-option">
-                            <el-select v-model="pageForm.tissueId" placeholder="请选择协会（社团）" filterable clearable
+                            <el-select v-model="pageForm.tissueId" placeholder="请选择协会" filterable clearable
                                        style="width: 100%">
                                 <el-option
                                         v-for="item in clubList"
@@ -102,7 +102,7 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column v-if="window.type === 40003" prop="clubname" label="协会（社团）" show-overflow-tooltip>
+                    <el-table-column v-if="window.type === 40003" prop="clubname" label="协会" show-overflow-tooltip>
                         <template scope="{row}">
                             <span>{{clubList.find(x => x.id == row.tissueId) === undefined ? '' : clubList.find(x => x.id == row.tissueId).name}}</span>
                         </template>
@@ -160,7 +160,7 @@
                 <!-- <el-form-item prop="type" label="活动类型">
                      <el-radio-group v-model="formData.type">
                          <el-radio label="2" border>分工会活动计划</el-radio>
-                         <el-radio label="3" border>协会(社团)活动计划</el-radio>
+                         <el-radio label="3" border>协会活动计划</el-radio>
                      </el-radio-group>
                  </el-form-item>-->
 

src/main/resources/views/platform/caredata/StaffCareData.html

@@ -362,7 +362,7 @@ layout("/layouts/platform.html"){
                         icon: 'el-icon-basketball'
                     },
                     sthd: {
-                        name: '社团活动',
+                        name: '协会活动',
                         color: "#6DC8EC",
                         icon: 'el-icon-basketball'
                     },
@@ -523,4 +523,4 @@ layout("/layouts/platform.html"){
 </script>
 <!--#
 }
-#-->
+#-->

src/main/resources/views/platform/caredata/UnionCareData.html

@@ -112,7 +112,7 @@ layout("/layouts/platform.html"){
                         <div class="cut-off-line"></div>
                     </el-col>
                     <el-col :span="4" style="position: relative">
-                        <div class="top_title">社团数</div>
+                        <div class="top_title">协会数</div>
                         <div class="top_num">{{numData.st_num?numData.st_num:'0'}}</div>
                         <div class="cut-off-line"></div>
                     </el-col>
@@ -147,7 +147,7 @@ layout("/layouts/platform.html"){
                         <div class="cut-off-line"></div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="top_title">社团活动数
+                        <div class="top_title">协会活动数
                             <el-popover
                                     placement="top-start"
                                     title=""
@@ -358,7 +358,7 @@ layout("/layouts/platform.html"){
                 </el-col>
 
                 <el-row v-if="stNone" class="none-data">
-                    <span class="none-data-title">暂无社团</span>
+                    <span class="none-data-title">暂无协会</span>
                 </el-row>
             </el-row>
         </el-card>
@@ -672,7 +672,7 @@ layout("/layouts/platform.html"){
                             forceFit: true,
                             title: {
                                 visible: true,
-                                text: this.stys_year + '年社团经费使用情况',
+                                text: this.stys_year + '年协会经费使用情况',
                             },
                             description: {
                                 visible: true,
@@ -699,7 +699,7 @@ layout("/layouts/platform.html"){
                             "yAxis": {},
                             meta: {
                                 name: {
-                                    alias: '社团',
+                                    alias: '协会',
                                 },
                                 money: {
                                     alias: '金额',

src/main/resources/views/platform/jf/Funds/apply.html

@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
                                               <!–#if(@shiro.hasRole('H04') || @shiro.hasRole('sysadmin')){#–>
                                               <el-option label="基层工会活动" value="1"></el-option>
                                                   &lt;!&ndash;#}#&ndash;&gt;    &lt;!&ndash;#if(@shiro.hasRole('H02') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
-                                              <el-option label="协会(社团)活动" value="2"></el-option>
+                                              <el-option label="协会活动" value="2"></el-option>
                                                   &lt;!&ndash;#}#&ndash;&gt;
                                                   &lt;!&ndash;#if(@shiro.hasRole('A06') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
                                               <el-option label="校工会活动" value="3"></el-option>

src/main/resources/views/platform/jf/club/clubtz.html

@@ -183,7 +183,7 @@ layout("/layouts/platform.html"){
                             <el-table-column label="活动名称" prop="project" header-align="center"
                                              align="center"></el-table-column>
 
-                            <el-table-column label="所属社团" prop="name" header-align="center"
+                            <el-table-column label="所属协会" prop="name" header-align="center"
                                              align="center">
                                 <template scope="scope"><span>{{clubInfo.name}} </span></template>
                             </el-table-column>

src/main/resources/views/platform/jf/costsSet/costsSet.html

@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
                     </el-col>
                 </el-row>
 
-                <vi-title class="mt20" title="协会/社团预算设置"></vi-title>
+                <vi-title class="mt20" title="协会/协会预算设置"></vi-title>
                 <el-row :gutter="20">
                     <el-col :span="24">
                         <el-input :disabled="clubDisabled" placeholder="基础人数"
@@ -176,4 +176,4 @@ layout("/layouts/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/platform/jf/reimbursement/board.html

@@ -169,7 +169,7 @@ layout("/layouts/platform.html"){
                         <div class="cut-off-line"></div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="top_title">社团活动经费（元）
+                        <div class="top_title">协会活动经费（元）
                             <el-popover
                                     placement="top-start"
                                     title=""
@@ -295,7 +295,7 @@ layout("/layouts/platform.html"){
                 </div>
                 <el-col :span="24" style="padding: 0 20px"
                         v-loading="all_club_loading">
-                    <div class="chartTitle" style="margin-bottom: 50px">{{allClubYear}}年社团经费及活动情况
+                    <div class="chartTitle" style="margin-bottom: 50px">{{allClubYear}}年协会经费及活动情况
                         <el-tooltip class="item" effect="dark" :content="'点击切换为' + clubTip " placement="top">
                             <el-button type="text" icon="el-icon-sort" @click="doClubSwitch"></el-button>
                         </el-tooltip>

src/main/resources/views/platform/reimbursement/Summary.html

@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
                         <el-select clearable style="width: 100%" v-model="pageForm.jf_source">
                             <el-option value="1" label="校工会"></el-option>
                             <el-option value="2" label="分工会"></el-option>
-                            <el-option value="3" label="社团"></el-option>
+                            <el-option value="3" label="协会"></el-option>
                         </el-select>
                     </div>
                 </div>
@@ -282,4 +282,4 @@ layout("/layouts/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/platform/reimbursement/applyNew.html

@@ -89,10 +89,10 @@ layout("/layouts/platform.html"){
                     </el-col>
 
                     <el-col :span="12" v-if="formData.jf_source === '3'">
-                        <el-form-item label="所属社团" prop="clubId">
+                        <el-form-item label="所属协会" prop="clubId">
                             <el-select v-model="formData.clubId" @change="clubChange"
                                        style="width: 100%"
-                                       placeholder="请选择所属社团">
+                                       placeholder="请选择所属协会">
                                 <el-option
                                         v-for="item in clubList"
                                         :key="item.clubid"
@@ -331,7 +331,7 @@ layout("/layouts/platform.html"){
                                            style="width: 100%">
                                     <el-option label="分工会活动" value="1"></el-option>
                                     <el-option label="校工会活动" value="2"></el-option>
-                                    <el-option label="协会(社团)活动" value="3"></el-option>
+                                    <el-option label="协会活动" value="3"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -703,7 +703,7 @@ layout("/layouts/platform.html"){
             if ("${@shiro.hasRole('sysadmin')}" === 'true') {
                 this.jfSourceList.push({key: "1", name: "校工会"})
                 this.jfSourceList.push({key: "2", name: "分工会"})
-                this.jfSourceList.push({key: "3", name: "协会/社团"})
+                this.jfSourceList.push({key: "3", name: "协会/协会"})
             } else {
                 if ("${@shiro.hasRole('A06')}" === 'true') {
                     this.jfSourceList.push({key: "1", name: "校工会"})
@@ -712,7 +712,7 @@ layout("/layouts/platform.html"){
                     this.jfSourceList.push({key: "2", name: "分工会"})
                 }
                 if ("${@shiro.hasRole('club01')}" === 'true') {
-                    this.jfSourceList.push({key: "3", name: "协会/社团"})
+                    this.jfSourceList.push({key: "3", name: "协会/协会"})
                 }
             }
             const id = getQueryVariable("id")
@@ -727,4 +727,4 @@ layout("/layouts/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/platform/sys/club/applyIn/schoolsh.html

@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
                     </el-input>
                 </div>
                 <div class="d-search-item btn-group tool-button">
-                    <el-select clearable filterable placeholder="请选择社团"
+                    <el-select clearable filterable placeholder="请选择协会"
                                v-model="pageForm.clubid">
                         <el-option
                                 :label="item.name"
@@ -115,9 +115,9 @@ layout("/layouts/platform.html"){
                             <span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" header-align="center" label="社团编码" prop="code" show-overflow-tooltip
+                    <el-table-column align="center" header-align="center" label="协会编码" prop="code" show-overflow-tooltip
                                      sortable></el-table-column>
-                    <el-table-column align="center" header-align="center" label="社团名称" show-overflow-tooltip sortable
+                    <el-table-column align="center" header-align="center" label="协会名称" show-overflow-tooltip sortable
                                      prop="clubname"></el-table-column>
                     <el-table-column width="100" align="center" header-align="center" label="工号" sortable
                                      prop="loginname"></el-table-column>
@@ -168,8 +168,8 @@ layout("/layouts/platform.html"){
                     <el-table-column align="center" header-align="center" label="审核状态"
                                      prop="status">
                         <template slot-scope="scope">
-                            <el-tag v-if="scope.row.status==1" type="primary">待社团审核</el-tag>
-                            <el-tag v-if="scope.row.status==2" type="danger">社团拒绝</el-tag>
+                            <el-tag v-if="scope.row.status==1" type="primary">待协会审核</el-tag>
+                            <el-tag v-if="scope.row.status==2" type="danger">协会拒绝</el-tag>
                             <el-tag v-if="scope.row.status==3" type="primary">待校工会审核</el-tag>
                             <el-tag v-if="scope.row.status==4" type="danger">校工会拒绝</el-tag>
                             <el-tag v-if="scope.row.status==5" type="success">审核通过</el-tag>

src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateApply.html

@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <el-card shadow="never">
 
-            <vi-title title="年度优秀社团申报（温馨提示：申报范围为当年年度考核结果为合格的教职工社团）"></vi-title>
+            <vi-title title="年度优秀协会申报（温馨提示：申报范围为当年年度考核结果为合格的教职工协会）"></vi-title>
 
             <el-form :model="formData" ref="form" :rules="formRules" label-width="120px" style="padding: 0 30px">
                 <el-row gutter="30">
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="社团名称" prop="clubId" :rules="{required: true, message: '请选择社团', trigger: 'blur'}">
-                            <el-select v-model="formData.clubId" placeholder="请选择社团" filterable clearable
+                        <el-form-item label="协会名称" prop="clubId" :rules="{required: true, message: '请选择协会', trigger: 'blur'}">
+                            <el-select v-model="formData.clubId" placeholder="请选择协会" filterable clearable
                                        style="width: 100%" :disabled="isCanApply === false">
                                 <el-option
                                         v-for="item in clubList"
@@ -179,7 +179,7 @@ layout("/layouts/platform.html"){
                     yearActivity.txt.html(resp.data.yearActivity ? resp.data.yearActivity : '')
                 }
             },
-            //获取当前登录用户管理的社团并且年度审核通过的
+            //获取当前登录用户管理的协会并且年度审核通过的
             async getMyClubAndYearAuditPass() {
                 const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
                     year: new Date().getFullYear()
@@ -191,7 +191,7 @@ layout("/layouts/platform.html"){
             const year = moment().format('YYYY')
             this.isCanApply = year % 2 === 0
             if(this.isCanApply === false) {
-                this.$alert('当前年份（' + year + '）不能进行年度优秀社团申报', '温馨提示', {
+                this.$alert('当前年份（' + year + '）不能进行年度优秀协会申报', '温馨提示', {
                     confirmButtonText: '确定',
                 })
             }

src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateHzAudit.html

@@ -25,9 +25,9 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
-                        <el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
+                        <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
                                    style="width: 100%">
                             <el-option
                                     v-for="item in clubList"
@@ -58,11 +58,11 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
+                <el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>
@@ -233,7 +233,7 @@ layout("/layouts/platform.html"){
                     });
                 }
             },
-            //获取当前登录用户管理的社团并且年度审核通过的
+            //获取当前登录用户管理的协会并且年度审核通过的
             async getMyClubAndYearAuditPass() {
                 const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
                     year: this.pageForm.year

src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMine.html

@@ -27,9 +27,9 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
                     <div class="search-item">
-                        <div class="search-item-label">社团名称：</div>
+                        <div class="search-item-label">协会名称：</div>
                         <div class="search-item-option">
-                            <el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
+                            <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
                                        style="width: 100%">
                                 <el-option
                                         v-for="item in clubList"
@@ -55,11 +55,11 @@ layout("/layouts/platform.html"){
                     <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                      width="80px"></el-table-column>
 
-                    <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                    <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
+                    <el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                    <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
                     <el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
                                      show-overflow-tooltip>
@@ -164,7 +164,7 @@ layout("/layouts/platform.html"){
                     });
                 }
             },
-            //获取当前登录用户管理的社团并且年度审核通过的
+            //获取当前登录用户管理的协会并且年度审核通过的
             async getMyClubAndYearAuditPass() {
                 const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
                     applyYear: this.pageForm.applyYear

src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMszAudit.html

@@ -25,9 +25,9 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
-                        <el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
+                        <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
                                    style="width: 100%">
                             <el-option
                                     v-for="item in clubList"
@@ -58,11 +58,11 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
+                <el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>
@@ -229,7 +229,7 @@ layout("/layouts/platform.html"){
                     });
                 }
             },
-            //获取当前登录用户管理的社团并且年度审核通过的
+            //获取当前登录用户管理的协会并且年度审核通过的
             async getMyClubAndYearAuditPass() {
                 const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
                     year: this.pageForm.year

src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateSchoolAudit.html

@@ -25,9 +25,9 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
-                        <el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
+                        <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
                                    style="width: 100%">
                             <el-option
                                     v-for="item in clubList"
@@ -58,11 +58,11 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
+                <el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>
@@ -236,7 +236,7 @@ layout("/layouts/platform.html"){
                     });
                 }
             },
-            //获取当前登录用户管理的社团并且年度审核通过的
+            //获取当前登录用户管理的协会并且年度审核通过的
             async getMyClubAndYearAuditPass() {
                 const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
                     year: this.pageForm.year

src/main/resources/views/platform/sys/club/clubUserCount.html

@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
                     </el-select>
                 </div>
                 <div class="btn-group tool-button mt5">
-                    <el-select v-model="pageForm.clubId" placeholder="请选择社团">
+                    <el-select v-model="pageForm.clubId" placeholder="请选择协会">
                         <el-option v-for="item in clubList"
                                    :label="item.name" :value="item.id" :key="item.id">
                         </el-option>
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
             </el-card>
 
             <el-card shadow="never" class="mt10">
-                <table-tool :app="this" label="社团统计">
+                <table-tool :app="this" label="协会统计">
                     <template #func>
                         <el-button @click="exportData" type="primary" size="small">导出全部统计数据</el-button>
                         <el-button @click="exportUserData(null)" v-if="${@shiro.hasAnyRoles('sysadmin', 'A06', 'xxhgly')}"
@@ -69,13 +69,13 @@ layout("/layouts/platform.html"){
                             <span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" header-align="center" label="社团名称"
+                    <el-table-column align="center" header-align="center" label="协会名称"
                                      prop="name" show-overflow-tooltip></el-table-column>
 
-                    <el-table-column align="center" header-align="center" label="社团编码"
+                    <el-table-column align="center" header-align="center" label="协会编码"
                                      prop="code"></el-table-column>
 
-                    <el-table-column align="center" sortable header-align="center" label="社团总人数"
+                    <el-table-column align="center" sortable header-align="center" label="协会总人数"
                                      prop="total"></el-table-column>
 
                     <el-table-column align="center" sortable header-align="center" label="在职人数"
@@ -93,10 +93,10 @@ layout("/layouts/platform.html"){
                     <el-table-column align="center" sortable header-align="center" label="理事机构人数"
                                      prop="governing_body"></el-table-column>
 
-                    <!--<el-table-column align="center" header-align="center" label="社团确认" sortable
+                    <!--<el-table-column align="center" header-align="center" label="协会确认" sortable
                                      prop="club_has_confirm"></el-table-column>
 
-                    <el-table-column align="center" header-align="center" label="社团待确认" sortable
+                    <el-table-column align="center" header-align="center" label="协会待确认" sortable
                                      prop="club_no_confirm"></el-table-column>
 
                     <el-table-column align="center" header-align="center" label="校工会确认" sortable

src/main/resources/views/platform/sys/club/examine/register.html

@@ -39,8 +39,8 @@ layout("/layouts/platform.html"){
                 <vi-title title="基础信息"></vi-title>
                 <el-row :gutter="20" type="flex">
                     <el-col :span="8">
-                        <el-form-item prop="clubId" label="社团名称">
-                            <el-select v-model="jc.clubId" placeholder="请选择所属社团" filterable
+                        <el-form-item prop="clubId" label="协会名称">
+                            <el-select v-model="jc.clubId" placeholder="请选择所属协会" filterable
                                        clearable
                                        @change="changeClub"
                                        style="width: 100%">
@@ -86,7 +86,7 @@ layout("/layouts/platform.html"){
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <vi-title title="社团成员变化情况"></vi-title>
+                <vi-title title="协会成员变化情况"></vi-title>
                 <el-row :gutter="20" type="flex">
                     <el-col :span="24">
                         <el-form-item prop="" label="">
@@ -243,7 +243,7 @@ layout("/layouts/platform.html"){
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
                     <el-table-column label="职务" prop="roleName">
                         <template scope="scope">
-                            <span v-if="scope.row.roleName">{{scope.row.roleName.replace('社团', '')}}</span>
+                            <span v-if="scope.row.roleName">{{scope.row.roleName.replace('协会', '')}}</span>
                             <span v-else></span>
                         </template>
                     </el-table-column>
@@ -500,7 +500,7 @@ layout("/layouts/platform.html"){
                 await this.getClubUserNum(this.jc.clubId)
                 await this.getJgUser(this.jc.clubId)
             },
-            //获取当前年度社团有没有登记
+            //获取当前年度协会有没有登记
             async getCount() {
                 const resp = await $.get(loc() + '/getCount', {id: this.jc.clubId})
                 this.isRegist = resp.data > 0

src/main/resources/views/platform/sys/club/examine/registerFzrAudit.html

@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
                 },
                 tableColumns: [
                     {prop: 'year', label: '年度'},
-                    {prop: 'clubName', label: '社团名称'},
+                    {prop: 'clubName', label: '协会名称'},
                     {prop: 'foundTime', label: '成立时间'},
                     {prop: 'username', label: '联系人', sortable: true},
                     {prop: 'concatPersonMobile', label: '联系方式', sortable: true},

src/main/resources/views/platform/sys/club/examine/registerHzAudit.html

@@ -144,7 +144,7 @@ layout("/layouts/platform.html"){
                 },
                 tableColumns: [
                     {prop: 'year', label: '年度'},
-                    {prop: 'clubName', label: '社团名称'},
+                    {prop: 'clubName', label: '协会名称'},
                     {prop: 'foundTime', label: '成立时间'},
                     {prop: 'username', label: '联系人', sortable: true},
                     {prop: 'concatPersonMobile', label: '联系方式', sortable: true},

src/main/resources/views/platform/sys/club/examine/registerManage.html

@@ -82,7 +82,7 @@ layout("/layouts/platform.html"){
                 },
                 tableColumns: [
                     {prop: 'year', label: '年度'},
-                    {prop: 'clubName', label: '社团名称'},
+                    {prop: 'clubName', label: '协会名称'},
                     {prop: 'foundTime', label: '成立时间'},
                     {prop: 'username', label: '联系人', sortable: true},
                     {prop: 'concatPersonMobile', label: '联系方式', sortable: true},

src/main/resources/views/platform/sys/club/examine/registerUnitPartAudit.html

@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
                 <div class="search-item">
                     <div class="search-item-label">协&emsp;&emsp;会</div>
                     <div class="search-item-option">
-                        <el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable
+                        <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable
                                    clearable
                                    @change="doSearch"
                                    style="width: 100%">
@@ -156,7 +156,7 @@ layout("/layouts/platform.html"){
                 clubOptions: [],
                 tableColumns: [
                     {prop: 'year', label: '年度'},
-                    {prop: 'clubName', label: '社团名称'},
+                    {prop: 'clubName', label: '协会名称'},
                     {prop: 'foundTime', label: '成立时间'},
                     {prop: 'username', label: '联系人', sortable: true},
                     {prop: 'concatPersonMobile', label: '联系方式', sortable: true},

src/main/resources/views/platform/sys/club/examine/registerXghAudit.html

@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
                 <div class="search-item">
                     <div class="search-item-label">协&emsp;&emsp;会</div>
                     <div class="search-item-option">
-                        <el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable
+                        <el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable
                                    clearable
                                    @change="doSearch"
                                    style="width: 100%">
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
                 clubOptions: [],
                 tableColumns: [
                     {prop: 'year', label: '年度'},
-                    {prop: 'clubName', label: '社团名称'},
+                    {prop: 'clubName', label: '协会名称'},
                     {prop: 'foundTime', label: '成立时间'},
                     {prop: 'username', label: '联系人', sortable: true},
                     {prop: 'concatPersonMobile', label: '联系方式', sortable: true},

src/main/resources/views/platform/sys/club/include_club_view.html

@@ -1,21 +1,21 @@
 <el-tabs v-model="activeName">
     <el-tab-pane label="基础信息" name="1">
 
-        <vi-title title="社团信息"></vi-title>
+        <vi-title title="协会信息"></vi-title>
         <el-descriptions :column="3" border class="table_fixed">
-            <el-descriptions-item :span="3" label="社团名称">
+            <el-descriptions-item :span="3" label="协会名称">
                 {{viewData.name}}
             </el-descriptions-item>
-            <el-descriptions-item label="社团编码">
+            <el-descriptions-item label="协会编码">
                 {{viewData.code}}
             </el-descriptions-item>
-            <el-descriptions-item label="社团类型">
+            <el-descriptions-item label="协会类型">
                 {{viewData.typeName}}
             </el-descriptions-item>
             <el-descriptions-item label="发起人">
                 {{viewData.sponsorName}}
             </el-descriptions-item>
-            <el-descriptions-item label="社团联系人">
+            <el-descriptions-item label="协会联系人">
                 {{viewData.fzrName}}
             </el-descriptions-item>
             <el-descriptions-item label="所在单位">
@@ -50,11 +50,11 @@
                              :view="true"></file-upload>
             </el-descriptions-item>
             <el-descriptions-item span="3">
-                <template slot="label">社团介绍</template>
+                <template slot="label">协会介绍</template>
                 <div class="text-left" v-html="viewData.stjs"></div>
             </el-descriptions-item>
             <el-descriptions-item span="3">
-                <template slot="label">社团章程</template>
+                <template slot="label">协会章程</template>
                 <div class="text-left" v-html="viewData.stzc"></div>
             </el-descriptions-item>
         </el-descriptions>
@@ -119,4 +119,4 @@
             <el-button type="primary" @click="doReview(3)">通过</el-button>
         </el-row>
     </el-tab-pane>
-</el-tabs>
+</el-tabs>

src/main/resources/views/platform/sys/club/manage/clubManagePersonAudit.html

@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
         <el-card shadow="never">
             <div class="search">
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
-                        <el-select filterable placeholder="请选择社团" style="width: 100%;"
+                        <el-select filterable placeholder="请选择协会" style="width: 100%;"
                                    v-model="pageForm.clubId">
                             <el-option :label="item.name" :value="item.id" v-for="item in clubList"></el-option>
                         </el-select>
@@ -44,11 +44,11 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
+                <el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="成员" prop="username" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>

src/main/resources/views/platform/sys/club/manage/refreshReport.html

@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
                     <div class="search-item">
-                        <div class="search-item-label">社团名称：</div>
+                        <div class="search-item-label">协会名称：</div>
                         <div class="search-item-option">
                             <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                       clearable
@@ -45,9 +45,9 @@ layout("/layouts/platform.html"){
                     <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                      width="80px"></el-table-column>
 
-                    <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                    <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                    <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
                     <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                      show-overflow-tooltip>

src/main/resources/views/platform/sys/club/manage/ruleUpdate.html

@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
                     <div class="search-item">
-                        <div class="search-item-label">社团名称：</div>
+                        <div class="search-item-label">协会名称：</div>
                         <div class="search-item-option">
                             <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                       clearable
@@ -45,9 +45,9 @@ layout("/layouts/platform.html"){
                     <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                      width="80px"></el-table-column>
 
-                    <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                    <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                    <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
                     <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                      show-overflow-tooltip>
@@ -66,7 +66,7 @@ layout("/layouts/platform.html"){
                     <el-table-column label="发起人" prop="sponsorName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
 
-                    <el-table-column label="社团章程" prop="afterRulesFile" sortable align="center" header-align="center"
+                    <el-table-column label="协会章程" prop="afterRulesFile" sortable align="center" header-align="center"
                                      show-overflow-tooltip>
                         <template scope="scope">
                             <span style="color: #0e78c5; text-decoration: underline; cursor: pointer"
@@ -172,7 +172,7 @@ layout("/layouts/platform.html"){
             },
             uploadRule(row) {
                 /*if(row.afterRulesFile && row.ruleState === 1) {
-                    this.$message.warning('您已上传新的社团章程，待校工会审核')
+                    this.$message.warning('您已上传新的协会章程，待校工会审核')
                     return
                 }*/
                 this.clickRow = row

src/main/resources/views/platform/sys/club/manage/schoolAuditRule.html

@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
                     <div class="search-item">
-                        <div class="search-item-label">社团名称：</div>
+                        <div class="search-item-label">协会名称：</div>
                         <div class="search-item-option">
                             <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                       clearable
@@ -45,9 +45,9 @@ layout("/layouts/platform.html"){
                     <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                      width="80px"></el-table-column>
 
-                    <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                    <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                    <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
                     <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                      show-overflow-tooltip>
@@ -66,7 +66,7 @@ layout("/layouts/platform.html"){
                     <el-table-column label="发起人" prop="sponsorName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
 
-                    <el-table-column label="社团章程" prop="afterRulesFile" sortable align="center" header-align="center"
+                    <el-table-column label="协会章程" prop="afterRulesFile" sortable align="center" header-align="center"
                                      show-overflow-tooltip>
                         <template scope="scope">
                             <span style="color: #0e78c5; text-decoration: underline; cursor: pointer"
@@ -103,11 +103,11 @@ layout("/layouts/platform.html"){
     <el-dialog width="40%" :visible.sync="dialogVisible" title="校工会审核">
 
         <el-descriptions :column="2" border class="table_fixed">
-            <el-descriptions-item :span="2" label="旧社团章程">
+            <el-descriptions-item :span="2" label="旧协会章程">
                 <file-upload :files.sync="clickRow.rulesFile" view>
                 </file-upload>
             </el-descriptions-item>
-            <el-descriptions-item label="新社团章程">
+            <el-descriptions-item label="新协会章程">
                 <file-upload :files.sync="clickRow.afterRulesFile" view>
                 </file-upload>
             </el-descriptions-item>

src/main/resources/views/platform/sys/club/regist/clubConfirm.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
                         <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                   clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
         </el-card>
 
         <template #edit>
-            <club-regist-info ref="info2" :handle="true" label="社团确认" :panes="[2, 3, 4, 5]">
+            <club-regist-info ref="info2" :handle="true" label="协会确认" :panes="[2, 3, 4, 5]">
                 <template #handle>
                     <vi-title title="确认信息（以下信息如没有调整，请忽略，否则请修改）"></vi-title>
                     <el-form :model="formData" ref="form" :rules="formRules" label-position="right"
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="社团章程" prop="rulesFile">
+                                <el-form-item label="协会章程" prop="rulesFile">
                                     <file-upload :files.sync="formData.rulesFile" :max="5" :type="['doc','docx']">
                                     </file-upload>
                                 </el-form-item>

src/main/resources/views/platform/sys/club/regist/clubMyApply.html

@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
                     <div class="search-item">
-                        <div class="search-item-label">社团名称：</div>
+                        <div class="search-item-label">协会名称：</div>
                         <div class="search-item-option">
                             <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                       clearable
@@ -43,16 +43,16 @@ layout("/layouts/platform.html"){
             <el-card class="mt10" shadow="never">
                 <table-tool :app="this" label="申请列表">
                     <template #func>
-                        <el-button @click="openAdd" size="small" type="primary">社团注册</el-button>
+                        <el-button @click="openAdd" size="small" type="primary">协会注册</el-button>
                     </template>
                 </table-tool>
                 <el-table :data="tableData" :size="tableSize">
                     <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                      width="80px"></el-table-column>
 
-                    <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                    <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                    <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                      show-overflow-tooltip></el-table-column>
                     <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                      show-overflow-tooltip>

src/main/resources/views/platform/sys/club/regist/clubRegistApply.html

@@ -15,18 +15,18 @@ layout("/layouts/platform.html"){
         <el-card shadow="never">
 
             <div slot="header" class="clearfix">
-                <h3 style="color: rgb(24, 103, 176);font-family: Microsoft YaHei;">注册社团</h3>
+                <h3 style="color: rgb(24, 103, 176);font-family: Microsoft YaHei;">注册协会</h3>
             </div>
 
             <el-steps :active="activeName" finish-status="success" align-center>
-                <el-step title="社团基本信息"></el-step>
-                <el-step title="社团发起人"></el-step>
-                <el-step title="社团理事机构"></el-step>
+                <el-step title="协会基本信息"></el-step>
+                <el-step title="协会发起人"></el-step>
+                <el-step title="协会理事机构"></el-step>
             </el-steps>
 
             <div style="margin-top: 10px">
                 <div v-show="activeName === '1'">
-                    <vi-title title="请填写以下社团信息"></vi-title>
+                    <vi-title title="请填写以下协会信息"></vi-title>
                     <el-form :model="formData" ref="form" :rules="formRules" label-width="150px" style="padding: 0 30px">
                         <el-row gutter="30">
                             <el-col :span="12">
@@ -40,23 +40,23 @@ layout("/layouts/platform.html"){
                         </el-row>
                         <el-row gutter="30">
                             <el-col :span="12">
-                                <el-form-item label="社团名称" prop="name">
-                                    <el-input maxlength="100" placeholder="请填写社团名称" v-model="formData.name"
+                                <el-form-item label="协会名称" prop="name">
+                                    <el-input maxlength="100" placeholder="请填写协会名称" v-model="formData.name"
                                               type="text"></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="社团编码" prop="code">
-                                    <el-input placeholder="请填写社团编码" v-model="formData.code"></el-input>
+                                <el-form-item label="协会编码" prop="code">
+                                    <el-input placeholder="请填写协会编码" v-model="formData.code"></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
 
                         <el-row gutter="30">
                             <el-col :span="12">
-                                <el-form-item label="社团类型" prop="type">
+                                <el-form-item label="协会类型" prop="type">
                                     <el-select v-model="formData.type" style="width: 100%"
-                                               placeholder="请选择社团类型">
+                                               placeholder="请选择协会类型">
                                         <el-option
                                                 v-for="item in typeOptions"
                                                 :key="item.id"
@@ -114,11 +114,11 @@ layout("/layouts/platform.html"){
                             </el-col>
                         </el-row>
 
-                        <el-form-item label="社团介绍" prop="stjs">
+                        <el-form-item label="协会介绍" prop="stjs">
                             <text-editor v-model="formData.stjs"></text-editor>
                         </el-form-item>
 
-                        <el-form-item label="社团宗旨" prop="stzz">
+                        <el-form-item label="协会宗旨" prop="stzz">
                             <text-editor v-model="formData.stzz"></text-editor>
                         </el-form-item>
 
@@ -174,7 +174,7 @@ layout("/layouts/platform.html"){
                 </div>
 
                 <div v-show="activeName === '2'">
-                    <vi-title title="请填写社团发起人信息"></vi-title>
+                    <vi-title title="请填写协会发起人信息"></vi-title>
                     <el-table :data="sponsorData">
                         <el-table-column label="姓名" prop="userId">
                             <template slot-scope="scope">
@@ -224,7 +224,7 @@ layout("/layouts/platform.html"){
                 </div>
 
                 <div v-show="activeName === '3'">
-                    <vi-title title="请填写社团理事机构信息"></vi-title>
+                    <vi-title title="请填写协会理事机构信息"></vi-title>
                     <el-table :data="managePerson">
                         <el-table-column label="职务" prop="roleId">
                             <template slot-scope="scope">
@@ -314,10 +314,10 @@ layout("/layouts/platform.html"){
                     sponsorType: 1,
                 },
                 formRules: {
-                    name: [{required: true, message: '请填写社团名称', trigger: ['blur', 'change']}],
-                    code: [{required: true, message: '请填写社团编码', trigger: ['blur', 'change']}],
-                    type: [{required: true, message: '请选择社团类型', trigger: ['blur', 'change']}],
-                    fzr: [{required: true, message: '请选择社团联系人', trigger: ['blur', 'change']}],
+                    name: [{required: true, message: '请填写协会名称', trigger: ['blur', 'change']}],
+                    code: [{required: true, message: '请填写协会编码', trigger: ['blur', 'change']}],
+                    type: [{required: true, message: '请选择协会类型', trigger: ['blur', 'change']}],
+                    fzr: [{required: true, message: '请选择协会联系人', trigger: ['blur', 'change']}],
                     sponsorType: [{required: true, message: '请选择发起类型', trigger: ['blur', 'change']}],
                 },
                 typeOptions: [],
@@ -386,7 +386,7 @@ layout("/layouts/platform.html"){
                 cloneData.splice(index, 1)
                 const u = cloneData.find(o => o.userId === val)
                 if (u) {
-                    this.$message.warning('社团发起人不能重复')
+                    this.$message.warning('协会发起人不能重复')
                     row.userId = ''
                     row.loginname = ''
                     row.unitname = ''

src/main/resources/views/platform/sys/club/regist/include_club_view.html

@@ -1,24 +1,24 @@
 <el-tabs v-model="activeName">
     <el-tab-pane label="基础信息" name="1">
 
-        <vi-title title="社团信息"></vi-title>
+        <vi-title title="协会信息"></vi-title>
         <el-descriptions :column="3" border class="table_fixed">
-            <el-descriptions-item :span="2" label="社团名称">
+            <el-descriptions-item :span="2" label="协会名称">
                 {{viewData.name}}
             </el-descriptions-item>
             <el-descriptions-item label="成立时间">
                 {{viewData.create_time}}
             </el-descriptions-item>
-            <el-descriptions-item label="社团编码">
+            <el-descriptions-item label="协会编码">
                 {{viewData.code}}
             </el-descriptions-item>
-            <el-descriptions-item label="社团类型">
+            <el-descriptions-item label="协会类型">
                 {{viewData.typeName}}
             </el-descriptions-item>
             <el-descriptions-item label="发起人">
                 {{viewData.sponsorName}}
             </el-descriptions-item>
-            <el-descriptions-item label="社团联系人">
+            <el-descriptions-item label="协会联系人">
                 {{viewData.fzrName}}
             </el-descriptions-item>
             <el-descriptions-item label="所属单位">
@@ -57,11 +57,11 @@
                 <div class="text-left" v-html="viewData.yearPlan"></div>
             </el-descriptions-item>
             <el-descriptions-item span="3">
-                <template slot="label">社团介绍</template>
+                <template slot="label">协会介绍</template>
                 <div class="text-left" v-html="viewData.stjs"></div>
             </el-descriptions-item>
             <el-descriptions-item span="3">
-                <template slot="label">社团章程</template>
+                <template slot="label">协会章程</template>
                 <div class="text-left" v-html="viewData.stzc"></div>
             </el-descriptions-item>
         </el-descriptions>

src/main/resources/views/platform/sys/club/regist/unitPartAudit.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
                         <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                   clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>

src/main/resources/views/platform/sys/club/regist/xghReply.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
                         <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                   clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>

src/main/resources/views/platform/sys/club/regist/xldAudit.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
                         <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                   clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>

src/main/resources/views/platform/sys/club/regist/xtAudit.html

@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-item-label">社团名称：</div>
+                    <div class="search-item-label">协会名称：</div>
                     <div class="search-item-option">
                         <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                   clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
                 <el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
                                  width="80px"></el-table-column>
 
-                <el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
+                <el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
+                <el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
                                  show-overflow-tooltip>

src/main/resources/views/platform/sys/club/users.html

@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
             </el-input>
         </div>
         <div class="btn-group tool-button mt5">
-            <el-select filterable placeholder="请选择社团"
+            <el-select filterable placeholder="请选择协会"
                        v-model="pageForm.clubid">
                 <el-option
                         :label="item.name"
@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
                     <el-lable v-if="scope.row.sf==2">成员</el-lable>
                 </template>
             </el-table-column>
-            <el-table-column align="center" header-align="center" label="社团名称"
+            <el-table-column align="center" header-align="center" label="协会名称"
                              prop="clubname"></el-table-column>
 
             <el-table-column align="center" fixed="right" header-align="center" label="操作">
@@ -91,7 +91,7 @@ layout("/layouts/platform.html"){
                         </el-button>
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item :command="{type:'del',data:scope.row}" v-if="scope.row.sf==2">
-                                移出社团
+                                移出协会
                             </el-dropdown-item>
                             <el-dropdown-item :command="{type:'jf',jf:true,data:scope.row}">
                                 已缴费
@@ -191,7 +191,7 @@ layout("/layouts/platform.html"){
             dropdownCommand: function (command) {
                 const {type, jf, data} = command
                 if (type == 'del') {
-                    this.$confirm('确定要将' + data.username + '移出社团吗？', '提示', {
+                    this.$confirm('确定要将' + data.username + '移出协会吗？', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning',

src/main/resources/views/platform/sys/gdh/jcgl.html

@@ -274,7 +274,7 @@ layout("/layouts/platform.html"){
                 }, "json");
             },
             doDelete(id) {
-                this.$confirm('确定要删除该社团吗？', '提示', {
+                this.$confirm('确定要删除该协会吗？', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning',
@@ -421,4 +421,4 @@ layout("/layouts/platform.html"){
 </script>
 <!--#
 }
-#-->
+#-->