c-chenxs1/zhgh_zjnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 社团统一改为协会

Browse Source
This commit is contained in:
c-chenxs1
2026-11-11 18:21:26 +08:00
parent 651435d568
commit 902ad7e0e9
233 changed files with 920 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/db/club/init_club_member_statistics_menu.sql
+5 -5
View File
@@ -1,4 +1,4 @@
-- 1. 将现有“社团统计”移到新父级下面，保留原权限和角色关联。
-- 1. 将现有“协会统计”移到新父级下面，保留原权限和角色关联。
UPDATE sys_menu
SET parentId = 'f2b61f72eab34e139bc150a2d907c385',
path = '001100060001',
@@ -7,7 +7,7 @@ SET parentId = 'f2b61f72eab34e139bc150a2d907c385',
WHERE id = 'b8817cce3ae34d49844a7ea8d8b15f3f'
AND permission = 'club.statistics';
-- 2. 新增“社团统计”父级菜单。
-- 2. 新增“协会统计”父级菜单。
INSERT INTO sys_menu (
id, parentId, path, name, aliasName, type, href, target,
icon, showit, disabled, permission, location, hasChildren,
@@ -17,7 +17,7 @@ INSERT INTO sys_menu (
'f2b61f72eab34e139bc150a2d907c385',
'',
'00110006',
'社团统计', '', 'menu',
'协会统计', '', 'menu',
'', '',
'', 1, 0, 'club.statistics', 411, 1,
'', UNIX_TIMESTAMP(NOW()) * 1000,
@@ -43,8 +43,8 @@ INSERT INTO sys_menu (
'PC', '4cfc8977507c40b3acee8443c7c5a8a3', 'c', 0, 0
);
-- 成员统计可查询所有社团，仅给系统管理员和校工会管理员授权。
-- 社团统计父级
-- 成员统计可查询所有协会，仅给系统管理员和校工会管理员授权。
-- 协会统计父级
INSERT INTO sys_role_menu (roleId, menuId) VALUES
('419844ad90f34ca58807e84224905f27', 'f2b61f72eab34e139bc150a2d907c385'),
('6aece46b946e4fb9ac4cb15c0cd8c3e6', 'f2b61f72eab34e139bc150a2d907c385'),
src/main/resources/db/init/menus/update_sys_menu_pic_icons_flat_skeuomorphic_blue_minio.sql
+13 -13
View File
@@ -30,18 +30,18 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s
('1fda43541284c86b8d5f406ee5ebf1e0', 'MINIO', 'zjnu', '024_报销申请_6bdef282.png', 'png', '45', '44.8 kB', '1fda43541284c86b8d5f406ee5ebf1e0.png', '/menu-icons/v5-flat-skeuomorphic-blue/1fda43541284c86b8d5f406ee5ebf1e0.png', '/platform/sys/file/download?id=1fda43541284c86b8d5f406ee5ebf1e0', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('f9b7a26ef993a9808b09c67f73d2d296', 'MINIO', 'zjnu', '025_撰写提案_eeaf3366.png', 'png', '41', '40.8 kB', 'f9b7a26ef993a9808b09c67f73d2d296.png', '/menu-icons/v5-flat-skeuomorphic-blue/f9b7a26ef993a9808b09c67f73d2d296.png', '/platform/sys/file/download?id=f9b7a26ef993a9808b09c67f73d2d296', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('b83956a3a3162f17513333e8dfe91f49', 'MINIO', 'zjnu', '026_我的申请_b27178ff.png', 'png', '42', '41.8 kB', 'b83956a3a3162f17513333e8dfe91f49.png', '/menu-icons/v5-flat-skeuomorphic-blue/b83956a3a3162f17513333e8dfe91f49.png', '/platform/sys/file/download?id=b83956a3a3162f17513333e8dfe91f49', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('969f3bc275bbd917b3e3444752d9de38', 'MINIO', 'zjnu', '027_社团审核_87611b6d.png', 'png', '39', '39.5 kB', '969f3bc275bbd917b3e3444752d9de38.png', '/menu-icons/v5-flat-skeuomorphic-blue/969f3bc275bbd917b3e3444752d9de38.png', '/platform/sys/file/download?id=969f3bc275bbd917b3e3444752d9de38', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('d54945a79bce326c126a17ffa7dedd86', 'MINIO', 'zjnu', '028_社团分管主席审核_d0ee5ab9.png', 'png', '39', '38.7 kB', 'd54945a79bce326c126a17ffa7dedd86.png', '/menu-icons/v5-flat-skeuomorphic-blue/d54945a79bce326c126a17ffa7dedd86.png', '/platform/sys/file/download?id=d54945a79bce326c126a17ffa7dedd86', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('969f3bc275bbd917b3e3444752d9de38', 'MINIO', 'zjnu', '027_协会审核_87611b6d.png', 'png', '39', '39.5 kB', '969f3bc275bbd917b3e3444752d9de38.png', '/menu-icons/v5-flat-skeuomorphic-blue/969f3bc275bbd917b3e3444752d9de38.png', '/platform/sys/file/download?id=969f3bc275bbd917b3e3444752d9de38', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('d54945a79bce326c126a17ffa7dedd86', 'MINIO', 'zjnu', '028_协会分管主席审核_d0ee5ab9.png', 'png', '39', '38.7 kB', 'd54945a79bce326c126a17ffa7dedd86.png', '/menu-icons/v5-flat-skeuomorphic-blue/d54945a79bce326c126a17ffa7dedd86.png', '/platform/sys/file/download?id=d54945a79bce326c126a17ffa7dedd86', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('012f4e24cb99feeae830b9e5956f730a', 'MINIO', 'zjnu', '029_分工会审核_af963d19.png', 'png', '40', '39.5 kB', '012f4e24cb99feeae830b9e5956f730a.png', '/menu-icons/v5-flat-skeuomorphic-blue/012f4e24cb99feeae830b9e5956f730a.png', '/platform/sys/file/download?id=012f4e24cb99feeae830b9e5956f730a', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('71f1a5bdd53422a302d50565ed6d8ca7', 'MINIO', 'zjnu', '030_校工会出纳审核_f7a890c7.png', 'png', '40', '39.9 kB', '71f1a5bdd53422a302d50565ed6d8ca7.png', '/menu-icons/v5-flat-skeuomorphic-blue/71f1a5bdd53422a302d50565ed6d8ca7.png', '/platform/sys/file/download?id=71f1a5bdd53422a302d50565ed6d8ca7', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('01ac13ee1b86635f406704686b2826cb', 'MINIO', 'zjnu', '031_校工会会计审核_41410dbe.png', 'png', '40', '40.0 kB', '01ac13ee1b86635f406704686b2826cb.png', '/menu-icons/v5-flat-skeuomorphic-blue/01ac13ee1b86635f406704686b2826cb.png', '/platform/sys/file/download?id=01ac13ee1b86635f406704686b2826cb', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('ff390faffeed11c872ff43c268fc42c8', 'MINIO', 'zjnu', '032_校工会主席终审_5e0c5335.png', 'png', '40', '39.6 kB', 'ff390faffeed11c872ff43c268fc42c8.png', '/menu-icons/v5-flat-skeuomorphic-blue/ff390faffeed11c872ff43c268fc42c8.png', '/platform/sys/file/download?id=ff390faffeed11c872ff43c268fc42c8', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('b077d67b5add801672329f19deedef51', 'MINIO', 'zjnu', '033_社团组织管理_b8bcaa94.png', 'png', '54', '54.2 kB', 'b077d67b5add801672329f19deedef51.png', '/menu-icons/v5-flat-skeuomorphic-blue/b077d67b5add801672329f19deedef51.png', '/platform/sys/file/download?id=b077d67b5add801672329f19deedef51', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('0784cad3fc2147bafafc22cdb00b32b8', 'MINIO', 'zjnu', '034_社团入会_7af124e1.png', 'png', '44', '43.6 kB', '0784cad3fc2147bafafc22cdb00b32b8.png', '/menu-icons/v5-flat-skeuomorphic-blue/0784cad3fc2147bafafc22cdb00b32b8.png', '/platform/sys/file/download?id=0784cad3fc2147bafafc22cdb00b32b8', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('b077d67b5add801672329f19deedef51', 'MINIO', 'zjnu', '033_协会组织管理_b8bcaa94.png', 'png', '54', '54.2 kB', 'b077d67b5add801672329f19deedef51.png', '/menu-icons/v5-flat-skeuomorphic-blue/b077d67b5add801672329f19deedef51.png', '/platform/sys/file/download?id=b077d67b5add801672329f19deedef51', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('0784cad3fc2147bafafc22cdb00b32b8', 'MINIO', 'zjnu', '034_协会入会_7af124e1.png', 'png', '44', '43.6 kB', '0784cad3fc2147bafafc22cdb00b32b8.png', '/menu-icons/v5-flat-skeuomorphic-blue/0784cad3fc2147bafafc22cdb00b32b8.png', '/platform/sys/file/download?id=0784cad3fc2147bafafc22cdb00b32b8', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('ca4ddf8871ab60754812c61781e3820a', 'MINIO', 'zjnu', '035_我的申请_2de433e4.png', 'png', '42', '41.8 kB', 'ca4ddf8871ab60754812c61781e3820a.png', '/menu-icons/v5-flat-skeuomorphic-blue/ca4ddf8871ab60754812c61781e3820a.png', '/platform/sys/file/download?id=ca4ddf8871ab60754812c61781e3820a', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('92251f17382d770a99d6399a9245fed2', 'MINIO', 'zjnu', '036_社团审核_84064805.png', 'png', '39', '39.5 kB', '92251f17382d770a99d6399a9245fed2.png', '/menu-icons/v5-flat-skeuomorphic-blue/92251f17382d770a99d6399a9245fed2.png', '/platform/sys/file/download?id=92251f17382d770a99d6399a9245fed2', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('92251f17382d770a99d6399a9245fed2', 'MINIO', 'zjnu', '036_协会审核_84064805.png', 'png', '39', '39.5 kB', '92251f17382d770a99d6399a9245fed2.png', '/menu-icons/v5-flat-skeuomorphic-blue/92251f17382d770a99d6399a9245fed2.png', '/platform/sys/file/download?id=92251f17382d770a99d6399a9245fed2', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('9b5bf30597169d4b597ec15c64746589', 'MINIO', 'zjnu', '037_校工会审核_dbd21f6b.png', 'png', '40', '39.7 kB', '9b5bf30597169d4b597ec15c64746589.png', '/menu-icons/v5-flat-skeuomorphic-blue/9b5bf30597169d4b597ec15c64746589.png', '/platform/sys/file/download?id=9b5bf30597169d4b597ec15c64746589', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('bff0da0374934156eaf7008420281877', 'MINIO', 'zjnu', '038_我的社团_e585d2ca.png', 'png', '55', '54.9 kB', 'bff0da0374934156eaf7008420281877.png', '/menu-icons/v5-flat-skeuomorphic-blue/bff0da0374934156eaf7008420281877.png', '/platform/sys/file/download?id=bff0da0374934156eaf7008420281877', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('bff0da0374934156eaf7008420281877', 'MINIO', 'zjnu', '038_我的协会_e585d2ca.png', 'png', '55', '54.9 kB', 'bff0da0374934156eaf7008420281877.png', '/menu-icons/v5-flat-skeuomorphic-blue/bff0da0374934156eaf7008420281877.png', '/platform/sys/file/download?id=bff0da0374934156eaf7008420281877', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('9ff5f7ccbf1584cc09c8b0b0b547907b', 'MINIO', 'zjnu', '039_会员管理_7e2b850c.png', 'png', '37', '37.2 kB', '9ff5f7ccbf1584cc09c8b0b0b547907b.png', '/menu-icons/v5-flat-skeuomorphic-blue/9ff5f7ccbf1584cc09c8b0b0b547907b.png', '/platform/sys/file/download?id=9ff5f7ccbf1584cc09c8b0b0b547907b', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('fe79030ce09863147010927ef79d4804', 'MINIO', 'zjnu', '040_会员入会_8f27ac9f.png', 'png', '45', '44.7 kB', 'fe79030ce09863147010927ef79d4804.png', '/menu-icons/v5-flat-skeuomorphic-blue/fe79030ce09863147010927ef79d4804.png', '/platform/sys/file/download?id=fe79030ce09863147010927ef79d4804', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('46ca54df1bb66aaec8d89be47ed888d9', 'MINIO', 'zjnu', '041_我的入会_313842fc.png', 'png', '49', '49.4 kB', '46ca54df1bb66aaec8d89be47ed888d9.png', '/menu-icons/v5-flat-skeuomorphic-blue/46ca54df1bb66aaec8d89be47ed888d9.png', '/platform/sys/file/download?id=46ca54df1bb66aaec8d89be47ed888d9', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
@@ -180,14 +180,14 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s
('d5ad8b087c6d12646a2d324370bbb08e', 'MINIO', 'zjnu', '174_新闻投稿_a4cfdc91.png', 'png', '38', '38.4 kB', 'd5ad8b087c6d12646a2d324370bbb08e.png', '/menu-icons/v5-flat-skeuomorphic-blue/d5ad8b087c6d12646a2d324370bbb08e.png', '/platform/sys/file/download?id=d5ad8b087c6d12646a2d324370bbb08e', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('f93ad109e30417aae741ee76d1845798', 'MINIO', 'zjnu', '175_职工建家_fac7e9f5.png', 'png', '40', '39.7 kB', 'f93ad109e30417aae741ee76d1845798.png', '/menu-icons/v5-flat-skeuomorphic-blue/f93ad109e30417aae741ee76d1845798.png', '/platform/sys/file/download?id=f93ad109e30417aae741ee76d1845798', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('3beb1065aefe8d0991c81ee094c8d4a1', 'MINIO', 'zjnu', '176_资产管理_d7c6c17e.png', 'png', '43', '43.5 kB', '3beb1065aefe8d0991c81ee094c8d4a1.png', '/menu-icons/v5-flat-skeuomorphic-blue/3beb1065aefe8d0991c81ee094c8d4a1.png', '/platform/sys/file/download?id=3beb1065aefe8d0991c81ee094c8d4a1', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('ebcddcbc72ce2961b4ba7e67b0bc64d0', 'MINIO', 'zjnu', '177_注册社团_946104dc.png', 'png', '49', '48.9 kB', 'ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/menu-icons/v5-flat-skeuomorphic-blue/ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/platform/sys/file/download?id=ebcddcbc72ce2961b4ba7e67b0bc64d0', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('ddd801157bf58265dd9e641482fe972b', 'MINIO', 'zjnu', '178_社团信息维护_f6485820.png', 'png', '37', '36.6 kB', 'ddd801157bf58265dd9e641482fe972b.png', '/menu-icons/v5-flat-skeuomorphic-blue/ddd801157bf58265dd9e641482fe972b.png', '/platform/sys/file/download?id=ddd801157bf58265dd9e641482fe972b', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('7acaa1e469e1ba6450f8563eb4b639fe', 'MINIO', 'zjnu', '179_社团入会_1287eb24.png', 'png', '44', '43.6 kB', '7acaa1e469e1ba6450f8563eb4b639fe.png', '/menu-icons/v5-flat-skeuomorphic-blue/7acaa1e469e1ba6450f8563eb4b639fe.png', '/platform/sys/file/download?id=7acaa1e469e1ba6450f8563eb4b639fe', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('46c041705eaec632dfa73d81b3dcc7b5', 'MINIO', 'zjnu', '180_社团入会_321fa0c8.png', 'png', '44', '43.6 kB', '46c041705eaec632dfa73d81b3dcc7b5.png', '/menu-icons/v5-flat-skeuomorphic-blue/46c041705eaec632dfa73d81b3dcc7b5.png', '/platform/sys/file/download?id=46c041705eaec632dfa73d81b3dcc7b5', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('ebcddcbc72ce2961b4ba7e67b0bc64d0', 'MINIO', 'zjnu', '177_注册协会_946104dc.png', 'png', '49', '48.9 kB', 'ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/menu-icons/v5-flat-skeuomorphic-blue/ebcddcbc72ce2961b4ba7e67b0bc64d0.png', '/platform/sys/file/download?id=ebcddcbc72ce2961b4ba7e67b0bc64d0', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('ddd801157bf58265dd9e641482fe972b', 'MINIO', 'zjnu', '178_协会信息维护_f6485820.png', 'png', '37', '36.6 kB', 'ddd801157bf58265dd9e641482fe972b.png', '/menu-icons/v5-flat-skeuomorphic-blue/ddd801157bf58265dd9e641482fe972b.png', '/platform/sys/file/download?id=ddd801157bf58265dd9e641482fe972b', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('7acaa1e469e1ba6450f8563eb4b639fe', 'MINIO', 'zjnu', '179_协会入会_1287eb24.png', 'png', '44', '43.6 kB', '7acaa1e469e1ba6450f8563eb4b639fe.png', '/menu-icons/v5-flat-skeuomorphic-blue/7acaa1e469e1ba6450f8563eb4b639fe.png', '/platform/sys/file/download?id=7acaa1e469e1ba6450f8563eb4b639fe', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('46c041705eaec632dfa73d81b3dcc7b5', 'MINIO', 'zjnu', '180_协会入会_321fa0c8.png', 'png', '44', '43.6 kB', '46c041705eaec632dfa73d81b3dcc7b5.png', '/menu-icons/v5-flat-skeuomorphic-blue/46c041705eaec632dfa73d81b3dcc7b5.png', '/platform/sys/file/download?id=46c041705eaec632dfa73d81b3dcc7b5', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('0c1ca1983d4bbf604bce1f308cdf0920', 'MINIO', 'zjnu', '181_年度考核_1ddecada.png', 'png', '45', '45.2 kB', '0c1ca1983d4bbf604bce1f308cdf0920.png', '/menu-icons/v5-flat-skeuomorphic-blue/0c1ca1983d4bbf604bce1f308cdf0920.png', '/platform/sys/file/download?id=0c1ca1983d4bbf604bce1f308cdf0920', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('649ca2608f994767fb3d99e17cd646c3', 'MINIO', 'zjnu', '182_社团评优_3f09f8a9.png', 'png', '49', '49.5 kB', '649ca2608f994767fb3d99e17cd646c3.png', '/menu-icons/v5-flat-skeuomorphic-blue/649ca2608f994767fb3d99e17cd646c3.png', '/platform/sys/file/download?id=649ca2608f994767fb3d99e17cd646c3', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('f9185ffb5188272249a80d0985a8a078', 'MINIO', 'zjnu', '183_社团统计_b8817cce.png', 'png', '38', '37.9 kB', 'f9185ffb5188272249a80d0985a8a078.png', '/menu-icons/v5-flat-skeuomorphic-blue/f9185ffb5188272249a80d0985a8a078.png', '/platform/sys/file/download?id=f9185ffb5188272249a80d0985a8a078', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('b03b7789697fa8ceac4f6a3a8b07652d', 'MINIO', 'zjnu', '184_社团文化活动_509423f4.png', 'png', '49', '48.6 kB', 'b03b7789697fa8ceac4f6a3a8b07652d.png', '/menu-icons/v5-flat-skeuomorphic-blue/b03b7789697fa8ceac4f6a3a8b07652d.png', '/platform/sys/file/download?id=b03b7789697fa8ceac4f6a3a8b07652d', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('649ca2608f994767fb3d99e17cd646c3', 'MINIO', 'zjnu', '182_协会评优_3f09f8a9.png', 'png', '49', '49.5 kB', '649ca2608f994767fb3d99e17cd646c3.png', '/menu-icons/v5-flat-skeuomorphic-blue/649ca2608f994767fb3d99e17cd646c3.png', '/platform/sys/file/download?id=649ca2608f994767fb3d99e17cd646c3', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('f9185ffb5188272249a80d0985a8a078', 'MINIO', 'zjnu', '183_协会统计_b8817cce.png', 'png', '38', '37.9 kB', 'f9185ffb5188272249a80d0985a8a078.png', '/menu-icons/v5-flat-skeuomorphic-blue/f9185ffb5188272249a80d0985a8a078.png', '/platform/sys/file/download?id=f9185ffb5188272249a80d0985a8a078', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('b03b7789697fa8ceac4f6a3a8b07652d', 'MINIO', 'zjnu', '184_协会文化活动_509423f4.png', 'png', '49', '48.6 kB', 'b03b7789697fa8ceac4f6a3a8b07652d.png', '/menu-icons/v5-flat-skeuomorphic-blue/b03b7789697fa8ceac4f6a3a8b07652d.png', '/platform/sys/file/download?id=b03b7789697fa8ceac4f6a3a8b07652d', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('0335b1721abc858c9ee85cd724173142', 'MINIO', 'zjnu', '185_年度计划总结_e658f630.png', 'png', '53', '52.6 kB', '0335b1721abc858c9ee85cd724173142.png', '/menu-icons/v5-flat-skeuomorphic-blue/0335b1721abc858c9ee85cd724173142.png', '/platform/sys/file/download?id=0335b1721abc858c9ee85cd724173142', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('544e4eb6c6407beb92e0a338c48dfe4c', 'MINIO', 'zjnu', '186_活动申报_895089b9.png', 'png', '37', '36.9 kB', '544e4eb6c6407beb92e0a338c48dfe4c.png', '/menu-icons/v5-flat-skeuomorphic-blue/544e4eb6c6407beb92e0a338c48dfe4c.png', '/platform/sys/file/download?id=544e4eb6c6407beb92e0a338c48dfe4c', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
('760c3374e24ee833b84f461e48adcc49', 'MINIO', 'zjnu', '187_活动申报_6bb151be.png', 'png', '37', '36.9 kB', '760c3374e24ee833b84f461e48adcc49.png', '/menu-icons/v5-flat-skeuomorphic-blue/760c3374e24ee833b84f461e48adcc49.png', '/platform/sys/file/download?id=760c3374e24ee833b84f461e48adcc49', NULL, NULL, '', 1785994967344, '', 1785994967344, 0),
src/main/resources/db/init/menus/update_sys_menu_pic_icons_minio.sql
+13 -13
View File
@@ -30,18 +30,18 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s
('d030abf3da1bf8c00d93e78586f4a9bc', 'MINIO', 'zjnu', '024_报销申请_6bdef282.png', 'png', '50', '50.0 kB', 'd030abf3da1bf8c00d93e78586f4a9bc.png', '/menu-icons/v4/d030abf3da1bf8c00d93e78586f4a9bc.png', '/platform/sys/file/download?id=d030abf3da1bf8c00d93e78586f4a9bc', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('822abad93728db1326baa27b4f2dbe04', 'MINIO', 'zjnu', '025_撰写提案_eeaf3366.png', 'png', '45', '44.8 kB', '822abad93728db1326baa27b4f2dbe04.png', '/menu-icons/v4/822abad93728db1326baa27b4f2dbe04.png', '/platform/sys/file/download?id=822abad93728db1326baa27b4f2dbe04', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('541f9d25077780099d4e4594bea2bb4e', 'MINIO', 'zjnu', '026_我的申请_b27178ff.png', 'png', '41', '41.1 kB', '541f9d25077780099d4e4594bea2bb4e.png', '/menu-icons/v4/541f9d25077780099d4e4594bea2bb4e.png', '/platform/sys/file/download?id=541f9d25077780099d4e4594bea2bb4e', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('47148702a76cc6ea8e7807ac5d5eb6e1', 'MINIO', 'zjnu', '027_社团审核_87611b6d.png', 'png', '45', '44.7 kB', '47148702a76cc6ea8e7807ac5d5eb6e1.png', '/menu-icons/v4/47148702a76cc6ea8e7807ac5d5eb6e1.png', '/platform/sys/file/download?id=47148702a76cc6ea8e7807ac5d5eb6e1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('d4e6b7275313903fb7ff9f40046f9ed6', 'MINIO', 'zjnu', '028_社团分管主席审核_d0ee5ab9.png', 'png', '42', '42.2 kB', 'd4e6b7275313903fb7ff9f40046f9ed6.png', '/menu-icons/v4/d4e6b7275313903fb7ff9f40046f9ed6.png', '/platform/sys/file/download?id=d4e6b7275313903fb7ff9f40046f9ed6', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('47148702a76cc6ea8e7807ac5d5eb6e1', 'MINIO', 'zjnu', '027_协会审核_87611b6d.png', 'png', '45', '44.7 kB', '47148702a76cc6ea8e7807ac5d5eb6e1.png', '/menu-icons/v4/47148702a76cc6ea8e7807ac5d5eb6e1.png', '/platform/sys/file/download?id=47148702a76cc6ea8e7807ac5d5eb6e1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('d4e6b7275313903fb7ff9f40046f9ed6', 'MINIO', 'zjnu', '028_协会分管主席审核_d0ee5ab9.png', 'png', '42', '42.2 kB', 'd4e6b7275313903fb7ff9f40046f9ed6.png', '/menu-icons/v4/d4e6b7275313903fb7ff9f40046f9ed6.png', '/platform/sys/file/download?id=d4e6b7275313903fb7ff9f40046f9ed6', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('153ee7433a7b441bcf0df449a93cf07a', 'MINIO', 'zjnu', '029_分工会审核_af963d19.png', 'png', '44', '44.0 kB', '153ee7433a7b441bcf0df449a93cf07a.png', '/menu-icons/v4/153ee7433a7b441bcf0df449a93cf07a.png', '/platform/sys/file/download?id=153ee7433a7b441bcf0df449a93cf07a', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('88d0311f37bd0d4afb15d3e7e1321dae', 'MINIO', 'zjnu', '030_校工会出纳审核_f7a890c7.png', 'png', '44', '44.4 kB', '88d0311f37bd0d4afb15d3e7e1321dae.png', '/menu-icons/v4/88d0311f37bd0d4afb15d3e7e1321dae.png', '/platform/sys/file/download?id=88d0311f37bd0d4afb15d3e7e1321dae', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('481b4f5262903cbc2a4c4be16144356d', 'MINIO', 'zjnu', '031_校工会会计审核_41410dbe.png', 'png', '45', '44.5 kB', '481b4f5262903cbc2a4c4be16144356d.png', '/menu-icons/v4/481b4f5262903cbc2a4c4be16144356d.png', '/platform/sys/file/download?id=481b4f5262903cbc2a4c4be16144356d', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('43edf5cc953088145c381e89d1a2dbe5', 'MINIO', 'zjnu', '032_校工会主席终审_5e0c5335.png', 'png', '44', '44.1 kB', '43edf5cc953088145c381e89d1a2dbe5.png', '/menu-icons/v4/43edf5cc953088145c381e89d1a2dbe5.png', '/platform/sys/file/download?id=43edf5cc953088145c381e89d1a2dbe5', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('00a707dc661b56698cfa957da4d635e3', 'MINIO', 'zjnu', '033_社团组织管理_b8bcaa94.png', 'png', '44', '44.3 kB', '00a707dc661b56698cfa957da4d635e3.png', '/menu-icons/v4/00a707dc661b56698cfa957da4d635e3.png', '/platform/sys/file/download?id=00a707dc661b56698cfa957da4d635e3', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('d8cf0cffdced461cc4ba8fa4314b35de', 'MINIO', 'zjnu', '034_社团入会_7af124e1.png', 'png', '44', '44.3 kB', 'd8cf0cffdced461cc4ba8fa4314b35de.png', '/menu-icons/v4/d8cf0cffdced461cc4ba8fa4314b35de.png', '/platform/sys/file/download?id=d8cf0cffdced461cc4ba8fa4314b35de', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('00a707dc661b56698cfa957da4d635e3', 'MINIO', 'zjnu', '033_协会组织管理_b8bcaa94.png', 'png', '44', '44.3 kB', '00a707dc661b56698cfa957da4d635e3.png', '/menu-icons/v4/00a707dc661b56698cfa957da4d635e3.png', '/platform/sys/file/download?id=00a707dc661b56698cfa957da4d635e3', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('d8cf0cffdced461cc4ba8fa4314b35de', 'MINIO', 'zjnu', '034_协会入会_7af124e1.png', 'png', '44', '44.3 kB', 'd8cf0cffdced461cc4ba8fa4314b35de.png', '/menu-icons/v4/d8cf0cffdced461cc4ba8fa4314b35de.png', '/platform/sys/file/download?id=d8cf0cffdced461cc4ba8fa4314b35de', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('b269cb65dc856cd4fe21fa05de4fd27e', 'MINIO', 'zjnu', '035_我的申请_2de433e4.png', 'png', '41', '41.1 kB', 'b269cb65dc856cd4fe21fa05de4fd27e.png', '/menu-icons/v4/b269cb65dc856cd4fe21fa05de4fd27e.png', '/platform/sys/file/download?id=b269cb65dc856cd4fe21fa05de4fd27e', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('67dc9fac0d11849f8648dae234270135', 'MINIO', 'zjnu', '036_社团审核_84064805.png', 'png', '45', '44.7 kB', '67dc9fac0d11849f8648dae234270135.png', '/menu-icons/v4/67dc9fac0d11849f8648dae234270135.png', '/platform/sys/file/download?id=67dc9fac0d11849f8648dae234270135', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('67dc9fac0d11849f8648dae234270135', 'MINIO', 'zjnu', '036_协会审核_84064805.png', 'png', '45', '44.7 kB', '67dc9fac0d11849f8648dae234270135.png', '/menu-icons/v4/67dc9fac0d11849f8648dae234270135.png', '/platform/sys/file/download?id=67dc9fac0d11849f8648dae234270135', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('a34ed81f00b2edf70da74dbb8d6b8c99', 'MINIO', 'zjnu', '037_校工会审核_dbd21f6b.png', 'png', '44', '44.2 kB', 'a34ed81f00b2edf70da74dbb8d6b8c99.png', '/menu-icons/v4/a34ed81f00b2edf70da74dbb8d6b8c99.png', '/platform/sys/file/download?id=a34ed81f00b2edf70da74dbb8d6b8c99', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('fcbef87b9f75c924b06fff2a03246b42', 'MINIO', 'zjnu', '038_我的社团_e585d2ca.png', 'png', '44', '43.9 kB', 'fcbef87b9f75c924b06fff2a03246b42.png', '/menu-icons/v4/fcbef87b9f75c924b06fff2a03246b42.png', '/platform/sys/file/download?id=fcbef87b9f75c924b06fff2a03246b42', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('fcbef87b9f75c924b06fff2a03246b42', 'MINIO', 'zjnu', '038_我的协会_e585d2ca.png', 'png', '44', '43.9 kB', 'fcbef87b9f75c924b06fff2a03246b42.png', '/menu-icons/v4/fcbef87b9f75c924b06fff2a03246b42.png', '/platform/sys/file/download?id=fcbef87b9f75c924b06fff2a03246b42', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('ba467095d0ccc678e34979ba679ea020', 'MINIO', 'zjnu', '039_会员管理_7e2b850c.png', 'png', '44', '44.3 kB', 'ba467095d0ccc678e34979ba679ea020.png', '/menu-icons/v4/ba467095d0ccc678e34979ba679ea020.png', '/platform/sys/file/download?id=ba467095d0ccc678e34979ba679ea020', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('b189ac3e64ea6b43a86324a2a57b0595', 'MINIO', 'zjnu', '040_会员入会_8f27ac9f.png', 'png', '44', '44.3 kB', 'b189ac3e64ea6b43a86324a2a57b0595.png', '/menu-icons/v4/b189ac3e64ea6b43a86324a2a57b0595.png', '/platform/sys/file/download?id=b189ac3e64ea6b43a86324a2a57b0595', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('0e14db530463cbcdeb4f23712ce75226', 'MINIO', 'zjnu', '041_我的入会_313842fc.png', 'png', '44', '43.9 kB', '0e14db530463cbcdeb4f23712ce75226.png', '/menu-icons/v4/0e14db530463cbcdeb4f23712ce75226.png', '/platform/sys/file/download?id=0e14db530463cbcdeb4f23712ce75226', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
@@ -180,14 +180,14 @@ INSERT INTO `sys_file` (`id`, `engine`, `bucket`, `name`, `suffix`, `sizeKb`, `s
('837a9b8aad0e1eadceaa693dfa8e19e1', 'MINIO', 'zjnu', '174_新闻投稿_a4cfdc91.png', 'png', '42', '41.9 kB', '837a9b8aad0e1eadceaa693dfa8e19e1.png', '/menu-icons/v4/837a9b8aad0e1eadceaa693dfa8e19e1.png', '/platform/sys/file/download?id=837a9b8aad0e1eadceaa693dfa8e19e1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('a7d265dfed93cf79fca45e88bd4248ff', 'MINIO', 'zjnu', '175_职工建家_fac7e9f5.png', 'png', '44', '44.3 kB', 'a7d265dfed93cf79fca45e88bd4248ff.png', '/menu-icons/v4/a7d265dfed93cf79fca45e88bd4248ff.png', '/platform/sys/file/download?id=a7d265dfed93cf79fca45e88bd4248ff', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('cc24c0a16a35354f332aff2b2023f0e5', 'MINIO', 'zjnu', '176_资产管理_d7c6c17e.png', 'png', '58', '58.3 kB', 'cc24c0a16a35354f332aff2b2023f0e5.png', '/menu-icons/v4/cc24c0a16a35354f332aff2b2023f0e5.png', '/platform/sys/file/download?id=cc24c0a16a35354f332aff2b2023f0e5', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('648d406bbbf0e32c082f02cf317bc48c', 'MINIO', 'zjnu', '177_注册社团_946104dc.png', 'png', '44', '44.3 kB', '648d406bbbf0e32c082f02cf317bc48c.png', '/menu-icons/v4/648d406bbbf0e32c082f02cf317bc48c.png', '/platform/sys/file/download?id=648d406bbbf0e32c082f02cf317bc48c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('49c4c2480f2027792674edaf6f40fed4', 'MINIO', 'zjnu', '178_社团信息维护_f6485820.png', 'png', '44', '43.5 kB', '49c4c2480f2027792674edaf6f40fed4.png', '/menu-icons/v4/49c4c2480f2027792674edaf6f40fed4.png', '/platform/sys/file/download?id=49c4c2480f2027792674edaf6f40fed4', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('10903a2e44417f9d20c548e3424dd457', 'MINIO', 'zjnu', '179_社团入会_1287eb24.png', 'png', '44', '44.3 kB', '10903a2e44417f9d20c548e3424dd457.png', '/menu-icons/v4/10903a2e44417f9d20c548e3424dd457.png', '/platform/sys/file/download?id=10903a2e44417f9d20c548e3424dd457', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('486385e3da464ace8cf812de8a460761', 'MINIO', 'zjnu', '180_社团入会_321fa0c8.png', 'png', '44', '44.3 kB', '486385e3da464ace8cf812de8a460761.png', '/menu-icons/v4/486385e3da464ace8cf812de8a460761.png', '/platform/sys/file/download?id=486385e3da464ace8cf812de8a460761', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('648d406bbbf0e32c082f02cf317bc48c', 'MINIO', 'zjnu', '177_注册协会_946104dc.png', 'png', '44', '44.3 kB', '648d406bbbf0e32c082f02cf317bc48c.png', '/menu-icons/v4/648d406bbbf0e32c082f02cf317bc48c.png', '/platform/sys/file/download?id=648d406bbbf0e32c082f02cf317bc48c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('49c4c2480f2027792674edaf6f40fed4', 'MINIO', 'zjnu', '178_协会信息维护_f6485820.png', 'png', '44', '43.5 kB', '49c4c2480f2027792674edaf6f40fed4.png', '/menu-icons/v4/49c4c2480f2027792674edaf6f40fed4.png', '/platform/sys/file/download?id=49c4c2480f2027792674edaf6f40fed4', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('10903a2e44417f9d20c548e3424dd457', 'MINIO', 'zjnu', '179_协会入会_1287eb24.png', 'png', '44', '44.3 kB', '10903a2e44417f9d20c548e3424dd457.png', '/menu-icons/v4/10903a2e44417f9d20c548e3424dd457.png', '/platform/sys/file/download?id=10903a2e44417f9d20c548e3424dd457', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('486385e3da464ace8cf812de8a460761', 'MINIO', 'zjnu', '180_协会入会_321fa0c8.png', 'png', '44', '44.3 kB', '486385e3da464ace8cf812de8a460761.png', '/menu-icons/v4/486385e3da464ace8cf812de8a460761.png', '/platform/sys/file/download?id=486385e3da464ace8cf812de8a460761', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('88e8b7b022ed0c2929615bfedd231e45', 'MINIO', 'zjnu', '181_年度考核_1ddecada.png', 'png', '46', '45.7 kB', '88e8b7b022ed0c2929615bfedd231e45.png', '/menu-icons/v4/88e8b7b022ed0c2929615bfedd231e45.png', '/platform/sys/file/download?id=88e8b7b022ed0c2929615bfedd231e45', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('1a174db6bdd59b2d7e98dadf52f7f854', 'MINIO', 'zjnu', '182_社团评优_3f09f8a9.png', 'png', '51', '51.0 kB', '1a174db6bdd59b2d7e98dadf52f7f854.png', '/menu-icons/v4/1a174db6bdd59b2d7e98dadf52f7f854.png', '/platform/sys/file/download?id=1a174db6bdd59b2d7e98dadf52f7f854', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('d7cb87646b1579a51daff50de1c4747c', 'MINIO', 'zjnu', '183_社团统计_b8817cce.png', 'png', '44', '43.7 kB', 'd7cb87646b1579a51daff50de1c4747c.png', '/menu-icons/v4/d7cb87646b1579a51daff50de1c4747c.png', '/platform/sys/file/download?id=d7cb87646b1579a51daff50de1c4747c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('5edf99eb06031a98bc0f23b03f89bde1', 'MINIO', 'zjnu', '184_社团文化活动_509423f4.png', 'png', '42', '42.0 kB', '5edf99eb06031a98bc0f23b03f89bde1.png', '/menu-icons/v4/5edf99eb06031a98bc0f23b03f89bde1.png', '/platform/sys/file/download?id=5edf99eb06031a98bc0f23b03f89bde1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('1a174db6bdd59b2d7e98dadf52f7f854', 'MINIO', 'zjnu', '182_协会评优_3f09f8a9.png', 'png', '51', '51.0 kB', '1a174db6bdd59b2d7e98dadf52f7f854.png', '/menu-icons/v4/1a174db6bdd59b2d7e98dadf52f7f854.png', '/platform/sys/file/download?id=1a174db6bdd59b2d7e98dadf52f7f854', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('d7cb87646b1579a51daff50de1c4747c', 'MINIO', 'zjnu', '183_协会统计_b8817cce.png', 'png', '44', '43.7 kB', 'd7cb87646b1579a51daff50de1c4747c.png', '/menu-icons/v4/d7cb87646b1579a51daff50de1c4747c.png', '/platform/sys/file/download?id=d7cb87646b1579a51daff50de1c4747c', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('5edf99eb06031a98bc0f23b03f89bde1', 'MINIO', 'zjnu', '184_协会文化活动_509423f4.png', 'png', '42', '42.0 kB', '5edf99eb06031a98bc0f23b03f89bde1.png', '/menu-icons/v4/5edf99eb06031a98bc0f23b03f89bde1.png', '/platform/sys/file/download?id=5edf99eb06031a98bc0f23b03f89bde1', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('2b9fa4f9ab358355cbaf7aa9835556ef', 'MINIO', 'zjnu', '185_年度计划总结_e658f630.png', 'png', '42', '41.9 kB', '2b9fa4f9ab358355cbaf7aa9835556ef.png', '/menu-icons/v4/2b9fa4f9ab358355cbaf7aa9835556ef.png', '/platform/sys/file/download?id=2b9fa4f9ab358355cbaf7aa9835556ef', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('c88694f42e0203e48d3e49f6e5e066a8', 'MINIO', 'zjnu', '186_活动申报_895089b9.png', 'png', '41', '41.3 kB', 'c88694f42e0203e48d3e49f6e5e066a8.png', '/menu-icons/v4/c88694f42e0203e48d3e49f6e5e066a8.png', '/platform/sys/file/download?id=c88694f42e0203e48d3e49f6e5e066a8', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
('7fec918647b9b82d4b37e2ded5cc3273', 'MINIO', 'zjnu', '187_活动申报_6bb151be.png', 'png', '41', '41.3 kB', '7fec918647b9b82d4b37e2ded5cc3273.png', '/menu-icons/v4/7fec918647b9b82d4b37e2ded5cc3273.png', '/platform/sys/file/download?id=7fec918647b9b82d4b37e2ded5cc3273', NULL, NULL, '', 1785921322195, '', 1785921322195, 0),
src/main/resources/db/init/zhgh_zjnu.sql
+30 -30
View File
@@ -1217,7 +1217,7 @@ CREATE TABLE `activity_budget` (
`declareTotalBudgetMoney` decimal(10, 2) NULL DEFAULT NULL COMMENT '申报金额',
`outlayManageSource` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '预算类型',
`unionId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人工会',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人所属社团',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人所属协会',
`helpUnitName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '举办单位',
`applyDate` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申报时间',
`schoolAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '校工会审核',
@@ -1436,11 +1436,11 @@ CREATE TABLE `activity_school` (
`precautions` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '注意事项（竞赛）',
`eventNotification` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '活动通知（非竞赛）',
`close` tinyint(1) NULL DEFAULT NULL COMMENT '是否关闭',
`activityLevel` bigint NULL DEFAULT NULL COMMENT '活动级别（40001-校级、40002-分工会、40003-社团或协会）',
`activityLevel` bigint NULL DEFAULT NULL COMMENT '活动级别（40001-校级、40002-分工会、40003-协会或协会）',
`isSave` tinyint(1) NULL DEFAULT NULL COMMENT '是否保存',
`image` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '小程序活动封面',
`belongUnionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动所属工会',
`belongClubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动所属社团',
`belongClubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动所属协会',
`foundDate` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建时间',
`xlFlag` tinyint(1) NULL DEFAULT NULL COMMENT '是否发送系统消息',
`createdBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -1598,7 +1598,7 @@ CREATE TABLE `activity_tissue` (
`otherFiles` json NULL COMMENT '其他',
`type` bigint NULL DEFAULT NULL COMMENT '活动类型',
`unionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人所属工会',
`clubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人所属社团',
`clubId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人所属协会',
`activityContent` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '活动内容',
`activityExamineContent` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '活动考核内容',
`signUpMethod` int NULL DEFAULT NULL COMMENT '报名方式(1.个人 2.分工会 null.不需要报名)',
@@ -1639,7 +1639,7 @@ CREATE TABLE `activity_tissue` (
DROP TABLE IF EXISTS `activity_tissue_person`;
CREATE TABLE `activity_tissue_person` (
`id` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT 'ID',
`tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或社团活动ID',
`tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或协会活动ID',
`userId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '用户ID',
`applyUserId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '报名人ID',
`applyUserUserName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '报名人姓名',
@@ -4294,10 +4294,10 @@ CREATE TABLE `evaluate_apply` (
`unitId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单位ID',
`unionName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '分工会',
`unionId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '分工会ID',
`clubName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团ID',
`clubName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会ID',
`applyDateTime` datetime NULL DEFAULT NULL COMMENT '申请时间',
`isClub` tinyint(1) NULL DEFAULT NULL COMMENT '是否社团类型的荣誉',
`isClub` tinyint(1) NULL DEFAULT NULL COMMENT '是否协会类型的荣誉',
`createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
`createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间',
`updatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
@@ -8410,7 +8410,7 @@ CREATE TABLE `outlay_manage_club` (
`updatedAt` bigint NULL DEFAULT NULL COMMENT '修改时间',
`delFlag` tinyint(1) NULL DEFAULT NULL COMMENT '删除标记',
`userAvgMoney` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '人均额度',
`historyUserNum` int NULL DEFAULT 0 COMMENT '上年度社团人数',
`historyUserNum` int NULL DEFAULT 0 COMMENT '上年度协会人数',
`historyGiveMoneyNum` int NULL DEFAULT 0 COMMENT '上年度拨付人数',
`historyNotGiveMoneyNum` int NULL DEFAULT 0 COMMENT '上年度未拨付人数',
`isCheck` tinyint(1) NULL DEFAULT 0 COMMENT '是否核对',
@@ -8469,8 +8469,8 @@ CREATE TABLE `outlay_reimburse` (
`unitId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单位id',
`unionName` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工会',
`unionId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工会id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团名称',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`clubName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会名称',
`outlayManageSource` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报销经费来源',
`activityTime` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动时间',
`activityNumber` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动人数',
@@ -10269,7 +10269,7 @@ CREATE TABLE `site_cug_info` (
`termStartDate` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '本学期开始时间',
`termEndDate` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '本学期结束时间',
`unionYearReserveLimit` int NULL DEFAULT 2 COMMENT '分工会每年预约次数',
`clubWeekReserveLimit` int NULL DEFAULT 2 COMMENT '社团每周预约次数',
`clubWeekReserveLimit` int NULL DEFAULT 2 COMMENT '协会每周预约次数',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '场地信息-场馆' ROW_FORMAT = DYNAMIC;
@@ -10679,7 +10679,7 @@ CREATE TABLE `sys_club` (
DROP TABLE IF EXISTS `sys_club_evaluate`;
CREATE TABLE `sys_club_evaluate` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申报人id',
`applyTime` datetime NULL DEFAULT NULL COMMENT '申报时间',
`applyStartYear` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申报开始年份',
@@ -10706,8 +10706,8 @@ DROP TABLE IF EXISTS `sys_club_examine_register`;
CREATE TABLE `sys_club_examine_register` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`year` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '年度',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团名称',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会名称',
`foundTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '成立时间',
`due` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '会费标准',
`activityQk` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '年度活动情况',
@@ -10718,9 +10718,9 @@ CREATE TABLE `sys_club_examine_register` (
`yearActivity` json NULL COMMENT '年度活动情况',
`yearActivitys` json NULL COMMENT '年度活动情况',
`incomeCensus` json NULL COMMENT '财务收支情况统计json',
`changeUserNum` json NULL COMMENT '社团成员变化情况json',
`changeUserNum` json NULL COMMENT '协会成员变化情况json',
`auditId` int NULL DEFAULT NULL COMMENT '审核状态',
`clubAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团负责人审核意见id',
`clubAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会负责人审核意见id',
`clubLeaderAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '会长审核意见id',
`schoolAuditId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '校工会审核意见id',
`createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -10766,7 +10766,7 @@ CREATE TABLE `sys_club_files` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户',
`userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`bTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备份时间',
`fileType` int NULL DEFAULT NULL COMMENT '文件类型，1是换届报告，2是章程',
`files` json NULL COMMENT '文件',
@@ -10786,7 +10786,7 @@ CREATE TABLE `sys_club_manager` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户',
`userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`creatTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '提交时间',
`oldRoleCode` json NULL COMMENT '旧身份',
`nowRoleCode` json NULL COMMENT '变更的身份',
@@ -10809,7 +10809,7 @@ CREATE TABLE `sys_club_refresh` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户',
`userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`creatTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '提交时间',
`lastFiles` json NULL COMMENT '上一次的文件',
`files` json NULL COMMENT '文件',
@@ -10830,7 +10830,7 @@ CREATE TABLE `sys_club_rule` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`userId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户',
`userName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户姓名',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`creatTime` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '提交时间',
`files` json NULL COMMENT '文件',
`createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -13640,19 +13640,19 @@ CREATE TABLE `union_reimburse` (
`money` decimal(10, 2) NULL DEFAULT NULL COMMENT '慰问金额/报销金额',
`condolenceTime` datetime NULL DEFAULT NULL COMMENT '慰问时间',
`activityName` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动名称',
`activityType` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动类型（1.分工会，2.校工会，3.社团）',
`activityType` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动类型（1.分工会，2.校工会，3.协会）',
`activityNumber` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动人数',
`activityTime` datetime NULL DEFAULT NULL COMMENT '活动时间',
`venue` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动地点',
`club` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属社团',
`club` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属协会',
`createdBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
`createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间',
`updatedBy` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
`updatedAt` bigint NULL DEFAULT NULL COMMENT '修改时间',
`delFlag` tinyint(1) NULL DEFAULT NULL COMMENT '删除标记',
`activityPlace` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '活动地点',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '社团id',
`clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属社团',
`clubId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '协会id',
`clubName` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属协会',
`createTime` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申请时间',
`unitId` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经办人单位ID',
`unitName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经办人单位名称',
@@ -14825,15 +14825,15 @@ CREATE TABLE `year_plan` (
`planTime` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '计划时间',
`content` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '计划内容',
`money` decimal(15, 10) NULL DEFAULT NULL COMMENT '预算费用',
`planType` varchar(7) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '计划类型(1-校活动、2-分工会活动、3协会社团活动)',
`tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会ID或社团ID',
`planType` varchar(7) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '计划类型(1-校活动、2-分工会活动、3协会协会活动)',
`tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会ID或协会ID',
`activityType` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '活动类型',
`createdBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人',
`createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间',
`updatedBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '修改人',
`updatedAt` bigint NULL DEFAULT NULL COMMENT '修改时间',
`delFlag` tinyint(1) NULL DEFAULT NULL COMMENT '删除标记',
`tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或社团',
`tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或协会',
`contributionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '项目Id',
`contributionName` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '项目',
`userId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '支付人Id',
@@ -14861,7 +14861,7 @@ CREATE TABLE `year_summary` (
`cTime` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交时间',
`tissueId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '工会/协会id',
`summaryType` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '总结类型',
`summaryFrom` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '总结来源（1-校活动、2-分工会活动、3协会社团活动）',
`summaryFrom` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '总结来源（1-校活动、2-分工会活动、3协会协会活动）',
`files` json NULL COMMENT '文件',
`createdBy` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人',
`createdAt` bigint NULL DEFAULT NULL COMMENT '创建时间',
@@ -14874,7 +14874,7 @@ CREATE TABLE `year_summary` (
`unitName` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交人单位',
`unionId` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交人工会ID',
`unionName` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '提交人单位',
`tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或社团',
`tissueName` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '分工会或协会',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '年度总结' ROW_FORMAT = DYNAMIC;
src/main/resources/db/sys_club_add_thumbnail.sql
+2 -2
View File
@@ -1,4 +1,4 @@
-- 社团缩略图保存系统文件下载地址；保留可空以兼容未上传图片的历史社团。
-- 协会缩略图保存系统文件下载地址；保留可空以兼容未上传图片的历史协会。
-- 字段存在时跳过，避免重复执行迁移时报错。
SET @club_thumbnail_column_count = (
SELECT COUNT(*)
@@ -10,7 +10,7 @@ SET @club_thumbnail_column_count = (
SET @club_thumbnail_ddl = IF(
@club_thumbnail_column_count = 0,
'ALTER TABLE sys_club ADD COLUMN thumbnail VARCHAR(1000) NULL COMMENT ''社团缩略图'' AFTER clubName',
'ALTER TABLE sys_club ADD COLUMN thumbnail VARCHAR(1000) NULL COMMENT ''协会缩略图'' AFTER clubName',
'SELECT 1'
);
src/main/resources/db/union_reimburse_add_club_activity_dict.sql
+2 -2
View File
@@ -1,4 +1,4 @@
-- 社团活动属于报销项目的正式字典配置，两端沿用现有字典接口读取。
-- 协会活动属于报销项目的正式字典配置，两端沿用现有字典接口读取。
-- 仅补充缺失记录；已有记录（包括已禁用记录）不覆盖，不在查询接口中添加兜底项。
INSERT INTO sys_dict (
id, parentId, path, name, remark, code, disabled, location, hasChildren,
@@ -12,7 +12,7 @@ SELECT
FROM sys_dict child
WHERE child.path LIKE CONCAT(parent.path, '____')
), 0) + 1, 4, '0')),
'社团活动',
'协会活动',
'',
'UNION_REIMBURSE_PROJECT_5',
0,
src/main/resources/static/components/module/activity/UserScope.vue
+3 -3
View File
@@ -217,13 +217,13 @@
</template>
<el-row class="query-row" v-if="is_A06 || is_sysadmin || is_H02 || is_CLUB_PRESIDENT">
<el-col class="query-title">社团：</el-col>
<el-col class="query-title">协会：</el-col>
<el-col class="query-content">
<el-select
v-model="pageForm.clubId"
clearable
filterable
placeholder="请选择社团"
placeholder="请选择协会"
style="width: 100%"
@change="doSearch"
@clear="doSearch"
@@ -522,7 +522,7 @@ module.exports = {
}
},
getInitialUnionIds() {
// 分工会和社团双身份默认不带分工会筛选，保证初始列表走后端并集逻辑。
// 分工会和协会双身份默认不带分工会筛选，保证初始列表走后端并集逻辑。
if ((this.is_sysadmin || this.is_A06 || this.is_H02 || this.is_CLUB_PRESIDENT) === false && this.is_H04 === true && this.unionid) {
return [this.unionid]
}
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+3 -3
View File
@@ -58,9 +58,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
</el-form-item>
</el-col>
<el-col :span="12" v-if="activity_type===40003">
<el-form-item prop="clubId" label="活动所属社团">
<el-form-item prop="clubId" label="活动所属协会">
<el-select v-model="formData.clubId" clearable filterable
placeholder="请选择活动所属社团"
placeholder="请选择活动所属协会"
style="width: 100%">
<el-option
v-for="item in clubOptions"
@@ -742,7 +742,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
return
}
if (!this.formData.clubId && this.activity_type === 40003) {
this.$message.error("请选择活动所属社团")
this.$message.error("请选择活动所属协会")
return
}
if (!this.validateCopyTemplateName()) {
src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js
+1 -1
View File
@@ -27,7 +27,7 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
{{ viewData.activity_type === 40001 ? '校工会活动' : viewData.activity_type === 40002 ?
'分工会活动'
:
'社团/社团活动' }}
'协会/协会活动' }}
</el-descriptions-item>
<el-descriptions-item label="活动地点">
{{ viewData.address }}
src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
+1 -1
View File
@@ -200,7 +200,7 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
}
},
computed: {
// 当前双页签及满高列表仅用于校工会、分工会文化活动，社团页面保持原样。
// 当前双页签及满高列表仅用于校工会、分工会文化活动，协会页面保持原样。
isTemplateManagedActivity() {
return this.activity_type === 40001 || this.activity_type === 40002
},
src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js
+1 -1
View File
@@ -23,7 +23,7 @@ const singleSignUp = {
<el-descriptions-item label="活动类型">
{{ viewData.activity_type === 40001 ? '校工会活动' : viewData.activity_type === 40002 ? '分工会活动'
:
'社团/社团活动' }}
'协会/协会活动' }}
</el-descriptions-item>
<el-descriptions-item label="活动地点">
{{ viewData.address }}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html
+3 -3
View File
@@ -28,9 +28,9 @@
</el-descriptions-item>
<template v-if="formData.activityType == 'CLUB'">
<el-descriptions-item label="申请社团">
<el-form-item prop="clubId" label="申请社团">
<el-select v-model="formData.clubId" placeholder="请选择社团"
<el-descriptions-item label="申请协会">
<el-form-item prop="clubId" label="申请协会">
<el-select v-model="formData.clubId" placeholder="请选择协会"
@change="setDeclareUnitName" style="width: 100%">
<el-option
v-for="item in clubList"
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+6 -6
View File
@@ -43,9 +43,9 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
<template v-if="formData.activityType == 'CLUB'">
<el-descriptions-item label="申请社团">
<el-form-item prop="clubId" label="申请社团">
<el-select v-model="formData.clubId" placeholder="请选择社团"
<el-descriptions-item label="申请协会">
<el-form-item prop="clubId" label="申请协会">
<el-select v-model="formData.clubId" placeholder="请选择协会"
@change="setDeclareUnitName" style="width: 100%">
<el-option
v-for="item in clubList"
@@ -333,7 +333,7 @@ layout("/layouts/platform.html"){
const club = this.clubList.find(v => v.id === val)
this.$set(this.formData, "declareUnitName", club ? club.clubName : null)
// 清空当前预算选择，因为社团变更会影响可选的预算
// 清空当前预算选择，因为协会变更会影响可选的预算
this.$set(this.formData, "deductionBudgetId", null)
// 获取新的预算数据
@@ -347,7 +347,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "declareUnitName", this.$store.state.user.union.name)
this.$set(this.formData, "unionId", this.$store.state.user.union.id)
} else if (val === "CLUB") {
// 当活动类型变为社团时，清空已选择的预算
// 当活动类型变为协会时，清空已选择的预算
this.$set(this.formData, "deductionBudgetId", null)
}
@@ -431,7 +431,7 @@ layout("/layouts/platform.html"){
},
async created() {
this.init()
//社团查询
//协会查询
this.$businessTool.listClubByRole().then((res) => (this.clubList = res))
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html
+1 -1
View File
@@ -4,7 +4,7 @@
<el-descriptions-item label="活动类型">{{ getActivityTypeName(viewData.activityType) }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName + '(' + viewData.loginName + ')' }}</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请社团' : '申请单位'">{{ viewData.declareUnitName }}</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请协会' : '申请单位'">{{ viewData.declareUnitName }}</el-descriptions-item>
<el-descriptions-item label="联系方式">{{ viewData.mobile }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.applyTime }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/branchunion/index.html
+1 -1
View File
@@ -135,7 +135,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系方式"},
{ prop: "activityName", label: "活动名称"},
{ prop: "activityType", label: "活动类型"},
{ prop: "declareUnitName", label: "申报单位/社团", sortable: true },
{ prop: "declareUnitName", label: "申报单位/协会", sortable: true },
{ prop: "activityNumber", label: "活动人数", sortable: true },
{ prop: "applyTime", label: "申报时间", sortable: true },
{ prop: "curTaskName", label: "当前节点"},
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html
+3 -3
View File
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
<el-input placeholder="请输入申请人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -122,7 +122,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系方式"},
{ prop: "activityName", label: "活动名称"},
{ prop: "activityType", label: "活动类型"},
{ prop: "declareUnitName", label: "申报单位/社团", sortable: true },
{ prop: "declareUnitName", label: "申报单位/协会", sortable: true },
{ prop: "activityNumber", label: "活动人数", sortable: true },
{ prop: "applyTime", label: "申报时间", sortable: true },
{ prop: "curTaskName", label: "当前节点"},
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js
+1 -1
View File
@@ -11,7 +11,7 @@ const INFO = {
<el-descriptions-item label="申请人">{{ viewData.userName + '(' + viewData.loginName + ')' }}
</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请社团' : '申请单位'">{{
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请协会' : '申请单位'">{{
viewData.declareUnitName }}
</el-descriptions-item>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html
+3 -3
View File
@@ -41,8 +41,8 @@ layout("/layouts/platform.html"){
</template>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, CLUB_MANAGER, CLUB_PRESIDENT')">
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -128,7 +128,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系方式"},
{ prop: "activityName", label: "活动名称"},
{ prop: "activityType", label: "活动类型"},
{ prop: "declareUnitName", label: "申报单位/社团", sortable: true },
{ prop: "declareUnitName", label: "申报单位/协会", sortable: true },
{ prop: "activityNumber", label: "活动人数", sortable: true },
{ prop: "applyTime", label: "申报时间", sortable: true },
{ prop: "taskName", label: "当前节点"},
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html
+3 -3
View File
@@ -30,8 +30,8 @@ layout("/layouts/platform.html"){
v-for="item in unions"></el-option>
</el-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系方式"},
{ prop: "activityName", label: "活动名称"},
{ prop: "activityType", label: "活动类型"},
{ prop: "declareUnitName", label: "申报单位/社团", sortable: true },
{ prop: "declareUnitName", label: "申报单位/协会", sortable: true },
{ prop: "activityNumber", label: "活动人数", sortable: true },
{ prop: "applyTime", label: "申报时间", sortable: true },
{ prop: "curTaskName", label: "当前节点"},
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html
+3 -3
View File
@@ -30,8 +30,8 @@ layout("/layouts/platform.html"){
v-for="item in unions"></el-option>
</el-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系方式"},
{ prop: "activityName", label: "活动名称"},
{ prop: "activityType", label: "活动类型"},
{ prop: "declareUnitName", label: "申报单位/社团", sortable: true },
{ prop: "declareUnitName", label: "申报单位/协会", sortable: true },
{ prop: "activityNumber", label: "活动人数", sortable: true },
{ prop: "applyTime", label: "申报时间", sortable: true },
{ prop: "curTaskName", label: "当前节点"},
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+3 -3
View File
@@ -35,12 +35,12 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="所属社团"
<el-descriptions-item label="所属协会"
v-if="['ACTIVITY_BUDGET_TYPE_THREE'].includes(formData.outlayManageSource)">
<el-form-item label="所属社团" prop="clubId"
<el-form-item label="所属协会" prop="clubId"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-select
placeholder="请选择社团"
placeholder="请选择协会"
style="width: 100%;" v-model="formData.clubId"
@change="clubIdChange">
<el-option
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html
+1 -1
View File
@@ -4,7 +4,7 @@
<el-descriptions-item label="活动类型">{{ getActivityTypeName(viewData.activityType) }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName + '(' + viewData.loginName + ')' }}</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请社团' : '申请单位'">{{ viewData.declareUnitName }}</el-descriptions-item>
<el-descriptions-item :label="viewData.activityType == 'CLUB' ? '申请协会' : '申请单位'">{{ viewData.declareUnitName }}</el-descriptions-item>
<el-descriptions-item label="联系方式">{{ viewData.mobile }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.applyTime }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/board/index.html
+6 -6
View File
@@ -80,7 +80,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.clubSignNum?numData.clubSignNum:'0'}}</div>
<div class="cut-off-line"></div>
</el-col>-->
@@ -99,7 +99,7 @@ layout("/layouts/platform.html"){
<div class="cut-off-line"></div>
</el-col>
<el-col :span="8">
<div class="top_title">社团活动报销费用（元）
<div class="top_title">协会活动报销费用（元）
</div>
<div class="top_num">{{numData.clubActivityMoney?numData.clubActivityMoney:'0'}}</div>
</el-col>
@@ -217,7 +217,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>
@@ -262,7 +262,7 @@ layout("/layouts/platform.html"){
isUnionJf:true,
all_club_loading: false,
clubTip:'社团活动数',
clubTip:'协会活动数',
allClubYear: moment().format('YYYY'),
isClubJf:true,
}
@@ -485,7 +485,7 @@ layout("/layouts/platform.html"){
},
async doClubSwitch(){
this.isClubJf = !this.isClubJf
this.clubTip = this.isClubJf ? '社团活动数' : '社团经费详情'
this.clubTip = this.isClubJf ? '协会活动数' : '协会经费详情'
await this.allClubActivityAndJf();
},
async allClubActivityAndJf(){
@@ -533,7 +533,7 @@ layout("/layouts/platform.html"){
"yAxis": {},
meta: {
clubName: {
alias: '社团',
alias: '协会',
},
money: {
alias: this.isClubJf?'金额':'活动数',
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html
+1 -1
View File
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
{prop: "outlayManageSource", label: "经费类型"},
{prop: "budgetReimburseType", label: "预算条目"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "curTaskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html
+3 -3
View File
@@ -35,8 +35,8 @@ layout("/layouts/platform.html"){
placeholder="请选择预算条目"></dict-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -149,7 +149,7 @@ layout("/layouts/platform.html"){
{prop: "outlayManageSource", label: "经费类型"},
{prop: "budgetReimburseType", label: "预算条目"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "curTaskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js
+1 -1
View File
@@ -19,7 +19,7 @@ const INFO = {
<el-descriptions-item label="申请人">{{ viewData.userName + '(' + viewData.loginName + ')' }}
</el-descriptions-item>
<el-descriptions-item
:label="viewData.outlayManageSource == 'ACTIVITY_BUDGET_TYPE_THREE' ? '申请社团' : '申请单位'">
:label="viewData.outlayManageSource == 'ACTIVITY_BUDGET_TYPE_THREE' ? '申请协会' : '申请单位'">
{{viewData.declareUnitName }}
</el-descriptions-item>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html
+3 -3
View File
@@ -47,8 +47,8 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -162,7 +162,7 @@ layout("/layouts/platform.html"){
{prop: "outlayManageSource", label: "经费类型"},
{prop: "budgetReimburseType", label: "预算条目"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "curTaskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+3 -3
View File
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
</template>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, CLUB_MANAGER, CLUB_PRESIDENT')">
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -136,7 +136,7 @@ layout("/layouts/platform.html"){
{prop: "activityReimbursementMode", label: "报销模式"},
{prop: "outlayManageSource", label: "经费类型"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "taskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html
+3 -3
View File
@@ -47,8 +47,8 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -162,7 +162,7 @@ layout("/layouts/platform.html"){
{prop: "outlayManageSource", label: "经费类型"},
{prop: "budgetReimburseType", label: "预算条目"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "curTaskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html
+3 -3
View File
@@ -47,8 +47,8 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -163,7 +163,7 @@ layout("/layouts/platform.html"){
{prop: "outlayManageSource", label: "经费类型"},
{prop: "budgetReimburseType", label: "预算条目"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "curTaskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html
+3 -3
View File
@@ -46,8 +46,8 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -161,7 +161,7 @@ layout("/layouts/platform.html"){
{prop: "outlayManageSource", label: "经费类型"},
{prop: "budgetReimburseType", label: "预算条目"},
{prop: "actualMoney", label: "报销金额（元）"},
{prop: "declareUnitName", label: "申报单位/社团", sortable: true},
{prop: "declareUnitName", label: "申报单位/协会", sortable: true},
{prop: "applyTime", label: "申报时间", sortable: true},
{prop: "curTaskName", label: "当前节点"},
{prop: "instanceState", label: "流程状态"}
src/main/resources/views/platform/zhgh/activity/planSummary/yearPlan/basicForm.js
+3 -3
View File
@@ -7,7 +7,7 @@ const basicForm = {
style="width: 100%">
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')" label="校工会" value="40001"></el-option>
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('BRANCH_UNION_CHAIRMAN')" label="分工会" value="40002"></el-option>
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="社团/社团" value="40003"></el-option>
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="协会/协会" value="40003"></el-option>
</el-select>
</el-form-item>
@@ -24,8 +24,8 @@ const basicForm = {
</el-select>
</el-form-item>
<el-form-item v-if="formData.planType === '40003'" prop="tissueId" label="所属社团/社团">
<el-select v-model="formData.tissueId" placeholder="请选择所属社团/社团" filterable clearable
<el-form-item v-if="formData.planType === '40003'" prop="tissueId" label="所属协会/协会">
<el-select v-model="formData.tissueId" placeholder="请选择所属协会/协会" filterable clearable
@change="(val) => {formData.tissueName = clubList.find(o => o.id === formData.tissueId).clubName}"
style="width: 100%">
<el-option
src/main/resources/views/platform/zhgh/activity/planSummary/yearPlan/index.html
+3 -3
View File
@@ -41,8 +41,8 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="社团/社团：">
<el-select v-model="pageForm.tissueIdByClub" placeholder="请选择所属社团/社团" filterable clearable
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="协会/协会：">
<el-select v-model="pageForm.tissueIdByClub" placeholder="请选择所属协会/协会" filterable clearable
@change="doSearch" style="width: 100%">
<el-option
v-for="item in clubList"
@@ -82,7 +82,7 @@ layout("/layouts/platform.html"){
<template v-slot="{ row }" v-if="column.prop === 'planType'">
<span v-if="row.planType === '40001'">校工会</span>
<span v-if="row.planType === '40002'">分工会</span>
<span v-if="row.planType === '40003'">社团/社团</span>
<span v-if="row.planType === '40003'">协会/协会</span>
</template>
<template v-slot="{ row }" v-else-if="column.prop === 'tissueName'">
{{ row.tissueName || '校工会' }}
src/main/resources/views/platform/zhgh/activity/planSummary/yearPlan/info.js
+1 -1
View File
@@ -3,7 +3,7 @@ const info = {
<div>
<el-descriptions :column="2" border class="table_fixed">
<el-descriptions-item label="计划类型">
{{ viewData.type == 40001 ? '校工会计划' : viewData.type == 40002 ? '分工会计划' : '社团/社团计划' }}
{{ viewData.type == 40001 ? '校工会计划' : viewData.type == 40002 ? '分工会计划' : '协会/协会计划' }}
</el-descriptions-item>
<el-descriptions-item label="计划名称">
{{ viewData.planName }}
src/main/resources/views/platform/zhgh/activity/planSummary/yearSummary/basicForm.js
+3 -3
View File
@@ -11,7 +11,7 @@ const basicForm = {
style="width: 100%">
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')" label="校工会" value="40001"></el-option>
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('BRANCH_UNION_CHAIRMAN')" label="分工会" value="40002"></el-option>
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="社团/社团" value="40003"></el-option>
<el-option v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="协会/协会" value="40003"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="formData.summaryFrom === '40002'" prop="tissueId" label="所属工会">
@@ -26,8 +26,8 @@ const basicForm = {
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="formData.summaryFrom === '40003'" prop="tissueId" label="所属社团/社团">
<el-select v-model="formData.tissueId" placeholder="请选择所属社团/社团" filterable clearable
<el-form-item v-if="formData.summaryFrom === '40003'" prop="tissueId" label="所属协会/协会">
<el-select v-model="formData.tissueId" placeholder="请选择所属协会/协会" filterable clearable
@change="(val) => {formData.tissueName = clubList.find(o => o.id === formData.tissueId).clubName}"
style="width: 100%">
<el-option
src/main/resources/views/platform/zhgh/activity/planSummary/yearSummary/index.html
+3 -3
View File
@@ -38,8 +38,8 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="社团/社团：">
<el-select v-model="pageForm.tissueIdByClub" placeholder="请选择所属社团/社团" filterable clearable
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('CLUB_PRESIDENT')" label="协会/协会：">
<el-select v-model="pageForm.tissueIdByClub" placeholder="请选择所属协会/协会" filterable clearable
@change="doSearch" style="width: 100%">
<el-option
v-for="item in clubList"
@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
<template v-slot="{ row }" v-if="column.prop === 'planType'">
<span v-if="row.planType === '40001'">校工会</span>
<span v-if="row.planType === '40002'">分工会</span>
<span v-if="row.planType === '40003'">社团/社团</span>
<span v-if="row.planType === '40003'">协会/协会</span>
</template>
<template v-slot="{ row }" v-else-if="column.prop === 'tissueName'">
{{ row.tissueName || '校工会' }}
src/main/resources/views/platform/zhgh/activity/planSummary/yearSummary/info.js
+1 -1
View File
@@ -6,7 +6,7 @@ const info = {
{{viewData.userName}}
</el-descriptions-item>
<el-descriptions-item label="上传类型">
{{ viewData.summaryFrom == 40001 ? '校工会计划' : viewData.type == 40002 ? '分工会计划' : '社团/社团计划' }}
{{ viewData.summaryFrom == 40001 ? '校工会计划' : viewData.type == 40002 ? '分工会计划' : '协会/协会计划' }}
</el-descriptions-item>
<el-descriptions-item label="所属组织">
{{ viewData.tissueName || '校工会' }}
src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js
+4 -4
View File
@@ -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>
@@ -185,8 +185,8 @@
</el-col>-->
<el-col v-if="formData.activityLevel===40003||(formData.activityLevel===40001&&is_club)"
:span="8">
<el-form-item prop="belongClubId" label="活动所属社团">
<el-select v-model="formData.belongClubId" placeholder="请选择活动所属社团" filterable clearable
<el-form-item prop="belongClubId" label="活动所属协会">
<el-select v-model="formData.belongClubId" placeholder="请选择活动所属协会" filterable clearable
style="width: 100%">
<el-option
v-for="item in clubOptions"
src/main/resources/views/platform/zhgh/club/common/clubInfoComponent.js
+7 -7
View File
@@ -4,29 +4,29 @@ const REGISTER_INFO_COMPONENT = {
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane name="1" label="基础信息">
<div class="process-title">
社团信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
协会信息
<el-link type="primary" style="margin-left: auto" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border class="table_fixed">
<el-descriptions-item label="社团缩略图" :span="3">
<el-descriptions-item label="协会缩略图" :span="3">
<el-image v-if="viewData.thumbnail" :src="viewData.thumbnail" :preview-src-list="[viewData.thumbnail]" fit="contain" style="width: 180px; height: 120px">
<span slot="error">暂无图片</span>
</el-image>
<span v-else>暂无图片</span>
</el-descriptions-item>
<el-descriptions-item label="社团名称">
<el-descriptions-item label="协会名称">
{{viewData.clubName}}
</el-descriptions-item>
<el-descriptions-item label="成立时间">
{{ viewData.foundTime }}
</el-descriptions-item>
<el-descriptions-item label="社团编码">
<el-descriptions-item label="协会编码">
{{viewData.clubCode}}
</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="报名联系人">
@@ -45,7 +45,7 @@ const REGISTER_INFO_COMPONENT = {
{{viewData.due}}
</el-descriptions-item>
<el-descriptions-item :span="4">
<template slot="label">社团介绍</template>
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.introduce"></div>
</el-descriptions-item>
<el-descriptions-item :span="4">
src/main/resources/views/platform/zhgh/club/common/clubRoleConstant.js
+1 -1
View File
@@ -16,7 +16,7 @@ const CLUB_ROLE_CONSTANT = {
case this.CLUB_VICE_SECRETARY:
return "副秘书长"
case this.CLUB_MEMBER:
return "社团会员"
return "协会会员"
default:
return ""
}
src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js
+1 -1
View File
@@ -44,7 +44,7 @@ const clubUserJoin = {
<el-descriptions-item label="学位" :span="2">
{{viewData.academicDegree}}
</el-descriptions-item>
<el-descriptions-item label="同时参加其他社团情况" :span="3">
<el-descriptions-item label="同时参加其他协会情况" :span="3">
{{viewData.sameTimeJoinOtherClubSituation}}
</el-descriptions-item>
<el-descriptions-item label="文化、体育方面的活动经历、获奖情况" :span="3">
src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html
+5 -5
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card v-if="isCanApply" shadow="never">
<snaker-start slot="header" label="年度优秀社团申报" define_key="XHPY"></snaker-start>
<snaker-start slot="header" label="年度优秀协会申报" define_key="XHPY"></snaker-start>
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px" style="padding: 0 30px">
<el-row :gutter="30">
@@ -40,10 +40,10 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="8">
<el-form-item label="社团名称" prop="clubId" :rules="{required: true, message: '请选择社团', trigger: 'blur'}">
<el-form-item label="协会名称" prop="clubId" :rules="{required: true, message: '请选择协会', trigger: 'blur'}">
<el-select
v-model="formData.clubId"
placeholder="请选择社团"
placeholder="请选择协会"
filterable
clearable
style="width: 100%"
@@ -185,7 +185,7 @@ layout("/layouts/platform.html"){
}
}
},
//获取当前登录用户管理的社团
//获取当前登录用户管理的协会
async getMyClubAndYearAuditPass() {
const resp = await this.$axios.post("/platform/club/evaluate/apply/getMyClubAndYearAuditPass", {
year: new Date().getFullYear()
@@ -200,7 +200,7 @@ layout("/layouts/platform.html"){
const year = this.$moment().format("YYYY")
// this.isCanApply = year % 2 === 0
// if (this.isCanApply === false) {
// this.$alert("当前年份（" + year + "）不能进行年度优秀社团申报", "温馨提示", {
// this.$alert("当前年份（" + year + "）不能进行年度优秀协会申报", "温馨提示", {
// confirmButtonText: "确定"
// })
// }
src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html
+6 -6
View File
@@ -25,8 +25,8 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -42,9 +42,9 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ row.foundTime ? $moment(row.foundTime).format('YYYY-MM-DD') : '无' }}</span>
@@ -186,7 +186,7 @@ layout("/layouts/platform.html"){
this.$message.warning(resp.msg)
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await this.$axios.post("/platform/club/evaluate/apply/getMyClubAndYearAuditPass", {
year: this.pageForm.year
src/main/resources/views/platform/zhgh/club/evaluate/common/evaluateInfo.js
+3 -3
View File
@@ -6,9 +6,9 @@ const EVALUATE_INFO_COMPONENT = {
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="社团名称">{{viewData.clubName}}</el-descriptions-item>
<el-descriptions-item label="社团编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="社团类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="协会名称">{{viewData.clubName}}</el-descriptions-item>
<el-descriptions-item label="协会编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="协会类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="成立时间">{{viewData.foundTime}}</el-descriptions-item>
<el-descriptions-item label="申报年份">{{$moment(viewData.applyTime).format('YYYY')}}</el-descriptions-item>
<el-descriptions-item label="申报时间">{{viewData.applyTime}}</el-descriptions-item>
src/main/resources/views/platform/zhgh/club/evaluate/mine/index.html
+6 -6
View File
@@ -26,8 +26,8 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -40,9 +40,9 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ row.foundTime ? $moment(row.foundTime).format('YYYY-MM-DD') : '' }}</span>
@@ -144,7 +144,7 @@ layout("/layouts/platform.html"){
this.$message.warning(resp.msg)
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await this.$axios.post("/platform/club/evaluate/apply/getMyClubAndYearAuditPass", {
year: this.pageForm.year
src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html
+6 -6
View File
@@ -25,8 +25,8 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -42,9 +42,9 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ row.foundTime ? $moment(row.foundTime).format('YYYY-MM-DD') : '无' }}</span>
@@ -186,7 +186,7 @@ layout("/layouts/platform.html"){
this.$message.warning(resp.msg)
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await this.$axios.post("/platform/club/evaluate/apply/getMyClubAndYearAuditPass", {
year: this.pageForm.year
src/main/resources/views/platform/zhgh/club/evaluate/schoolLeaderAudit/index.html
+6 -6
View File
@@ -25,8 +25,8 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -42,9 +42,9 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会编码" prop="clubCode" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ row.foundTime ? $moment(row.foundTime).format('YYYY-MM-DD') : '无' }}</span>
@@ -186,7 +186,7 @@ layout("/layouts/platform.html"){
this.$message.warning(resp.msg)
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await this.$axios.post("/platform/club/evaluate/apply/getMyClubAndYearAuditPass", {
year: this.pageForm.year
src/main/resources/views/platform/zhgh/club/examine/apply/index.html
+19 -19
View File
@@ -99,12 +99,12 @@ layout("/layouts/platform.html"){
<el-col :span="6">
<el-form-item
prop="clubId"
label="社团名称"
:rules="[{required:true,message:'请选择所属社团',trigger:['change','blur']}]"
label="协会名称"
:rules="[{required:true,message:'请选择所属协会',trigger:['change','blur']}]"
>
<el-select
v-model="formData.clubId"
placeholder="请选择所属社团"
placeholder="请选择所属协会"
filterable
clearable
:disabled="!!formData.id"
@@ -369,8 +369,8 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<!-- 社团成员变化情况 -->
<div class="left-span-label">社团成员变化情况</div>
<!-- 协会成员变化情况 -->
<div class="left-span-label">协会成员变化情况</div>
<el-row :gutter="20" type="flex">
<el-col :span="24">
<el-form-item>
@@ -644,7 +644,7 @@ layout("/layouts/platform.html"){
taskId: GetQueryString("taskId"),
step: 0, // 当前步骤（0-基础信息，1-财务收支，2-成员名单）
isRegistered: false, // 是否已登记
currentClubId: "", // 当前选中社团ID
currentClubId: "", // 当前选中协会ID
// 金额数据
dueIncome: 0, // 会费收入
@@ -652,9 +652,9 @@ layout("/layouts/platform.html"){
lastYearSurplus: 0, // 去年结余
// 下拉选项&列表数据
clubOptions: [], // 社团选项
clubOptions: [], // 协会选项
memberList: [], // 成员名单
lastClubData: {}, // 上年度社团数据
lastClubData: {}, // 上年度协会数据
// 2026年10月2日22：00点开始新开发的代码；实际整改：2026年10月3日 10:14:04；操作人：wxg。统计加载与核查提示只服务于成员变化表。
memberStatisticsLoading: false,
@@ -688,7 +688,7 @@ layout("/layouts/platform.html"){
},
// 常量定义（便于维护和修改）
computed: {
// 仅对本页社团选项按编码升序展示；空编码放末尾，保留接口原始数组。
// 仅对本页协会选项按编码升序展示；空编码放末尾，保留接口原始数组。
sortedClubOptions() {
return (this.clubOptions || []).slice().sort((left, right) => {
const leftCode = left.clubCode == null ? "" : String(left.clubCode);
@@ -729,7 +729,7 @@ layout("/layouts/platform.html"){
}
},
async created() {
this.$alert('请在填报年审材料前，于' + new Date().getFullYear() + '年12月31日前完成以下操作：1.在【入会申请】中审核所有待处理的入会及退会申请；2.在【社团管理】中将已退会人员进行退会处理。', '温馨提示', {
this.$alert('请在填报年审材料前，于' + new Date().getFullYear() + '年12月31日前完成以下操作：1.在【入会申请】中审核所有待处理的入会及退会申请；2.在【协会管理】中将已退会人员进行退会处理。', '温馨提示', {
confirmButtonText: '确定',
type: 'warning',
})
@@ -738,7 +738,7 @@ layout("/layouts/platform.html"){
// 编辑模式：获取详情数据
await this.fetchEditData(this.id);
} else {
// 新增模式：初始化社团列表
// 新增模式：初始化协会列表
await this.fetchClubList();
}
} catch (error) {
@@ -798,12 +798,12 @@ layout("/layouts/platform.html"){
},
/************************ 数据请求方法 ************************/
// 获取社团列表
// 获取协会列表
async fetchClubList() {
const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole");
this.clubOptions = resp.data || [];
if (this.sortedClubOptions.length > 0) {
// 新增登记默认选中编码最小的社团；编辑回显仍使用原登记社团。
// 新增登记默认选中编码最小的协会；编辑回显仍使用原登记协会。
this.$set(this.formData, "clubId", this.sortedClubOptions[0].id);
await this.handleClubChange(this.formData.clubId);
}
@@ -857,7 +857,7 @@ layout("/layouts/platform.html"){
return [...sortedDefaults, ...customItems];
},
// 2026年10月2日wxg屏蔽操作：原统计请求逐行注释保留。
// // 获取社团成员数量
// // 获取协会成员数量
// async fetchClubUserNum(clubId) {
// const resp = await this.$axios.post("/platform/club/examine/apply/getClubUserNum", {
// clubId,
@@ -884,7 +884,7 @@ layout("/layouts/platform.html"){
clubId: clubId,
year: this.formData.year
}).then((resp) => {
// 切换年度或社团时只接收最近一次请求，避免旧条件的结果覆盖当前统计。
// 切换年度或协会时只接收最近一次请求，避免旧条件的结果覆盖当前统计。
if (sequence !== this.memberStatisticsSequence) return;
if (resp.code === 0) {
const rows = resp.data || [];
@@ -895,7 +895,7 @@ layout("/layouts/platform.html"){
}
}).catch(() => {
if (sequence === this.memberStatisticsSequence) {
this.memberStatisticsWarnings = ["成员变化统计请求失败，请检查后重新选择社团或年度"];
this.memberStatisticsWarnings = ["成员变化统计请求失败，请检查后重新选择协会或年度"];
}
}).finally(() => {
if (sequence === this.memberStatisticsSequence) this.memberStatisticsLoading = false;
@@ -935,7 +935,7 @@ layout("/layouts/platform.html"){
this.financeData.incomeCensus[0].lastYearSurplus = this.lastYearSurplus;
}
},
// 获取上年度社团数据
// 获取上年度协会数据
async fetchLastClubData() {
const res = await this.$axios.post(loc() + '/getLastData', {
clubId: this.formData.clubId,
@@ -1167,14 +1167,14 @@ layout("/layouts/platform.html"){
this.checkIsRegistered();
return this.fetchClubUserNum(this.formData.clubId);
},
// 社团变化处理
// 协会变化处理
async handleClubChange(val) {
if (!val) {
this.fetchClubUserNum(val);
return;
}
const club = this.clubOptions.find(item => item.id === val);
// 更新社团基础信息
// 更新协会基础信息
this.formData.due = club?.due || "";
this.formData.foundTime = club?.foundTime
? this.$moment(club.foundTime).format("YYYY-MM-DD")
src/main/resources/views/platform/zhgh/club/examine/clubAudit/index.html
+3 -3
View File
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="年度" prop="year" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.foundTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js
+6 -6
View File
@@ -8,7 +8,7 @@
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions v-if="viewData" :column="3" border class="table_fixed">
<el-descriptions-item label="社团名称">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="协会名称">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="成立时间">{{ viewData.foundTime }} </el-descriptions-item>
<el-descriptions-item label="会费标准">{{ viewData.due }}</el-descriptions-item>
<el-descriptions-item span="3">
@@ -16,7 +16,7 @@
<file-preview :files="viewData.summaryFiles" complete_result></file-preview>
</el-descriptions-item>
</el-descriptions>
<div class="process-title">社团成员变化情况</div>
<div class="process-title">协会成员变化情况</div>
<el-table :data="viewData.changeUserNum" max-height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="人员类型" prop="userState"></el-table-column>
@@ -77,8 +77,8 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane name="4" label="社团成员">
<div class="process-title">社团成员</div>
<el-tab-pane name="4" label="协会成员">
<div class="process-title">协会成员</div>
<el-table :data="viewData.jgUser">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="职务" prop="roleName"></el-table-column>
@@ -223,11 +223,11 @@
this.$set(this.viewData, "jgUser", respUser.data || [])
} else {
this.$set(this.viewData, "jgUser", [])
this.$message.warning(respUser.msg || "查询社团成员失败")
this.$message.warning(respUser.msg || "查询协会成员失败")
}
} catch (error) {
this.$set(this.viewData, "jgUser", [])
this.$message.warning("查询社团成员失败")
this.$message.warning("查询协会成员失败")
}
},
// 获取已办任务审批记录
src/main/resources/views/platform/zhgh/club/examine/mine/index.html
+3 -3
View File
@@ -20,8 +20,8 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80"></el-table-column>
<el-table-column label="年度" prop="year" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.foundTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/examine/schoolAudit/index.html
+3 -3
View File
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="年度" prop="year" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.foundTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/examine/schoolLeaderAudit/index.html
+3 -3
View File
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="年度" prop="year" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.foundTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/infoManage/auditManager/index.html
+3 -3
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :height="tableHeight" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="变更用户" prop="changeUserName" sortable show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/club/infoManage/change/index.html
+15 -15
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :height="tableHeight" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="变更用户" prop="changeUserName" sortable show-overflow-tooltip></el-table-column>
@@ -75,8 +75,8 @@ layout("/layouts/platform.html"){
</template>
<template #edit>
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
<el-form-item label="社团名称" prop="clubId">
<el-select v-model="formData.clubId" @change="clubChange" placeholder="请选择社团" filterable clearable style="width: 100%">
<el-form-item label="协会名称" prop="clubId">
<el-select v-model="formData.clubId" @change="clubChange" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -104,19 +104,19 @@ layout("/layouts/platform.html"){
<el-option label="二十届" value="二十届"></el-option>
</el-select>
</el-form-item>
<el-form-item label="社团成员" prop="userId">
<el-select v-model="formData.userId" @change="userChange" placeholder="请选择社团成员" filterable clearable style="width: 100%">
<el-form-item label="协会成员" prop="userId">
<el-select v-model="formData.userId" @change="userChange" placeholder="请选择协会成员" filterable clearable style="width: 100%">
<el-option v-for="item,index in userList" :key="index" :label="item.userName" :value="item.userId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="身份" prop="nowRoleCode">
<el-checkbox-group v-model="formData.nowRoleCode" @change="handleRoleChange">
<el-checkbox label="CLUB_PRESIDENT">社团会长</el-checkbox>
<el-checkbox label="CLUB_VICE_PRESIDENT">社团副会长</el-checkbox>
<el-checkbox label="CLUB_SECRETARY">社团秘书长</el-checkbox>
<el-checkbox label="CLUB_VICE_SECRETARY">社团副秘书长</el-checkbox>
<el-checkbox label="CLUB_OPERATOR">社团操作员</el-checkbox>
<el-checkbox label="CLUB_MEMBER" :disabled="memberRoleDisabled">社团会员</el-checkbox>
<el-checkbox label="CLUB_PRESIDENT">协会会长</el-checkbox>
<el-checkbox label="CLUB_VICE_PRESIDENT">协会副会长</el-checkbox>
<el-checkbox label="CLUB_SECRETARY">协会秘书长</el-checkbox>
<el-checkbox label="CLUB_VICE_SECRETARY">协会副秘书长</el-checkbox>
<el-checkbox label="CLUB_OPERATOR">协会操作员</el-checkbox>
<el-checkbox label="CLUB_MEMBER" :disabled="memberRoleDisabled">协会会员</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
@@ -161,7 +161,7 @@ layout("/layouts/platform.html"){
}
},
computed: {
// 选择任意理事机构身份后，社团会员身份不可再选，避免互斥身份同时提交。
// 选择任意理事机构身份后，协会会员身份不可再选，避免互斥身份同时提交。
memberRoleDisabled() {
const roleCodes = Array.isArray(this.formData.nowRoleCode) ? this.formData.nowRoleCode : []
return roleCodes.some(roleCode => roleCode !== 'CLUB_MEMBER')
@@ -187,7 +187,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, 'changeUserId', key)
this.$set(this.formData, 'changeUserName', user?.userName)
},
// 身份发生变化时，只要存在非社团会员身份，就取消社团会员身份的选中状态。
// 身份发生变化时，只要存在非协会会员身份，就取消协会会员身份的选中状态。
handleRoleChange(roleCodes) {
const selectedRoleCodes = Array.isArray(roleCodes) ? roleCodes : []
const hasNonMemberRole = selectedRoleCodes.some(roleCode => roleCode !== 'CLUB_MEMBER')
src/main/resources/views/platform/zhgh/club/infoManage/change/info.js
+1 -1
View File
@@ -6,7 +6,7 @@ const clubManagerInfo = {
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="所属社团">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="所属协会">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.creatTime }}</el-descriptions-item>
<el-descriptions-item label="变更用户">{{ viewData.changeUserName }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html
+4 -4
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<div class="club-info-fixed-list-page">
<el-card class="club-info-fixed-query-card" shadow="never">
<search @search="doSearch">
<search-item label="所属社团">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" clearable filterable style="width: 100%">
<search-item label="所属协会">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" clearable filterable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -44,7 +44,7 @@ layout("/layouts/platform.html"){
<el-table-column label="姓名" prop="userName" show-overflow-tooltip></el-table-column>
<el-table-column label="性别" prop="sex" show-overflow-tooltip></el-table-column>
<el-table-column label="电话" prop="mobile" show-overflow-tooltip></el-table-column>
<el-table-column label="所属社团" prop="clubName" show-overflow-tooltip></el-table-column>
<el-table-column label="所属协会" prop="clubName" show-overflow-tooltip></el-table-column>
<el-table-column label="所属单位" prop="unitName" show-overflow-tooltip></el-table-column>
<el-table-column label="身份" prop="roleName" show-overflow-tooltip></el-table-column>
<el-table-column label="入会时间" prop="joinTime" show-overflow-tooltip></el-table-column>
@@ -112,7 +112,7 @@ layout("/layouts/platform.html"){
getClubList() {
return this.$axios.post("/platform/club/infoManage/exitManage/getClubList").then(resp => {
if (resp.code === 0) {
// 仅调整当前页面的社团选项顺序；编码为空时排在有编码的社团之后。
// 仅调整当前页面的协会选项顺序；编码为空时排在有编码的协会之后。
const clubs = (resp.data || []).slice().sort((left, right) => {
const leftCode = left.clubCode == null ? "" : String(left.clubCode)
const rightCode = right.clubCode == null ? "" : String(right.clubCode)
src/main/resources/views/platform/zhgh/club/infoManage/exitManage/info.js
+1 -1
View File
@@ -21,7 +21,7 @@ const clubExitInfo = {
' <el-descriptions-item label="职称" :span="2">{{viewData.technicalTitle}}</el-descriptions-item>',
' <el-descriptions-item label="学历">{{viewData.education}}</el-descriptions-item>',
' <el-descriptions-item label="学位" :span="2">{{viewData.academicDegree}}</el-descriptions-item>',
' <el-descriptions-item label="同时参加其他社团情况" :span="3">{{viewData.sameTimeJoinOtherClubSituation}}</el-descriptions-item>',
' <el-descriptions-item label="同时参加其他协会情况" :span="3">{{viewData.sameTimeJoinOtherClubSituation}}</el-descriptions-item>',
' <el-descriptions-item label="文化、体育方面的活动经历、获奖情况" :span="3">{{viewData.awardsExperience}}</el-descriptions-item>',
' <el-descriptions-item label="照片" :span="3">',
' <img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">',
src/main/resources/views/platform/zhgh/club/infoManage/fixedListLayout.css
+1 -1
View File
@@ -1,4 +1,4 @@
/* 社团信息维护列表页固定占满平台内容区，禁止页面主体产生纵向滚动条。 */
/* 协会信息维护列表页固定占满平台内容区，禁止页面主体产生纵向滚动条。 */
#app .club-info-fixed-list-page {
box-sizing: border-box;
display: flex;
src/main/resources/views/platform/zhgh/club/infoManage/fixedListLayout.js
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* 社团信息维护列表页共用高度计算逻辑。
* 协会信息维护列表页共用高度计算逻辑。
* 查询卡片保持原始高度，列表表格占用工具栏与分页之外的全部剩余空间。
*/
const CLUB_INFO_FIXED_LIST_MIXIN = {
src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
+9 -9
View File
@@ -39,7 +39,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
<el-radio-group @change="memberTabChange" style="margin-left: 10px" v-model="pageForm.radioType" size="small">
<el-radio-button label="3">全部</el-radio-button>
<!-- 修改时间：2026-10-03 12:47:38；操作人：wxg；会员页签统一使用“会员”称谓，保留原筛选值。 -->
<el-radio-button label="2">社团会员</el-radio-button>
<el-radio-button label="2">协会会员</el-radio-button>
<el-radio-button label="1">理事机构</el-radio-button>
<el-radio-button label="4">历史会员</el-radio-button>
</el-radio-group>
@@ -153,13 +153,13 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
</el-form-item>
<el-form-item prop="roleCode" label="身份">
<el-checkbox-group v-model="roleCodeFormData.roleCode">
<el-checkbox label="CLUB_PRESIDENT" disabled>社团会长</el-checkbox>
<el-checkbox label="CLUB_VICE_PRESIDENT" disabled>社团副会长</el-checkbox>
<el-checkbox label="CLUB_SECRETARY" disabled>社团秘书长</el-checkbox>
<el-checkbox label="CLUB_VICE_SECRETARY" disabled>社团副秘书长</el-checkbox>
<el-checkbox label="CLUB_OPERATOR">社团操作员</el-checkbox>
<el-checkbox label="CLUB_REIMBURSEMENT_MANAGER">社团报销负责人</el-checkbox>
<el-checkbox label="CLUB_MEMBER">社团会员</el-checkbox>
<el-checkbox label="CLUB_PRESIDENT" disabled>协会会长</el-checkbox>
<el-checkbox label="CLUB_VICE_PRESIDENT" disabled>协会副会长</el-checkbox>
<el-checkbox label="CLUB_SECRETARY" disabled>协会秘书长</el-checkbox>
<el-checkbox label="CLUB_VICE_SECRETARY" disabled>协会副秘书长</el-checkbox>
<el-checkbox label="CLUB_OPERATOR">协会操作员</el-checkbox>
<el-checkbox label="CLUB_REIMBURSEMENT_MANAGER">协会报销负责人</el-checkbox>
<el-checkbox label="CLUB_MEMBER">协会会员</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
@@ -425,7 +425,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
pageData() {
this.pageForm.clubId = this.parentNode.currentTreeData.id
// 切换树节点或分页时清空旧数据，避免新请求完成前显示上一社团的成员。
// 切换树节点或分页时清空旧数据，避免新请求完成前显示上一协会的成员。
const requestSequence = ++this.pageRequestSequence
this.tableData = []
this.tableLoading = true
src/main/resources/views/platform/zhgh/club/infoManage/manage/clubRegisterImport.js
+7 -7
View File
@@ -1,18 +1,18 @@
const CLUB_REGISTER_IMPORT_TEMPLATE = {
template: `
<el-dialog title="批量导入社团" :visible.sync="visible" width="920px" top="5vh" append-to-body
<el-dialog title="批量导入协会" :visible.sync="visible" width="920px" top="5vh" append-to-body
custom-class="club-register-import-dialog" :close-on-click-modal="false"
:close-on-press-escape="!loading" :show-close="!loading">
<el-alert title="导入后直接通过，无需审批" type="info" :closable="false" show-icon
description="已存在的社团名称或编码自动跳过，不覆盖原有数据。每行独立处理，失败行不影响其他社团。"></el-alert>
description="已存在的协会名称或编码自动跳过，不覆盖原有数据。每行独立处理，失败行不影响其他协会。"></el-alert>
<div class="club-register-import-grid">
<section class="club-register-import-panel">
<h4>1. 下载并填写模板</h4>
<el-button type="primary" plain size="small" icon="el-icon-download" @click="download" :disabled="loading">下载模板及参数说明</el-button>
<p><strong>必填：</strong>名称、类型编码、成立日期、会长和秘书长工号、至少3名发起人工号。</p>
<p><strong>人员：</strong>会长和秘书长各1人，副职选填。多人工号用逗号分隔，理事人员不能重复。</p>
<p><strong>选填：</strong>社团编码留空自动生成；联系人、会费、介绍、缩略图及附件等详见模板。</p>
<p class="club-register-import-muted">社团类型来自系统字典，模板内附当前类型对照表。</p>
<p><strong>选填：</strong>协会编码留空自动生成；联系人、会费、介绍、缩略图及附件等详见模板。</p>
<p class="club-register-import-muted">协会类型来自系统字典，模板内附当前类型对照表。</p>
</section>
<section class="club-register-import-panel">
<h4>2. 上传Excel文件</h4>
@@ -39,8 +39,8 @@ const CLUB_REGISTER_IMPORT_TEMPLATE = {
</el-radio-group>
<el-table :data="rows" border stripe size="small" max-height="280" empty-text="暂无此类记录">
<el-table-column prop="rowNumber" label="Excel行号" width="90"></el-table-column>
<el-table-column prop="clubName" label="社团名称" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubCode" label="社团编码" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubName" label="协会名称" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubCode" label="协会编码" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="结果" width="80" align="center">
<template slot-scope="{row}"><el-tag size="mini" :type="row.status === '成功' ? 'success' : row.status === '跳过' ? 'info' : 'danger'">{{ row.status }}</el-tag></template>
</el-table-column>
@@ -112,7 +112,7 @@ const CLUB_REGISTER_IMPORT_TEMPLATE = {
this.loading = false
this.files = []
this.$refs.upload.clearFiles()
this.$message.error("导入请求失败，可重新选择文件重试，已存在的社团会自动跳过")
this.$message.error("导入请求失败，可重新选择文件重试，已存在的协会会自动跳过")
}
}
}
src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
+2 -2
View File
@@ -2,7 +2,7 @@
layout("/layouts/platform.html"){
#-->
<style>
/* 社团信息页面固定占满平台内容区，避免页面主体出现纵向滚动条。 */
/* 协会信息页面固定占满平台内容区，避免页面主体出现纵向滚动条。 */
#app .club-manage-layout {
height: calc(100vh - 82px);
min-height: 0;
@@ -251,7 +251,7 @@ layout("/layouts/platform.html"){
this.currentTreeData = data
this.currentTreeNode = node
this.$nextTick(() => {
// 一级节点展示社团总览，只有具体社团节点才需要刷新会员列表。
// 一级节点展示协会总览，只有具体协会节点才需要刷新会员列表。
if (node.level === 2 && this.$refs.clubInfo) {
this.$refs.clubInfo.pageData()
}
src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js
+8 -8
View File
@@ -3,11 +3,11 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
<div class="club-manage-panel">
<el-card class="club-manage-query-card" shadow="never">
<search @search="doSearch">
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -20,22 +20,22 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
</search>
</el-card>
<el-card shadow="never" class="mt10 club-manage-list-card">
<table-tool label="社团列表">
<table-tool label="协会列表">
<template slot="content">
<el-button v-if="$auth.hasRole('SYSADMIN')" type="primary" size="small" icon="el-icon-upload2"
@click="openImport">批量导入社团</el-button>
<!-- 一级节点展示社团总览时，引导用户从左侧树选择社团查看详细信息。 -->
@click="openImport">批量导入协会</el-button>
<!-- 一级节点展示协会总览时，引导用户从左侧树选择协会查看详细信息。 -->
<span v-if="parentNode.currentTreeNode && parentNode.currentTreeNode.level === 1"
style="display: block; text-align: center; color: #f56c6c;">
温馨提醒：选择左侧树中的某个社团，可查询该社团的详细信息。
温馨提醒：选择左侧树中的某个协会，可查询该协会的详细信息。
</span>
</template>
</table-tool>
<el-table v-loading="tableLoading" :data="tableData" :height="tableHeight"
row-key="id" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="70"></el-table-column>
<el-table-column label="社团编码" sortable prop="clubCode"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable></el-table-column>
<el-table-column label="协会编码" sortable prop="clubCode"></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable></el-table-column>
<el-table-column label="会长" prop="clubLeader" show-overflow-tooltip></el-table-column>
<el-table-column label="秘书长" prop="clubSecretary" show-overflow-tooltip></el-table-column>
<el-table-column label="当前人数" show-overflow-tooltip prop="currentNum"></el-table-column>
src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html
+4 -4
View File
@@ -28,8 +28,8 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<el-select clearable filterable placeholder="请选择社团" @change="doSearch"
<search-item label="协会名称">
<el-select clearable filterable placeholder="请选择协会" @change="doSearch"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
width="55">
</el-table-column>
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="工号" prop="loginName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="姓名" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="所属单位" prop="unitName" sortable show-overflow-tooltip></el-table-column>
@@ -293,7 +293,7 @@ layout("/layouts/platform.html"){
}
},
created() {
// 下拉选项与缴费列表共用后端授权范围，不复用其他业务的社团权限口径。
// 下拉选项与缴费列表共用后端授权范围，不复用其他业务的协会权限口径。
this.$axios.post("/platform/club/pay/listClubs").then(resp => {
if (resp.code === 0) this.clubs = resp.data || []
})
src/main/resources/views/platform/zhgh/club/infoManage/refreshReport/index.html
+6 -6
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :height="tableHeight" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
@@ -73,8 +73,8 @@ layout("/layouts/platform.html"){
<template #edit>
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
<el-form-item label="社团名称" prop="clubId">
<el-select v-model="formData.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<el-form-item label="协会名称" prop="clubId">
<el-select v-model="formData.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -134,7 +134,7 @@ layout("/layouts/platform.html"){
<template slot="subTitle">
换届报告需要经<label style="font-weight: bold">原会长、秘书长</label>签字，并将签字后的PDF版（或JPG版）上传至智慧工会备案。
<br/>
经校工会审批后，社团方可在系统内进行人员身份信息变更。
经校工会审批后，协会方可在系统内进行人员身份信息变更。
</template>
</el-result>
<span slot="footer" class="dialog-footer">
src/main/resources/views/platform/zhgh/club/infoManage/refreshReport/info.js
+1 -1
View File
@@ -6,7 +6,7 @@ const clubRefreshInfo = {
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="所属社团">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="所属协会">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.creatTime }}</el-descriptions-item>
<el-descriptions-item label="上一次换届报告" :span="3">
src/main/resources/views/platform/zhgh/club/infoManage/ruleUpdate/index.html
+6 -6
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :height="tableHeight" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
@@ -72,12 +72,12 @@ layout("/layouts/platform.html"){
</template>
<template #edit>
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
<el-form-item label="社团名称" prop="clubId">
<el-select v-model="formData.clubId" placeholder="请选择社团" filterable clearable style="width: 100%">
<el-form-item label="协会名称" prop="clubId">
<el-select v-model="formData.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="社团章程" prop="files">
<el-form-item label="协会章程" prop="files">
<file-upload
:value.sync="formData.files"
:upload_number="1"
src/main/resources/views/platform/zhgh/club/infoManage/ruleUpdate/info.js
+3 -3
View File
@@ -6,14 +6,14 @@ const clubRuleInfo = {
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="所属社团">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="所属协会">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="申请人">{{ viewData.userName }}</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ viewData.creatTime }}</el-descriptions-item>
<el-descriptions-item label="上一次社团章程" :span="3">
<el-descriptions-item label="上一次协会章程" :span="3">
<file-preview v-if="viewData.lastFiles && viewData.lastFiles.length > 0" :files="viewData.lastFiles" complete_result></file-preview>
<span v-else>暂无附件</span>
</el-descriptions-item>
<el-descriptions-item label="社团章程" :span="3">
<el-descriptions-item label="协会章程" :span="3">
<file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
<span v-else>暂无附件</span>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditReport/index.html
+3 -3
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :height="tableHeight" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditRule/index.html
+3 -3
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :height="tableHeight" ref="tableRef">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+9 -9
View File
@@ -14,12 +14,12 @@ layout("/layouts/platform.html"){
<div slot="header" class="club-apply-back-bar">
<el-button type="text" icon="el-icon-back" @click="backToClubList">返回</el-button>
</div>
<snaker-start class="club-apply-title" label="文体社团会员申请" define_key="XHRH"></snaker-start>
<snaker-start class="club-apply-title" label="文体协会会员申请" define_key="XHRH"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
<el-descriptions border class="descriptions-form">
<el-descriptions-item label="社团" :span="3">
<el-form-item prop="clubId" label="社团">
<el-select v-model="formData.clubId" filterable @change="checkApplyClub" placeholder="请选择社团">
<el-descriptions-item label="协会" :span="3">
<el-form-item prop="clubId" label="协会">
<el-select v-model="formData.clubId" filterable @change="checkApplyClub" placeholder="请选择协会">
<el-option v-for="item in clubOptions" :label="item.clubName" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
@@ -85,12 +85,12 @@ layout("/layouts/platform.html"){
<el-input :value="formData.academicDegree" readonly placeholder="读取信息中心数据"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="同时参加其他社团情况" :span="3">
<el-form-item prop="sameTimeJoinOtherClubSituation" label="同时参加其他社团情况">
<el-descriptions-item label="同时参加其他协会情况" :span="3">
<el-form-item prop="sameTimeJoinOtherClubSituation" label="同时参加其他协会情况">
<el-input
maxlength="500"
v-model="formData.sameTimeJoinOtherClubSituation"
placeholder="请填写同时参加其他社团情况"
placeholder="请填写同时参加其他协会情况"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6}"
></el-input>
@@ -124,7 +124,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="本人承诺" :span="3">
<el-checkbox v-model="isAgree">注：本人已仔细阅读并愿意遵守所参加本校教职工文体社团的章程和规定，自愿加入所报名社团。</el-checkbox>
<el-checkbox v-model="isAgree">注：本人已仔细阅读并愿意遵守所参加本校教职工文体协会的章程和规定，自愿加入所报名协会。</el-checkbox>
</el-descriptions-item>
</el-descriptions>
</el-form>
@@ -237,7 +237,7 @@ layout("/layouts/platform.html"){
this.$axios.post("/platform/club/common/listClub").then((res) => {
if (res.code === 0) {
this.clubOptions = res.data
// 从卡片进入新申请时预选社团，编辑已有申请仍使用原记录。
// 从卡片进入新申请时预选协会，编辑已有申请仍使用原记录。
const clubId = GetQueryString("clubId")
if (!this.bizId && clubId) {
const club = this.clubOptions.find(item => item.id === clubId)
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+1 -1
View File
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
<el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unitName" label="单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="分工会" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubName" label="申请社团" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubName" label="申请协会" show-overflow-tooltip></el-table-column>
<el-table-column prop="mode" label="申请模式">
<template slot-scope="scope">
<el-tag size="mini" v-if="scope.row.mode === 1" type="success">加入</el-tag>
src/main/resources/views/platform/zhgh/club/join/list/index.html
+17 -17
View File
@@ -45,11 +45,11 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -59,16 +59,16 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never">
<table-tool label="社团列表">
<table-tool label="协会列表">
<el-radio-group v-model="hasJoin" @change="joinChange" size="small">
<el-radio-button :label="false">{{'可加入社团' + noJoinCount + '（入会）'}}</el-radio-button>
<el-radio-button :label="true">{{'已加入社团' + hasJoinCount + '（退会）'}}</el-radio-button>
<el-radio-button :label="false">{{'可加入协会' + noJoinCount + '（入会）'}}</el-radio-button>
<el-radio-button :label="true">{{'已加入协会' + hasJoinCount + '（退会）'}}</el-radio-button>
</el-radio-group>
</table-tool>
<div class="club-card-sort">
<el-select v-model="clubSort" size="small" aria-label="社团排序" @change="changeClubSort">
<el-option label="社团编码升序" value="clubCode:ascending"></el-option>
<el-option label="社团编码降序" value="clubCode:descending"></el-option>
<el-select v-model="clubSort" size="small" aria-label="协会排序" @change="changeClubSort">
<el-option label="协会编码升序" value="clubCode:ascending"></el-option>
<el-option label="协会编码降序" value="clubCode:descending"></el-option>
<el-option label="当前人数升序" value="currentPeopleNum:ascending"></el-option>
<el-option label="当前人数降序" value="currentPeopleNum:descending"></el-option>
</el-select>
@@ -87,7 +87,7 @@ layout("/layouts/platform.html"){
<p class="club-card-meta">成立时间：{{row.foundTime || '--'}}</p>
<div class="club-card-tags">
<span class="club-card-tag"><span class="club-card-tag-label">会长</span>{{row.clubLeader || '--'}}</span>
<span class="club-card-tag"><span class="club-card-tag-label">社团类型</span>{{formatClubType(row.clubType)}}</span>
<span class="club-card-tag"><span class="club-card-tag-label">协会类型</span>{{formatClubType(row.clubType)}}</span>
<span class="club-card-tag"><span class="club-card-tag-label">会费标准</span>{{row.due == null || row.due === '' ? '--' : row.due + ' 元/年'}}</span>
</div>
</div>
@@ -99,14 +99,14 @@ layout("/layouts/platform.html"){
</div>
</article>
</div>
<el-empty v-if="!tableLoading && !tableData.length" description="暂无社团"></el-empty>
<el-empty v-if="!tableLoading && !tableData.length" description="暂无协会"></el-empty>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
<template #view>
<el-descriptions class="margin-top" title="" :column="2" border>
<el-descriptions-item label="社团图片">
<el-descriptions-item label="协会图片">
<div class="club-detail-cover">
<el-image v-if="viewData.thumbnail" :src="viewData.thumbnail" :alt="viewData.clubName + '缩略图'" fit="contain" :preview-src-list="[viewData.thumbnail]">
<div slot="error" class="club-image-empty">暂无图片</div>
@@ -115,12 +115,12 @@ layout("/layouts/platform.html"){
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">社团名称</template>
<template slot="label">协会名称</template>
<div v-html="viewData.clubName"></div>
</el-descriptions-item>
<el-descriptions-item label="成立时间">{{viewData.foundTime}}</el-descriptions-item>
<el-descriptions-item label="社团编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="社团类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="协会编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="协会类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="发起人">{{viewData.sponsorName}}</el-descriptions-item>
<el-descriptions-item label="报名联系人">{{viewData.concatPersonName}}</el-descriptions-item>
<el-descriptions-item label="联系人电话">{{viewData.concatPersonMobile}}</el-descriptions-item>
@@ -134,15 +134,15 @@ layout("/layouts/platform.html"){
{{viewData.currentPeopleNum}}
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">社团介绍</template>
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.introduce"></div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">社团宗旨</template>
<template slot="label">协会宗旨</template>
<div class="text-left" v-html="viewData.purpose"></div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">社团章程</template>
<template slot="label">协会章程</template>
<file-preview :files="viewData.rulesFile" complete_result></file-preview>
</el-descriptions-item>
<el-descriptions-item span="2">
src/main/resources/views/platform/zhgh/club/join/mine/index.html
+1 -1
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="clubName" label="社团名称"></el-table-column>
<el-table-column prop="clubName" label="协会名称"></el-table-column>
<el-table-column prop="mode" label="申请模式">
<template v-slot="scope">
<el-tag size="mini" v-if="scope.row.mode === 1" type="success">加入</el-tag>
src/main/resources/views/platform/zhgh/club/join/mineclub/index.html
+14 -14
View File
@@ -18,11 +18,11 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -32,11 +32,11 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="社团列表"></table-tool>
<table-tool label="协会列表"></table-tool>
<el-table :data="tableData" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团编码" sortable prop="clubCode"></el-table-column>
<el-table-column label="社团名称" prop="clubName" show-overflow-tooltip
<el-table-column label="协会编码" sortable prop="clubCode"></el-table-column>
<el-table-column label="协会名称" prop="clubName" show-overflow-tooltip
width="200px"></el-table-column>
<el-table-column label="成立时间" prop="foundTime"></el-table-column>
<el-table-column label="会长" prop="clubLeader" show-overflow-tooltip></el-table-column>
@@ -56,31 +56,31 @@ layout("/layouts/platform.html"){
<template #view>
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane label="社团基础信息" name="1">
<el-tab-pane label="协会基础信息" name="1">
<el-descriptions style="margin-top: 20px;" class="margin-top" title="" :column="2" border>
<el-descriptions-item label="社团缩略图" :span="2">
<el-descriptions-item label="协会缩略图" :span="2">
<el-image v-if="viewData.thumbnail" :src="viewData.thumbnail" :preview-src-list="[viewData.thumbnail]" fit="contain" style="width: 180px; height: 120px">
<span slot="error">暂无图片</span>
</el-image>
<span v-else>暂无图片</span>
</el-descriptions-item>
<el-descriptions-item label="社团名称">{{viewData.clubName}}</el-descriptions-item>
<el-descriptions-item label="协会名称">{{viewData.clubName}}</el-descriptions-item>
<el-descriptions-item label="成立时间">{{viewData.foundTime}}</el-descriptions-item>
<el-descriptions-item label="社团编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="社团类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="协会编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="协会类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="发起人">{{viewData.sponsorName}}</el-descriptions-item>
<el-descriptions-item label="会费标准">{{viewData.due}}</el-descriptions-item>
<el-descriptions-item label="当前人数">{{viewData.currentPeopleNum}}</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">社团介绍</template>
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.introduce"></div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">社团宗旨</template>
<template slot="label">协会宗旨</template>
<div class="text-left" v-html="viewData.purpose"></div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">社团章程</template>
<template slot="label">协会章程</template>
<file-preview :files="viewData.rulesFile" complete_result></file-preview>
</el-descriptions-item>
<el-descriptions-item span="2">
@@ -89,7 +89,7 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="社团人员信息" name="2">
<el-tab-pane label="协会人员信息" name="2">
<el-table :data="clubUsers" row-key="id" style="width: 100%;margin-top: 20px">
<el-table-column :index="indexMethod" label="序号" type="index" width="70"></el-table-column>
<el-table-column label="工号" prop="loginName" show-overflow-tooltip sortable></el-table-column>
src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html
+1 -1
View File
@@ -46,7 +46,7 @@ layout("/layouts/platform.html"){
<el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unitName" label="单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="分工会" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubName" label="申请社团" show-overflow-tooltip></el-table-column>
<el-table-column prop="clubName" label="申请协会" show-overflow-tooltip></el-table-column>
<el-table-column prop="mode" label="申请模式">
<template slot-scope="scope">
<el-tag size="mini" v-if="scope.row.mode === 1" type="success">加入</el-tag>
src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterForm.js
+13 -13
View File
@@ -4,22 +4,22 @@ const CLUB_FORM_TEMPLATE = {
<el-form :model="formData" ref="form" :rules="formRules" label-width="150px" style="padding: 0 30px">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="社团名称" prop="clubName">
<el-input maxlength="100" placeholder="请输入社团名称" v-model="formData.clubName" type="text"></el-input>
<el-form-item label="协会名称" prop="clubName">
<el-input maxlength="100" placeholder="请输入协会名称" v-model="formData.clubName" type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="社团编码" prop="clubCode" required>
<el-input v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" placeholder="请输入社团编码" v-model="formData.clubCode"></el-input>
<el-input v-else placeholder="请输入社团编码" v-model="formData.clubCode" disabled></el-input>
<el-form-item label="协会编码" prop="clubCode" required>
<el-input v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" placeholder="请输入协会编码" v-model="formData.clubCode"></el-input>
<el-input v-else placeholder="请输入协会编码" v-model="formData.clubCode" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="社团类型" prop="clubType">
<dict-select placeholder="请选择社团类型" v-model="formData.clubType" code="CLUB_REGISTER_TYPE" style="width: 100%"></dict-select>
<el-form-item label="协会类型" prop="clubType">
<dict-select placeholder="请选择协会类型" v-model="formData.clubType" code="CLUB_REGISTER_TYPE" style="width: 100%"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -79,7 +79,7 @@ const CLUB_FORM_TEMPLATE = {
</el-col>
</el-row>
<el-form-item label="社团缩略图" prop="thumbnail">
<el-form-item label="协会缩略图" prop="thumbnail">
<file-upload
:value.sync="formData.thumbnail"
:upload_number="1"
@@ -93,7 +93,7 @@ const CLUB_FORM_TEMPLATE = {
<div style="color: #909399; font-size: 12px">支持 JPG、PNG、GIF 图片，大小不超过 2MB</div>
</el-form-item>
<el-form-item label="社团介绍及宗旨" prop="introduce">
<el-form-item label="协会介绍及宗旨" prop="introduce">
<text-editor v-model="formData.introduce"></text-editor>
</el-form-item>
@@ -174,10 +174,10 @@ const CLUB_FORM_TEMPLATE = {
thumbnail: ""
},
formRules: {
clubName: [{ required: true, message: "请填写社团名称", trigger: ["blur", "change"] }],
clubCode: [{ required: false, message: "请填写社团编码", trigger: ["blur", "change"] }],
clubType: [{ required: true, message: "请选择社团类型", trigger: ["blur", "change"] }],
//concatPerson: [{ required: true, message: "请选择社团联系人", trigger: ["blur", "change"] }],
clubName: [{ required: true, message: "请填写协会名称", trigger: ["blur", "change"] }],
clubCode: [{ required: false, message: "请填写协会编码", trigger: ["blur", "change"] }],
clubType: [{ required: true, message: "请选择协会类型", trigger: ["blur", "change"] }],
//concatPerson: [{ required: true, message: "请选择协会联系人", trigger: ["blur", "change"] }],
foundTime: [{ required: true, message: "请选择成立时间", trigger: ["blur", "change"] }]
}
}
src/main/resources/views/platform/zhgh/club/register/apply/index.html
+4 -4
View File
@@ -14,13 +14,13 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<custom-card>
<snaker-start slot="header" label="注册社团" define_key="XHZC"></snaker-start>
<snaker-start slot="header" label="注册协会" define_key="XHZC"></snaker-start>
<!--步骤条-->
<el-steps :active="activeName" finish-status="success" simple>
<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">
src/main/resources/views/platform/zhgh/club/register/clubConfirm/index.html
+4 -4
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :size="tableSize">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="createTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.createTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/register/mine/index.html
+7 -7
View File
@@ -16,11 +16,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -29,14 +29,14 @@ layout("/layouts/platform.html"){
</search>
</el-card>
<el-card class="mt10" shadow="never">
<table-tool label="社团列表">
<!-- <el-button @click="openAdd" size="medium" type="primary">社团注册</el-button>-->
<table-tool label="协会列表">
<!-- <el-button @click="openAdd" size="medium" type="primary">协会注册</el-button>-->
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" :default-sort="{ prop: 'clubCode', order: 'ascending' }">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团编码" prop="clubCode" sortable></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="clubType" sortable show-overflow-tooltip>
<el-table-column label="协会编码" prop="clubCode" sortable></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="clubType" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<dict-tag :options="dict.type.CLUB_REGISTER_TYPE" :value="row.clubType"></dict-tag>
</template>
src/main/resources/views/platform/zhgh/club/register/officeAudit/index.html
+4 -4
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :size="tableSize">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="createTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.createTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/register/schoolLeaderAudit/index.html
+4 -4
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :size="tableSize">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="createTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.createTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/register/schoolReply/index.html
+4 -4
View File
@@ -20,11 +20,11 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="社团名称：">
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入社团名称"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" :size="tableSize">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="createTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.createTime).format('YYYY-MM-DD') }}</span>
src/main/resources/views/platform/zhgh/club/statistics/index.html
+6 -6
View File
@@ -14,8 +14,8 @@ layout("/layouts/platform.html"){
<el-option label="年审未通过" :value="false"></el-option>
</el-select>
</search-item>-->
<search-item label="社团名称：">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" clearable filterable>
<search-item label="协会名称：">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" clearable filterable>
<el-option v-for="item in clubList" :label="item.clubName" :value="item.id" :key="item.id"></el-option>
</el-select>
</search-item>
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="社团统计">
<table-tool label="协会统计">
<el-button @click="exportData" type="primary" size="small">导出全部统计数据</el-button>
<el-button @click="exportUserData(null)" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" type="primary" size="small">
导出全部人员明细
@@ -51,9 +51,9 @@ layout("/layouts/platform.html"){
</table-tool>
<el-table :data="tableData" row-key="id">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="社团名称" prop="clubName" show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="clubCode"></el-table-column>
<el-table-column label="社团总人数" prop="total"></el-table-column>
<el-table-column label="协会名称" prop="clubName" show-overflow-tooltip></el-table-column>
<el-table-column label="协会编码" prop="clubCode"></el-table-column>
<el-table-column label="协会总人数" prop="total"></el-table-column>
<el-table-column label="在职人数" prop="work"></el-table-column>
<el-table-column label="退休人数" prop="retire"></el-table-column>
<el-table-column label="男" prop="man"></el-table-column>
src/main/resources/views/platform/zhgh/club/statistics/member.html
+4 -4
View File
@@ -4,8 +4,8 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<el-card shadow="never">
<search :is-search-button="false" @search="doSearch">
<search-item label="社团名称：">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" clearable filterable>
<search-item label="协会名称：">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" clearable filterable>
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -44,10 +44,10 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="成员统计">
<span>成员记录数：{{ pageForm.totalCount }}（同一人员加入多个社团分别统计）</span>
<span>成员记录数：{{ pageForm.totalCount }}（同一人员加入多个协会分别统计）</span>
</table-tool>
<el-table :data="tableData">
<el-table-column label="社团名称" prop="clubName" show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" show-overflow-tooltip></el-table-column>
<el-table-column label="姓名" prop="userName" show-overflow-tooltip></el-table-column>
<el-table-column label="工号" prop="loginName" show-overflow-tooltip></el-table-column>
<el-table-column label="性别" prop="sex" show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/dayofficework/article/analysis/index.html
+3 -3
View File
@@ -146,8 +146,8 @@ layout("/layouts/platform.html"){
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="社团">
<el-select :clearable="true" v-model="pageForm.clubId" placeholder="请选择社团">
<el-form-item label="协会">
<el-select :clearable="true" v-model="pageForm.clubId" placeholder="请选择协会">
<el-option v-for="item in clubOptions" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -179,7 +179,7 @@ layout("/layouts/platform.html"){
</div>
<div class="chart-card">
<div class="chart-header">
<span class="chart-title">社团投稿分布</span>
<span class="chart-title">协会投稿分布</span>
</div>
<div id="clubPieChart" class="chart"></div>
</div>
src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html
+2 -2
View File
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
<el-table-column prop="userName" label="投稿人姓名"></el-table-column>
<el-table-column prop="unitName" label="投稿人单位"></el-table-column>
<el-table-column prop="unionName" label="投稿人工会"></el-table-column>
<el-table-column prop="clubName" label="投稿人社团"></el-table-column>
<el-table-column prop="clubName" label="投稿人协会"></el-table-column>
<el-table-column prop="origin" label="投稿来源">
<template slot-scope="{row}">{{dict.type.ARTICLE_ORIGIN.find(v=>v.code===row.origin)?.label}}
</template>
@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
v-if="currentRow.origin === 'ARTICLE_ORIGIN_UNION'">退回到分工会
</el-button>
<el-button type="danger" @click="doApproval('BACK_TO_CLUB')"
v-if="currentRow.origin === 'ARTICLE_ORIGIN_CLUB'">退回到社团
v-if="currentRow.origin === 'ARTICLE_ORIGIN_CLUB'">退回到协会
</el-button>
<el-button plain @click="$refs.guava.index()">取消</el-button>
</el-row>
src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html
+3 -3
View File
@@ -22,8 +22,8 @@ layout("/layouts/platform.html"){
<el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属社团：">
<el-select v-model="pageForm.clubId" placeholder="请选择所属社团" filterable clearable style="width: 100%">
<search-item label="所属协会：">
<el-select v-model="pageForm.clubId" placeholder="请选择所属协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubOptions" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
</search-item>
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
<el-table-column prop="userName" label="投稿人姓名"></el-table-column>
<el-table-column prop="unitName" label="投稿人单位"></el-table-column>
<el-table-column prop="unionName" label="投稿人工会"></el-table-column>
<el-table-column prop="clubName" label="投稿人社团"></el-table-column>
<el-table-column prop="clubName" label="投稿人协会"></el-table-column>
<el-table-column prop="submitTime" label="投稿时间"></el-table-column>
<el-table-column prop="origin" label="投稿来源">
<template slot-scope="{row}">{{dict.type.ARTICLE_ORIGIN.find(v=>v.code===row.origin)?.label}}</template>
src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html
+1 -1
View File
@@ -39,7 +39,7 @@ layout("/layouts/platform.html"){
<el-input v-model="formData.mobile2" placeholder="请输入稿件修改联系人方式"></el-input>
</el-form-item>
<el-form-item prop="clubId" label="投稿人社团" v-if="formData.origin === 'ARTICLE_ORIGIN_CLUB'">
<el-form-item prop="clubId" label="投稿人协会" v-if="formData.origin === 'ARTICLE_ORIGIN_CLUB'">
<el-select v-model="formData.clubId" placeholder="请选择" style="width: 100%">
<el-option v-for="item in permission?.clubs" :key="item.id" :label="item.clubName"
:value="item.id"></el-option>
src/main/resources/views/platform/zhgh/dayofficework/careData/staff/index.html
+1 -1
View File
@@ -348,7 +348,7 @@ layout("/layouts/platform.html"){
icon: 'el-icon-basketball'
},
sthd: {
name: '社团活动',
name: '协会活动',
color: "#6DC8EC",
icon: 'el-icon-basketball'
},
src/main/resources/views/platform/zhgh/dayofficework/careData/unionCare/index.html
+6 -6
View File
@@ -112,7 +112,7 @@ layout("/layouts/platform.html"){
<div class="cut-off-line"></div>
</el-col>
<el-col :span="8" 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>
@@ -174,7 +174,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>
@@ -198,7 +198,7 @@ layout("/layouts/platform.html"){
all_club_loading: false,
clubTip:'社团活动数',
clubTip:'协会活动数',
allClubYear: moment().format('YYYY'),
isClubJf:true,
@@ -303,10 +303,10 @@ layout("/layouts/platform.html"){
}
})
},
//社团报销费用及活动情况
//协会报销费用及活动情况
async doClubSwitch(){
this.isClubJf = !this.isClubJf
this.clubTip = this.isClubJf ? '社团活动数' : '社团经费详情'
this.clubTip = this.isClubJf ? '协会活动数' : '协会经费详情'
await this.allClubActivityAndJf();
},
async allClubActivityAndJf(){
@@ -354,7 +354,7 @@ layout("/layouts/platform.html"){
"yAxis": {},
meta: {
clubName: {
alias: '社团',
alias: '协会',
},
money: {
alias: this.isClubJf?'金额':'活动数',
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/allocationEdit/index.html
+2 -2
View File
@@ -35,10 +35,10 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="社团"
<search-item label="协会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
<el-select clearable
placeholder="请选择社团"
placeholder="请选择协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
+2 -2
View File
@@ -35,10 +35,10 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="所属社团"
<search-item label="所属协会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
<el-select clearable
placeholder="请选择社团"
placeholder="请选择协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option
:key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/queryStatistics/index.html
+1 -1
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
} else if (val === "ACTIVITY_BUDGET_TYPE_THREE") {
this.tableColumns = [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'clubName', label: '协会名称'},
{prop: 'totalBudgetMoney', label: '预算金额'},
]
}
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
+1 -1
View File
@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="所属社团"
<search-item label="所属协会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
<el-select v-model="pageForm.clubId" filterable
clearable
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolPrincipal/index.html
+1 -1
View File
@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="所属社团"
<search-item label="所属协会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_THREE'">
<el-select v-model="pageForm.clubId" filterable
clearable
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/backHistory/index.html
+3 -3
View File
@@ -24,8 +24,8 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号"
clearable></el-input>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -101,7 +101,7 @@ layout("/layouts/platform.html"){
{prop: 'userState', label: '在职状态'},
{prop: 'isGiveMoney', label: '是否拨付'},
{prop: 'payed', label: '是否缴费'},
{prop: 'clubName', label: '所在社团'},
{prop: 'clubName', label: '所在协会'},
{prop: 'roleName', label: '身份'},
],
}
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/manage/index.html
+4 -4
View File
@@ -20,8 +20,8 @@ layout("/layouts/platform.html"){
value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="所属社团">
<el-select clearable filterable placeholder="所属社团"
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
@@ -106,8 +106,8 @@ layout("/layouts/platform.html"){
return {
tableColumns: [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'historyUserNum', label: '上年度社团人数'},
{prop: 'clubName', label: '协会名称'},
{prop: 'historyUserNum', label: '上年度协会人数'},
{prop: 'historyGiveMoneyNum', label: '上年度拨付人数'},
{prop: 'historyNotGiveMoneyNum', label: '上年度未拨付人数'},
{prop: 'totalQuota', label: '预算费用'},
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/query/clubHistoryBackUser.js
+1 -1
View File
@@ -59,7 +59,7 @@ const clubHistoryBackUser = {
{prop: 'userState', label: '在职状态'},
{prop: 'isGiveMoney', label: '是否拨付'},
{prop: 'payed', label: '是否缴费'},
{prop: 'clubName', label: '所在社团'},
{prop: 'clubName', label: '所在协会'},
{prop: 'roleName', label: '身份'},
],
pageDataUrl:"/platform/outlay/outlayManage/query/backUserPageData"

Some files were not shown because too many files have changed in this diff Show More