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

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-03-31 16:55:35 +08:00
parent dc71dc22d8
commit 6adf949e3e
184 changed files with 2333 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/club/common/clubInfoComponent.js
+5 -5
View File
@@ -4,23 +4,23 @@ 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>
</div>
<el-descriptions :column="3" border class="table_fixed">
<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="报名联系人">
@@ -39,7 +39,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
+2 -2
View File
@@ -18,7 +18,7 @@ const clubUserJoin = {
{{viewData.sex}}
</el-descriptions-item>
<el-descriptions-item label="出生年月">
{{viewData.birthday}}
{{$moment(viewData.birthday).format('YYYY-MM-DD')}}
</el-descriptions-item>
<el-descriptions-item label="联系电话">
{{viewData.mobile}}
@@ -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
@@ -16,8 +16,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>
@@ -33,9 +33,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>
@@ -174,7 +174,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
@@ -17,8 +17,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>
@@ -31,9 +31,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>
@@ -137,7 +137,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
@@ -16,8 +16,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>
@@ -33,9 +33,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>
@@ -174,7 +174,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
@@ -16,8 +16,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>
@@ -33,9 +33,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>
@@ -174,7 +174,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
+16 -12
View File
@@ -98,12 +98,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"
@@ -633,7 +633,7 @@ layout("/layouts/platform.html"){
taskId: GetQueryString("taskId"),
step: 0, // 当前步骤（0-基础信息，1-财务收支，2-成员名单）
isRegistered: false, // 是否已登记
currentClubId: "", // 当前选中协会ID
currentClubId: "", // 当前选中社团ID
// 金额数据
dueIncome: 0, // 会费收入
@@ -641,9 +641,9 @@ layout("/layouts/platform.html"){
lastYearSurplus: 0, // 去年结余
// 下拉选项&列表数据
clubOptions: [], // 协会选项
clubOptions: [], // 社团选项
memberList: [], // 成员名单
lastClubData: {}, // 上年度协会数据
lastClubData: {}, // 上年度社团数据
// 核心表单数据
formData: {
@@ -700,12 +700,16 @@ layout("/layouts/platform.html"){
}
},
async created() {
this.$alert('请在填报年审材料前，于' + new Date().getFullYear() + '年12月31日前完成以下操作：1.在【入会申请】中审核所有待处理的入会及退会申请；2.在【社团管理】中将已退会人员进行退会处理。', '温馨提示', {
confirmButtonText: '确定',
type: 'warning',
})
try {
if (this.id) {
// 编辑模式：获取详情数据
await this.fetchEditData(this.id);
} else {
// 新增模式：初始化协会列表
// 新增模式：初始化社团列表
await this.fetchClubList();
}
} catch (error) {
@@ -759,7 +763,7 @@ layout("/layouts/platform.html"){
},
/************************ 数据请求方法 ************************/
// 获取协会列表
// 获取社团列表
async fetchClubList() {
const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole");
this.clubOptions = resp.data || [];
@@ -786,7 +790,7 @@ layout("/layouts/platform.html"){
// 检查是否已登记
await this.checkIsRegistered();
},
// 获取协会成员数量
// 获取社团成员数量
async fetchClubUserNum(clubId) {
const resp = await this.$axios.post("/platform/club/examine/apply/getClubUserNum", {
clubId,
@@ -827,7 +831,7 @@ layout("/layouts/platform.html"){
});
this.lastYearSurplus = resp.data || 0;
},
// 获取上年度协会数据
// 获取上年度社团数据
async fetchLastClubData() {
const res = await this.$axios.post(loc() + '/getLastData', {
clubId: this.formData.clubId,
@@ -986,11 +990,11 @@ layout("/layouts/platform.html"){
handleYearChange: function() {
this.checkIsRegistered();
},
// 协会变化处理
// 社团变化处理
async handleClubChange(val) {
if (!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
+4 -4
View File
@@ -8,7 +8,7 @@ const EXAMINE_INFO_COMPONENT = {
<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 @@ const EXAMINE_INFO_COMPONENT = {
<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>
@@ -73,8 +73,8 @@ const EXAMINE_INFO_COMPONENT = {
</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>
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
@@ -17,11 +17,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"
@@ -39,7 +39,7 @@ 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="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
+17 -13
View File
@@ -17,11 +17,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"
@@ -39,7 +39,7 @@ 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="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>
@@ -71,8 +71,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>
@@ -100,19 +100,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">
<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">协会会员</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">社团会员</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
@@ -235,6 +235,8 @@ layout("/layouts/platform.html"){
this.pageData()
this.$message.success(res.msg)
this.$refs.guava.index()
} else {
this.$message.error(res.msg)
}
})
})
@@ -257,6 +259,8 @@ layout("/layouts/platform.html"){
this.pageData()
this.$message.success(res.msg)
this.$refs.guava.index()
} else {
this.$message.error(res.msg)
}
})
})
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/manage/clubInfoManage.js
+8 -8
View File
@@ -25,7 +25,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
</template>
<el-radio-group @change="doSearch" style="margin-left: 10px" v-model="pageForm.radioType" size="small">
<el-radio-button label="3">全部</el-radio-button>
<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-group>
</table-tool>
@@ -127,13 +127,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">协会会长</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_REIMBURSEMENT_MANAGER">协会报销负责人</el-checkbox>
<el-checkbox label="CLUB_MEMBER">协会会员</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_REIMBURSEMENT_MANAGER">社团报销负责人</el-checkbox>
<el-checkbox label="CLUB_MEMBER">社团会员</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
+2 -2
View File
@@ -119,11 +119,11 @@ layout("/layouts/platform.html"){
if (clubId !== "") {
const resp = await this.$axios.post("/platform/club/register/clubRegisterApply/info", { id: clubId })
if (resp.code === 0) {
// await this.userRemoteMethod(resp.data.concatPerson)
await this.userRemoteMethod(resp.data.concatPerson)
// let formData = resp.data
// formData.foundTime = ""
// this.$refs.clubFormRef.formData = formData
// await this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
this.$refs.clubFormRef.formData = resp.data
}
}
src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js
+5 -5
View File
@@ -3,11 +3,11 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
<div>
<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"
@@ -20,15 +20,15 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="协会列表">
<table-tool label="社团列表">
<template>
</template>
</table-tool>
<el-table :data="tableData" row-key="id">
<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
+3 -3
View File
@@ -26,8 +26,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>
@@ -67,7 +67,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>
src/main/resources/views/platform/zhgh/club/infoManage/refreshReport/index.html
+5 -5
View File
@@ -17,11 +17,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"
@@ -39,7 +39,7 @@ 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="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>
@@ -69,8 +69,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>
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
@@ -17,11 +17,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"
@@ -39,7 +39,7 @@ 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="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>
@@ -68,12 +68,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
@@ -17,11 +17,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"
@@ -39,7 +39,7 @@ 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="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
@@ -17,11 +17,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"
@@ -39,7 +39,7 @@ 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="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
+8 -8
View File
@@ -4,12 +4,12 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<custom-card>
<snaker-start slot="header" label="文体协会会员申请" define_key="XHRH"></snaker-start>
<snaker-start slot="header" 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>
@@ -75,12 +75,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>
@@ -114,7 +114,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>
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+2 -2
View File
@@ -40,7 +40,7 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never">
<table-tool>
<table-tool label="温馨提醒：如您收到短信，并且下方没有数据，可能是其他理事成员已审核，审核信息请切换已审核查看">
<el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
@@ -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" type="success">加入</el-tag>
src/main/resources/views/platform/zhgh/club/join/list/index.html
+13 -13
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,16 +32,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>
<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 width="200px"></el-table-column>
<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>
<el-table-column label="秘书长" prop="clubSecretary" show-overflow-tooltip></el-table-column>
@@ -61,12 +61,12 @@ layout("/layouts/platform.html"){
<template #view>
<el-descriptions class="margin-top" title="" :column="2" border>
<el-descriptions-item span="2">
<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>
@@ -80,15 +80,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
+2 -2
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" type="success">加入</el-tag>
@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间"></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/join/mineclub/index.html
+13 -13
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,25 +56,25 @@ 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="协会名称">{{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">
@@ -83,7 +83,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" type="success">加入</el-tag>
src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterForm.js
+12 -12
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="introduce">
<el-form-item label="社团介绍及宗旨" prop="introduce">
<text-editor v-model="formData.introduce"></text-editor>
</el-form-item>
@@ -159,10 +159,10 @@ const CLUB_FORM_TEMPLATE = {
clubType: ""
},
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"] }],
establishReport: [{ required: true, message: "请上传申请成立报告", trigger: ["blur", "change"] }],
rulesFile: [{ required: true, message: "请上传章程草案", trigger: ["blur", "change"] }],
src/main/resources/views/platform/zhgh/club/register/apply/index.html
+32 -30
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">
@@ -108,33 +108,35 @@ layout("/layouts/platform.html"){
async doHandle(type) {
let formData = {}
try {
let hz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_PRESIDENT)
if (hz.length !== 1) {
this.$message.warning({ title: "警告", message: "会长需要1人" })
return
}
let msz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_SECRETARY)
if (msz.length !== 1) {
this.$message.warning({ title: "警告", message: "秘书长需要1人" })
return
}
formData.sponsor = this.$refs.clubSponsorRef.sponsorData
.filter((o) => o.userId !== "" && o.userId !== undefined)
.map((o) => o.userId)
if (['onFinishTask', 'onSubmit'].includes(type) && formData.sponsor && formData.sponsor.length < 3) {
this.$message.warning({ title: "警告", message: "发起人要求不少于3人" })
return
}
let manageValid = false
for (const item of this.$refs.clubManagerRef.managePerson) {
if (!item.userId) {
manageValid = true
break
if("onSave" !== type) {
let hz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_PRESIDENT)
if (hz.length !== 1) {
this.$message.warning({ title: "警告", message: "会长需要1人" })
return
}
let msz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_SECRETARY)
if (msz.length !== 1) {
this.$message.warning({ title: "警告", message: "秘书长需要1人" })
return
}
formData.sponsor = this.$refs.clubSponsorRef.sponsorData
.filter((o) => o.userId !== "" && o.userId !== undefined)
.map((o) => o.userId)
if (['onFinishTask', 'onSubmit'].includes(type) && formData.sponsor && formData.sponsor.length < 3) {
this.$message.warning({ title: "警告", message: "发起人要求不少于3人" })
return
}
let manageValid = false
for (const item of this.$refs.clubManagerRef.managePerson) {
if (!item.userId) {
manageValid = true
break
}
}
if (['onFinishTask', 'onSubmit'].includes(type) && (this.$refs.clubManagerRef.managePerson.length === 0 || manageValid)) {
this.$message.warning({ title: "警告", message: "请填写理事机构信息" })
return
}
}
if (['onFinishTask', 'onSubmit'].includes(type) && (this.$refs.clubManagerRef.managePerson.length === 0 || manageValid)) {
this.$message.warning({ title: "警告", message: "请填写理事机构信息" })
return
}
const cloneData = clone(this.$refs.clubFormRef.formData)
let array = []
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
+8 -8
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">
<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>
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
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>
@@ -32,7 +32,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">
导出全部人员明细
@@ -43,9 +43,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>