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

协会

Browse Source
This commit is contained in:
Paidax
2024-12-19 08:51:46 +08:00
parent 3b4c3e1552
commit 3e4ed35a7c
96 changed files with 317 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/assets/platform/module/activity/activity.js
+2 -2
View File
@@ -27,7 +27,7 @@ window.activity = {
activityLevel: {
1: '校级',
2: '分工会',
3: '社团或协会'
3: '协会或协会'
},
combinationMethod: {
1: '单项报名人数',
@@ -67,4 +67,4 @@ window.activity = {
return false
},
},
}
}
src/main/resources/static/components/activity/school/AddActivity.vue
+2 -2
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>
src/main/resources/static/components/activity/school/planInfo.vue
+3 -3
View File
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="计划类型">
{{ viewData.type == 1 ? '校活动计划' : viewData.type == 2 ? '分工会活动计划' : '协会(社团)计划' }}
{{ viewData.type == 1 ? '校活动计划' : viewData.type == 2 ? '分工会活动计划' : '协会计划' }}
</el-form-item>
</el-col>
<el-col :span="24">
@@ -46,7 +46,7 @@
{{ viewData.money }}
</el-descriptions-item>
<el-descriptions-item label="计划类型">
{{ viewData.type == 40001 ? '校活动计划' : viewData.type == 40002 ? '分工会活动计划' : '协会(社团)计划' }}
{{ viewData.type == 40001 ? '校活动计划' : viewData.type == 40002 ? '分工会活动计划' : '协会计划' }}
</el-descriptions-item>
<el-descriptions-item label="计划内容" :span="2">
<div v-html="viewData.content"></div>
@@ -95,4 +95,4 @@ module.exports = {
</script>
<style>
</style>
</style>
src/main/resources/static/components/activity/school/tissueInfo.vue
+2 -2
View File
@@ -35,7 +35,7 @@
<el-col :span="12">
<el-form-item label="活动类型">
{{ viewData.type === 1 ? '分工会活动' : viewData.type === 2 ? '协会社团活动' : '校工会活动' }}
{{ viewData.type === 1 ? '分工会活动' : viewData.type === 2 ? '协会协会活动' : '校工会活动' }}
</el-form-item>
</el-col>
@@ -130,7 +130,7 @@
<el-form-item v-if="viewData.type===1" label="所属工会">
{{ !viewData.unionname ? '暂无' : viewData.unionname }}
</el-form-item>
<el-form-item v-if="viewData.type===2" label="所属社团">
<el-form-item v-if="viewData.type===2" label="所属协会">
{{ !viewData.clubName ? '暂无' : viewData.clubName }}
</el-form-item>
<el-form-item v-if="viewData.type===3" label="所属组织">
src/main/resources/static/components/club/clubEvaluateInfo.vue
+3 -3
View File
@@ -6,13 +6,13 @@
<vi-title title="基础信息"></vi-title>
<el-descriptions :column="3" border class="table_fixed">
<el-descriptions-item :span="3" label="社团名称">
<el-descriptions-item :span="3" label="协会名称">
{{viewData.name}}
</el-descriptions-item>
<el-descriptions-item label="社团编码">
<el-descriptions-item label="协会编码">
{{viewData.code}}
</el-descriptions-item>
<el-descriptions-item label="社团类型">
<el-descriptions-item label="协会类型">
{{viewData.typeName}}
</el-descriptions-item>
<el-descriptions-item label="成立时间">
src/main/resources/static/components/club/clubRegistInfo.vue
+6 -6
View File
@@ -3,22 +3,22 @@
<el-tabs tab-position="top" v-model="clubInfo" v-loading="loading">
<el-tab-pane label="基础信息" name="1">
<vi-title title="社团信息"></vi-title>
<vi-title title="协会信息"></vi-title>
<el-descriptions :column="4" border class="table_fixed">
<el-descriptions-item label="社团名称">
<el-descriptions-item label="协会名称">
{{viewData.name}}
</el-descriptions-item>
<el-descriptions-item label="申请时间">
{{viewData.create_time}}
</el-descriptions-item>
<el-descriptions-item label="社团编码">
<el-descriptions-item label="协会编码">
{{viewData.code}}
</el-descriptions-item>
<el-descriptions-item label="发起人">
{{ viewData.sponsorName }}
</el-descriptions-item>
<el-descriptions-item label="社团类型">
<el-descriptions-item label="协会类型">
{{ viewData.typeName }}
</el-descriptions-item>
<el-descriptions-item label="报名联系人">
@@ -44,11 +44,11 @@
{{viewData.stateName}}
</el-descriptions-item>
<el-descriptions-item span="4">
<template slot="label">社团介绍</template>
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.stjs"></div>
</el-descriptions-item>
<el-descriptions-item span="4">
<template slot="label">社团宗旨</template>
<template slot="label">协会宗旨</template>
<div class="text-left" v-html="viewData.stzz"></div>
</el-descriptions-item>
<el-descriptions-item span="2">
src/main/resources/static/components/club/clubRegisterInfo.vue
+2 -2
View File
@@ -5,7 +5,7 @@
<vi-title title="基础信息"></vi-title>
<el-descriptions :column="3" border class="table_fixed">
<el-descriptions-item label="社团名称">
<el-descriptions-item label="协会名称">
{{ viewData.register.clubName }}
</el-descriptions-item>
<el-descriptions-item label="成立时间">
@@ -35,7 +35,7 @@
</el-descriptions-item>
</el-descriptions>
<vi-title title="社团成员变化情况" class="mt20"></vi-title>
<vi-title title="协会成员变化情况" class="mt20"></vi-title>
<el-table :data="viewData.changeUserNum" max-height="300">
<el-table-column label="序号" type="index"
width="50"></el-table-column>
src/main/resources/static/components/reimbursement/reimbursementNew.vue
+2 -2
View File
@@ -187,7 +187,7 @@
<el-col v-if="viewData.reimbursementItemId=='fyhd'" :span="12">
<el-form-item label="活动类型">
{{ viewData.activity_type === '1' ? '分工会活动' : viewData.activity_type === '2' ? '校工会活动' : '协会(社团)活动' }}
{{ viewData.activity_type === '1' ? '分工会活动' : viewData.activity_type === '2' ? '校工会活动' : '协会活动' }}
</el-form-item>
</el-col>
@@ -345,4 +345,4 @@ module.exports = {
.item-form {
padding: 0 25px;
}
</style>
</style>
src/main/resources/views/mobile/club/clubAudit.html
+3 -3
View File
@@ -100,7 +100,7 @@ layout("/mobile/platform.html"){
<!--top栏-->
<van-nav-bar
title="社团审核"
title="协会审核"
left-arrow
placeholder
fixed
@@ -157,7 +157,7 @@ layout("/mobile/platform.html"){
<div style="margin-top: 10px">
<van-row>
<van-col span="24">
<span style="color: grey">社团名称：</span>
<span style="color: grey">协会名称：</span>
<span>{{o.clubname}}</span>
</van-col>
</van-row>
@@ -363,7 +363,7 @@ layout("/mobile/platform.html"){
data.forEach(item => {
this.clubOptions.push({text: item.name, value: item.id})
})
this.clubOptions.unshift({text: '全部社团'})
this.clubOptions.unshift({text: '全部协会'})
const userType = await getDictOptions('UserType')
userType.forEach(item => {
this.userTypeOptions.push({text: item.name, value: item.code})
src/main/resources/views/mobile/club/inClub.html
+5 -5
View File
@@ -142,7 +142,7 @@ layout("/mobile/platform.html"){
<!--top栏-->
<van-nav-bar
title="加入社团"
title="加入协会"
left-arrow
placeholder
fixed
@@ -157,7 +157,7 @@ layout("/mobile/platform.html"){
shape="round"
maxlength="10"
@search="doSearch"
placeholder="请输入社团名称进行查询"
placeholder="请输入协会名称进行查询"
>
</van-search>
@@ -188,8 +188,8 @@ layout("/mobile/platform.html"){
<div style="color: grey">{{o.location}}</div>
</div>
<div style="color: #1867b0; white-space: nowrap;">
<span v-if="o.status==1">待社团审核</span>
<span v-if="o.status==2" style="color: red">社团拒绝</span>
<span v-if="o.status==1">待协会审核</span>
<span v-if="o.status==2" style="color: red">协会拒绝</span>
<span v-if="o.status==3">待校工会审核</span>
<span v-if="o.status==4" style="color: red">校工会拒绝</span>
<span v-if="o.status==5" style="color: green">审核通过</span>
@@ -258,7 +258,7 @@ layout("/mobile/platform.html"){
基础信息
</div>
<div class="van-card-body">
<van-cell title="社团名称">{{ detailData.name }}</van-cell>
<van-cell title="协会名称">{{ detailData.name }}</van-cell>
<van-cell title="成立时间">{{ detailData.foundtime }}</van-cell>
<van-cell title="报名联系人">{{ detailData.fzrname }}</van-cell>
<van-cell title="所属单位">{{ detailData.fzr_unit_name }}</van-cell>
src/main/resources/views/mobile/club/schoolAudit.html
+3 -3
View File
@@ -105,7 +105,7 @@ layout("/mobile/platform.html"){
<van-search
@search="doSearch"
maxlength="10"
placeholder="请输入社团名称进行查询"
placeholder="请输入协会名称进行查询"
shape="round"
v-model="pageForm.searchKeyword"
>
@@ -137,8 +137,8 @@ layout("/mobile/platform.html"){
<div style="color: grey">{{o.location}}</div>
</div>
<!--<div style="color: #1867b0; white-space: nowrap;">
<span v-if="o.status==1">待社团审核</span>
<span v-if="o.status==2" style="color: red">社团拒绝</span>
<span v-if="o.status==1">待协会审核</span>
<span v-if="o.status==2" style="color: red">协会拒绝</span>
<span v-if="o.status==3">待校工会审核</span>
<span v-if="o.status==4" style="color: red">校工会拒绝</span>
<span v-if="o.status==5" style="color: green">审核通过</span>
src/main/resources/views/platform/activity/summary/club/clubSummary.html
+4 -4
View File
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
</div>
<div class="search-item">
<div class="search-item-label">协会(社团)</div>
<div class="search-item-label">协会</div>
<div class="search-item-option">
<el-select v-model="pageForm.tissueId" placeholder="请选择协会（社团）" style="width: 100%;">
<el-select v-model="pageForm.tissueId" placeholder="请选择协会" style="width: 100%;">
<el-option v-for="item in unionOptions" :label="item.name" :value="item.id"></el-option>
</el-select>
</div>
@@ -61,7 +61,7 @@ layout("/layouts/platform.html"){
</el-table-column>
<el-table-column prop="year" label="年度">
</el-table-column>
<el-table-column sortable prop="name" label="协会（社团）">
<el-table-column sortable prop="name" label="协会">
</el-table-column>
<el-table-column sortable prop="typename" label="总结类型">
</el-table-column>
@@ -109,7 +109,7 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="年度">
{{viewData.year}}
</el-descriptions-item>
<el-descriptions-item label="协会（社团）">
<el-descriptions-item label="协会">
{{viewData.name}}
</el-descriptions-item>
<el-descriptions-item label="总结类型">
src/main/resources/views/platform/activity/summary/common/addSummaryCommon.html
+3 -3
View File
@@ -27,8 +27,8 @@
</el-row>
<el-row v-if="summaryFrom === '3'" :gutter="10" type="flex">
<el-col :span="24">
<el-form-item label="协会（社团）" prop="tissueId">
<el-select v-model="formData.tissueId" placeholder="请选择协会（社团）" style="width: 100%;">
<el-form-item label="协会" prop="tissueId">
<el-select v-model="formData.tissueId" placeholder="请选择协会" style="width: 100%;">
<el-option v-for="item in clubOptions" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -54,4 +54,4 @@
<el-row class="mt10" justify="end" type="flex">
<el-button @click="cancel">取消</el-button>
<el-button @click="doHandle" type="primary">提交</el-button>
</el-row>
</el-row>
src/main/resources/views/platform/activity/union/ActivityUnionManage.html
+2 -2
View File
@@ -93,7 +93,7 @@ layout("/layouts/platform.html"){
<template v-else-if="column.prop=='type'" scope="{row}">
<span v-if="row.type==40001">分工会活动计划</span>
<span v-if="row.type==40003">协会(社团)活动计划</span>
<span v-if="row.type==40003">协会活动计划</span>
<span v-if="row.type==40003">校工会活动计划</span>
</template>
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
<el-form-item prop="type" label="活动类型">
<el-radio-group v-model="formData.type">
<el-radio label="1" border>分工会活动</el-radio>
<el-radio label="2" border>协会(社团)活动</el-radio>
<el-radio label="2" border>协会活动</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
src/main/resources/views/platform/activity/union/ActivityUnionPlan.html
+2 -2
View File
@@ -98,7 +98,7 @@ layout("/layouts/platform.html"){
<template v-else-if="column.prop=='type'" scope="{row}">
<span v-if="row.type==40001">分工会活动计划</span>
<span v-if="row.type==40003">协会(社团)活动计划</span>
<span v-if="row.type==40003">协会活动计划</span>
<span v-if="row.type==40003">校工会活动计划</span>
</template>
@@ -145,7 +145,7 @@ layout("/layouts/platform.html"){
<el-form-item prop="type" label="活动类型">
<el-radio-group v-model="formData.type">
<el-radio label="2" border>分工会活动计划</el-radio>
<el-radio label="3" border>协会(社团)活动计划</el-radio>
<el-radio label="3" border>协会活动计划</el-radio>
</el-radio-group>
</el-form-item>
src/main/resources/views/platform/activity/union/addPlanCommon.html
+2 -2
View File
@@ -5,7 +5,7 @@
<!-- <el-form-item prop="type" label="活动类型">
<el-radio-group v-model="formData.type">
<el-radio label="2" border>分工会活动计划</el-radio>
<el-radio label="3" border>协会(社团)活动计划</el-radio>
<el-radio label="3" border>协会活动计划</el-radio>
</el-radio-group>
</el-form-item>-->
@@ -62,4 +62,4 @@
<el-row class="mt10" justify="end" type="flex">
<el-button @click="cancel">取消</el-button>
<el-button @click="doHandle" type="primary">提交</el-button>
</el-row>
</el-row>
src/main/resources/views/platform/activity/union/layoutPlan.html
+4 -4
View File
@@ -39,9 +39,9 @@
</div>
<div v-if="window.type === 40003" class="search-item">
<div class="search-item-label">协会(社团)</div>
<div class="search-item-label">协会</div>
<div class="search-item-option">
<el-select v-model="pageForm.tissueId" placeholder="请选择协会（社团）" filterable clearable
<el-select v-model="pageForm.tissueId" placeholder="请选择协会" filterable clearable
style="width: 100%">
<el-option
v-for="item in clubList"
@@ -102,7 +102,7 @@
</template>
</el-table-column>
<el-table-column v-if="window.type === 40003" prop="clubname" label="协会（社团）" show-overflow-tooltip>
<el-table-column v-if="window.type === 40003" prop="clubname" label="协会" show-overflow-tooltip>
<template scope="{row}">
<span>{{clubList.find(x => x.id == row.tissueId) === undefined ? '' : clubList.find(x => x.id == row.tissueId).name}}</span>
</template>
@@ -160,7 +160,7 @@
<!-- <el-form-item prop="type" label="活动类型">
<el-radio-group v-model="formData.type">
<el-radio label="2" border>分工会活动计划</el-radio>
<el-radio label="3" border>协会(社团)活动计划</el-radio>
<el-radio label="3" border>协会活动计划</el-radio>
</el-radio-group>
</el-form-item>-->
src/main/resources/views/platform/caredata/StaffCareData.html
+2 -2
View File
@@ -362,7 +362,7 @@ layout("/layouts/platform.html"){
icon: 'el-icon-basketball'
},
sthd: {
name: '社团活动',
name: '协会活动',
color: "#6DC8EC",
icon: 'el-icon-basketball'
},
@@ -523,4 +523,4 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
#-->
src/main/resources/views/platform/caredata/UnionCareData.html
+5 -5
View File
@@ -112,7 +112,7 @@ layout("/layouts/platform.html"){
<div class="cut-off-line"></div>
</el-col>
<el-col :span="4" style="position: relative">
<div class="top_title">社团数</div>
<div class="top_title">协会数</div>
<div class="top_num">{{numData.st_num?numData.st_num:'0'}}</div>
<div class="cut-off-line"></div>
</el-col>
@@ -147,7 +147,7 @@ layout("/layouts/platform.html"){
<div class="cut-off-line"></div>
</el-col>
<el-col :span="4">
<div class="top_title">社团活动数
<div class="top_title">协会活动数
<el-popover
placement="top-start"
title=""
@@ -358,7 +358,7 @@ layout("/layouts/platform.html"){
</el-col>
<el-row v-if="stNone" class="none-data">
<span class="none-data-title">暂无社团</span>
<span class="none-data-title">暂无协会</span>
</el-row>
</el-row>
</el-card>
@@ -672,7 +672,7 @@ layout("/layouts/platform.html"){
forceFit: true,
title: {
visible: true,
text: this.stys_year + '年社团经费使用情况',
text: this.stys_year + '年协会经费使用情况',
},
description: {
visible: true,
@@ -699,7 +699,7 @@ layout("/layouts/platform.html"){
"yAxis": {},
meta: {
name: {
alias: '社团',
alias: '协会',
},
money: {
alias: '金额',
src/main/resources/views/platform/jf/Funds/apply.html
+1 -1
View File
@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
&lt;!&ndash;#if(@shiro.hasRole('H04') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="基层工会活动" value="1"></el-option>
&lt;!&ndash;#}#&ndash;&gt; &lt;!&ndash;#if(@shiro.hasRole('H02') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="协会(社团)活动" value="2"></el-option>
<el-option label="协会活动" value="2"></el-option>
&lt;!&ndash;#}#&ndash;&gt;
&lt;!&ndash;#if(@shiro.hasRole('A06') || @shiro.hasRole('sysadmin')){#&ndash;&gt;
<el-option label="校工会活动" value="3"></el-option>
src/main/resources/views/platform/jf/club/clubtz.html
+1 -1
View File
@@ -183,7 +183,7 @@ layout("/layouts/platform.html"){
<el-table-column label="活动名称" prop="project" header-align="center"
align="center"></el-table-column>
<el-table-column label="所属社团" prop="name" header-align="center"
<el-table-column label="所属协会" prop="name" header-align="center"
align="center">
<template scope="scope"><span>{{clubInfo.name}} </span></template>
</el-table-column>
src/main/resources/views/platform/jf/costsSet/costsSet.html
+2 -2
View File
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<vi-title class="mt20" title="协会/社团预算设置"></vi-title>
<vi-title class="mt20" title="协会/协会预算设置"></vi-title>
<el-row :gutter="20">
<el-col :span="24">
<el-input :disabled="clubDisabled" placeholder="基础人数"
@@ -176,4 +176,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
#-->
src/main/resources/views/platform/jf/reimbursement/board.html
+2 -2
View File
@@ -169,7 +169,7 @@ layout("/layouts/platform.html"){
<div class="cut-off-line"></div>
</el-col>
<el-col :span="4">
<div class="top_title">社团活动经费（元）
<div class="top_title">协会活动经费（元）
<el-popover
placement="top-start"
title=""
@@ -295,7 +295,7 @@ layout("/layouts/platform.html"){
</div>
<el-col :span="24" style="padding: 0 20px"
v-loading="all_club_loading">
<div class="chartTitle" style="margin-bottom: 50px">{{allClubYear}}年社团经费及活动情况
<div class="chartTitle" style="margin-bottom: 50px">{{allClubYear}}年协会经费及活动情况
<el-tooltip class="item" effect="dark" :content="'点击切换为' + clubTip " placement="top">
<el-button type="text" icon="el-icon-sort" @click="doClubSwitch"></el-button>
</el-tooltip>
src/main/resources/views/platform/reimbursement/Summary.html
+2 -2
View File
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
<el-select clearable style="width: 100%" v-model="pageForm.jf_source">
<el-option value="1" label="校工会"></el-option>
<el-option value="2" label="分工会"></el-option>
<el-option value="3" label="社团"></el-option>
<el-option value="3" label="协会"></el-option>
</el-select>
</div>
</div>
@@ -282,4 +282,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
#-->
src/main/resources/views/platform/reimbursement/applyNew.html
+6 -6
View File
@@ -89,10 +89,10 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="12" v-if="formData.jf_source === '3'">
<el-form-item label="所属社团" prop="clubId">
<el-form-item label="所属协会" prop="clubId">
<el-select v-model="formData.clubId" @change="clubChange"
style="width: 100%"
placeholder="请选择所属社团">
placeholder="请选择所属协会">
<el-option
v-for="item in clubList"
:key="item.clubid"
@@ -331,7 +331,7 @@ layout("/layouts/platform.html"){
style="width: 100%">
<el-option label="分工会活动" value="1"></el-option>
<el-option label="校工会活动" value="2"></el-option>
<el-option label="协会(社团)活动" value="3"></el-option>
<el-option label="协会活动" value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -703,7 +703,7 @@ layout("/layouts/platform.html"){
if ("${@shiro.hasRole('sysadmin')}" === 'true') {
this.jfSourceList.push({key: "1", name: "校工会"})
this.jfSourceList.push({key: "2", name: "分工会"})
this.jfSourceList.push({key: "3", name: "协会/社团"})
this.jfSourceList.push({key: "3", name: "协会/协会"})
} else {
if ("${@shiro.hasRole('A06')}" === 'true') {
this.jfSourceList.push({key: "1", name: "校工会"})
@@ -712,7 +712,7 @@ layout("/layouts/platform.html"){
this.jfSourceList.push({key: "2", name: "分工会"})
}
if ("${@shiro.hasRole('club01')}" === 'true') {
this.jfSourceList.push({key: "3", name: "协会/社团"})
this.jfSourceList.push({key: "3", name: "协会/协会"})
}
}
const id = getQueryVariable("id")
@@ -727,4 +727,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
#-->
src/main/resources/views/platform/sys/club/applyIn/schoolsh.html
+5 -5
View File
@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
</el-input>
</div>
<div class="d-search-item btn-group tool-button">
<el-select clearable filterable placeholder="请选择社团"
<el-select clearable filterable placeholder="请选择协会"
v-model="pageForm.clubid">
<el-option
:label="item.name"
@@ -115,9 +115,9 @@ layout("/layouts/platform.html"){
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="社团编码" prop="code" show-overflow-tooltip
<el-table-column align="center" header-align="center" label="协会编码" prop="code" show-overflow-tooltip
sortable></el-table-column>
<el-table-column align="center" header-align="center" label="社团名称" show-overflow-tooltip sortable
<el-table-column align="center" header-align="center" label="协会名称" show-overflow-tooltip sortable
prop="clubname"></el-table-column>
<el-table-column width="100" align="center" header-align="center" label="工号" sortable
prop="loginname"></el-table-column>
@@ -168,8 +168,8 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="审核状态"
prop="status">
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="primary">待社团审核</el-tag>
<el-tag v-if="scope.row.status==2" type="danger">社团拒绝</el-tag>
<el-tag v-if="scope.row.status==1" type="primary">待协会审核</el-tag>
<el-tag v-if="scope.row.status==2" type="danger">协会拒绝</el-tag>
<el-tag v-if="scope.row.status==3" type="primary">待校工会审核</el-tag>
<el-tag v-if="scope.row.status==4" type="danger">校工会拒绝</el-tag>
<el-tag v-if="scope.row.status==5" type="success">审核通过</el-tag>
src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateApply.html
+5 -5
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<vi-title title="年度优秀社团申报（温馨提示：申报范围为当年年度考核结果为合格的教职工社团）"></vi-title>
<vi-title title="年度优秀协会申报（温馨提示：申报范围为当年年度考核结果为合格的教职工协会）"></vi-title>
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px" style="padding: 0 30px">
<el-row gutter="30">
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="8">
<el-form-item label="社团名称" prop="clubId" :rules="{required: true, message: '请选择社团', trigger: 'blur'}">
<el-select v-model="formData.clubId" placeholder="请选择社团" filterable clearable
<el-form-item label="协会名称" prop="clubId" :rules="{required: true, message: '请选择协会', trigger: 'blur'}">
<el-select v-model="formData.clubId" placeholder="请选择协会" filterable clearable
style="width: 100%" :disabled="isCanApply === false">
<el-option
v-for="item in clubList"
@@ -179,7 +179,7 @@ layout("/layouts/platform.html"){
yearActivity.txt.html(resp.data.yearActivity ? resp.data.yearActivity : '')
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
year: new Date().getFullYear()
@@ -191,7 +191,7 @@ layout("/layouts/platform.html"){
const year = moment().format('YYYY')
this.isCanApply = year % 2 === 0
if(this.isCanApply === false) {
this.$alert('当前年份（' + year + '）不能进行年度优秀社团申报', '温馨提示', {
this.$alert('当前年份（' + year + '）不能进行年度优秀协会申报', '温馨提示', {
confirmButtonText: '确定',
})
}
src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateHzAudit.html
+6 -6
View File
@@ -25,9 +25,9 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
style="width: 100%">
<el-option
v-for="item in clubList"
@@ -58,11 +58,11 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
<el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -233,7 +233,7 @@ layout("/layouts/platform.html"){
});
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
year: this.pageForm.year
src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMine.html
+6 -6
View File
@@ -27,9 +27,9 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
style="width: 100%">
<el-option
v-for="item in clubList"
@@ -55,11 +55,11 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
<el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -164,7 +164,7 @@ layout("/layouts/platform.html"){
});
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
applyYear: this.pageForm.applyYear
src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMszAudit.html
+6 -6
View File
@@ -25,9 +25,9 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
style="width: 100%">
<el-option
v-for="item in clubList"
@@ -58,11 +58,11 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
<el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -229,7 +229,7 @@ layout("/layouts/platform.html"){
});
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
year: this.pageForm.year
src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateSchoolAudit.html
+6 -6
View File
@@ -25,9 +25,9 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable clearable
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable
style="width: 100%">
<el-option
v-for="item in clubList"
@@ -58,11 +58,11 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
<el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -236,7 +236,7 @@ layout("/layouts/platform.html"){
});
}
},
//获取当前登录用户管理的社团并且年度审核通过的
//获取当前登录用户管理的协会并且年度审核通过的
async getMyClubAndYearAuditPass() {
const resp = await $.get('/platform/sys/club/clubEvaluateApply/getMyClubAndYearAuditPass', {
year: this.pageForm.year
src/main/resources/views/platform/sys/club/clubUserCount.html
+7 -7
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
</el-select>
</div>
<div class="btn-group tool-button mt5">
<el-select v-model="pageForm.clubId" placeholder="请选择社团">
<el-select v-model="pageForm.clubId" placeholder="请选择协会">
<el-option v-for="item in clubList"
:label="item.name" :value="item.id" :key="item.id">
</el-option>
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt10">
<table-tool :app="this" label="社团统计">
<table-tool :app="this" label="协会统计">
<template #func>
<el-button @click="exportData" type="primary" size="small">导出全部统计数据</el-button>
<el-button @click="exportUserData(null)" v-if="${@shiro.hasAnyRoles('sysadmin', 'A06', 'xxhgly')}"
@@ -69,13 +69,13 @@ layout("/layouts/platform.html"){
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="社团名称"
<el-table-column align="center" header-align="center" label="协会名称"
prop="name" show-overflow-tooltip></el-table-column>
<el-table-column align="center" header-align="center" label="社团编码"
<el-table-column align="center" header-align="center" label="协会编码"
prop="code"></el-table-column>
<el-table-column align="center" sortable header-align="center" label="社团总人数"
<el-table-column align="center" sortable header-align="center" label="协会总人数"
prop="total"></el-table-column>
<el-table-column align="center" sortable header-align="center" label="在职人数"
@@ -93,10 +93,10 @@ layout("/layouts/platform.html"){
<el-table-column align="center" sortable header-align="center" label="理事机构人数"
prop="governing_body"></el-table-column>
<!--<el-table-column align="center" header-align="center" label="社团确认" sortable
<!--<el-table-column align="center" header-align="center" label="协会确认" sortable
prop="club_has_confirm"></el-table-column>
<el-table-column align="center" header-align="center" label="社团待确认" sortable
<el-table-column align="center" header-align="center" label="协会待确认" sortable
prop="club_no_confirm"></el-table-column>
<el-table-column align="center" header-align="center" label="校工会确认" sortable
src/main/resources/views/platform/sys/club/examine/register.html
+5 -5
View File
@@ -39,8 +39,8 @@ layout("/layouts/platform.html"){
<vi-title title="基础信息"></vi-title>
<el-row :gutter="20" type="flex">
<el-col :span="8">
<el-form-item prop="clubId" label="社团名称">
<el-select v-model="jc.clubId" placeholder="请选择所属社团" filterable
<el-form-item prop="clubId" label="协会名称">
<el-select v-model="jc.clubId" placeholder="请选择所属协会" filterable
clearable
@change="changeClub"
style="width: 100%">
@@ -86,7 +86,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
</el-row>
<vi-title title="社团成员变化情况"></vi-title>
<vi-title title="协会成员变化情况"></vi-title>
<el-row :gutter="20" type="flex">
<el-col :span="24">
<el-form-item prop="" label="">
@@ -243,7 +243,7 @@ layout("/layouts/platform.html"){
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="职务" prop="roleName">
<template scope="scope">
<span v-if="scope.row.roleName">{{scope.row.roleName.replace('社团', '')}}</span>
<span v-if="scope.row.roleName">{{scope.row.roleName.replace('协会', '')}}</span>
<span v-else></span>
</template>
</el-table-column>
@@ -500,7 +500,7 @@ layout("/layouts/platform.html"){
await this.getClubUserNum(this.jc.clubId)
await this.getJgUser(this.jc.clubId)
},
//获取当前年度社团有没有登记
//获取当前年度协会有没有登记
async getCount() {
const resp = await $.get(loc() + '/getCount', {id: this.jc.clubId})
this.isRegist = resp.data > 0
src/main/resources/views/platform/sys/club/examine/registerFzrAudit.html
+1 -1
View File
@@ -142,7 +142,7 @@ layout("/layouts/platform.html"){
},
tableColumns: [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'clubName', label: '协会名称'},
{prop: 'foundTime', label: '成立时间'},
{prop: 'username', label: '联系人', sortable: true},
{prop: 'concatPersonMobile', label: '联系方式', sortable: true},
src/main/resources/views/platform/sys/club/examine/registerHzAudit.html
+1 -1
View File
@@ -144,7 +144,7 @@ layout("/layouts/platform.html"){
},
tableColumns: [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'clubName', label: '协会名称'},
{prop: 'foundTime', label: '成立时间'},
{prop: 'username', label: '联系人', sortable: true},
{prop: 'concatPersonMobile', label: '联系方式', sortable: true},
src/main/resources/views/platform/sys/club/examine/registerManage.html
+1 -1
View File
@@ -82,7 +82,7 @@ layout("/layouts/platform.html"){
},
tableColumns: [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'clubName', label: '协会名称'},
{prop: 'foundTime', label: '成立时间'},
{prop: 'username', label: '联系人', sortable: true},
{prop: 'concatPersonMobile', label: '联系方式', sortable: true},
src/main/resources/views/platform/sys/club/examine/registerUnitPartAudit.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<div class="search-item">
<div class="search-item-label">协&emsp;&emsp;会</div>
<div class="search-item-option">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable
clearable
@change="doSearch"
style="width: 100%">
@@ -156,7 +156,7 @@ layout("/layouts/platform.html"){
clubOptions: [],
tableColumns: [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'clubName', label: '协会名称'},
{prop: 'foundTime', label: '成立时间'},
{prop: 'username', label: '联系人', sortable: true},
{prop: 'concatPersonMobile', label: '联系方式', sortable: true},
src/main/resources/views/platform/sys/club/examine/registerXghAudit.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
<div class="search-item">
<div class="search-item-label">协&emsp;&emsp;会</div>
<div class="search-item-option">
<el-select v-model="pageForm.clubId" placeholder="请选择社团" filterable
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable
clearable
@change="doSearch"
style="width: 100%">
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
clubOptions: [],
tableColumns: [
{prop: 'year', label: '年度'},
{prop: 'clubName', label: '社团名称'},
{prop: 'clubName', label: '协会名称'},
{prop: 'foundTime', label: '成立时间'},
{prop: 'username', label: '联系人', sortable: true},
{prop: 'concatPersonMobile', label: '联系方式', sortable: true},
src/main/resources/views/platform/sys/club/include_club_view.html
+8 -8
View File
@@ -1,21 +1,21 @@
<el-tabs v-model="activeName">
<el-tab-pane label="基础信息" name="1">
<vi-title title="社团信息"></vi-title>
<vi-title title="协会信息"></vi-title>
<el-descriptions :column="3" border class="table_fixed">
<el-descriptions-item :span="3" label="社团名称">
<el-descriptions-item :span="3" label="协会名称">
{{viewData.name}}
</el-descriptions-item>
<el-descriptions-item label="社团编码">
<el-descriptions-item label="协会编码">
{{viewData.code}}
</el-descriptions-item>
<el-descriptions-item label="社团类型">
<el-descriptions-item label="协会类型">
{{viewData.typeName}}
</el-descriptions-item>
<el-descriptions-item label="发起人">
{{viewData.sponsorName}}
</el-descriptions-item>
<el-descriptions-item label="社团联系人">
<el-descriptions-item label="协会联系人">
{{viewData.fzrName}}
</el-descriptions-item>
<el-descriptions-item label="所在单位">
@@ -50,11 +50,11 @@
:view="true"></file-upload>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">社团介绍</template>
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.stjs"></div>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">社团章程</template>
<template slot="label">协会章程</template>
<div class="text-left" v-html="viewData.stzc"></div>
</el-descriptions-item>
</el-descriptions>
@@ -119,4 +119,4 @@
<el-button type="primary" @click="doReview(3)">通过</el-button>
</el-row>
</el-tab-pane>
</el-tabs>
</el-tabs>
src/main/resources/views/platform/sys/club/manage/clubManagePersonAudit.html
+5 -5
View File
@@ -12,9 +12,9 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<div class="search">
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-select filterable placeholder="请选择社团" style="width: 100%;"
<el-select filterable placeholder="请选择协会" style="width: 100%;"
v-model="pageForm.clubId">
<el-option :label="item.name" :value="item.id" v-for="item in clubList"></el-option>
</el-select>
@@ -44,11 +44,11 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团编码" prop="code" sortable align="center" header-align="center"
<el-table-column label="协会编码" prop="code" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="成员" prop="username" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/sys/club/manage/refreshReport.html
+3 -3
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -45,9 +45,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
src/main/resources/views/platform/sys/club/manage/ruleUpdate.html
+5 -5
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -45,9 +45,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -66,7 +66,7 @@ layout("/layouts/platform.html"){
<el-table-column label="发起人" prop="sponsorName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团章程" prop="afterRulesFile" sortable align="center" header-align="center"
<el-table-column label="协会章程" prop="afterRulesFile" sortable align="center" header-align="center"
show-overflow-tooltip>
<template scope="scope">
<span style="color: #0e78c5; text-decoration: underline; cursor: pointer"
@@ -172,7 +172,7 @@ layout("/layouts/platform.html"){
},
uploadRule(row) {
/*if(row.afterRulesFile && row.ruleState === 1) {
this.$message.warning('您已上传新的社团章程，待校工会审核')
this.$message.warning('您已上传新的协会章程，待校工会审核')
return
}*/
this.clickRow = row
src/main/resources/views/platform/sys/club/manage/schoolAuditRule.html
+6 -6
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -45,9 +45,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -66,7 +66,7 @@ layout("/layouts/platform.html"){
<el-table-column label="发起人" prop="sponsorName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团章程" prop="afterRulesFile" sortable align="center" header-align="center"
<el-table-column label="协会章程" prop="afterRulesFile" sortable align="center" header-align="center"
show-overflow-tooltip>
<template scope="scope">
<span style="color: #0e78c5; text-decoration: underline; cursor: pointer"
@@ -103,11 +103,11 @@ layout("/layouts/platform.html"){
<el-dialog width="40%" :visible.sync="dialogVisible" title="校工会审核">
<el-descriptions :column="2" border class="table_fixed">
<el-descriptions-item :span="2" label="旧社团章程">
<el-descriptions-item :span="2" label="旧协会章程">
<file-upload :files.sync="clickRow.rulesFile" view>
</file-upload>
</el-descriptions-item>
<el-descriptions-item label="新社团章程">
<el-descriptions-item label="新协会章程">
<file-upload :files.sync="clickRow.afterRulesFile" view>
</file-upload>
</el-descriptions-item>
src/main/resources/views/platform/sys/club/regist/clubConfirm.html
+5 -5
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
</el-card>
<template #edit>
<club-regist-info ref="info2" :handle="true" label="社团确认" :panes="[2, 3, 4, 5]">
<club-regist-info ref="info2" :handle="true" label="协会确认" :panes="[2, 3, 4, 5]">
<template #handle>
<vi-title title="确认信息（以下信息如没有调整，请忽略，否则请修改）"></vi-title>
<el-form :model="formData" ref="form" :rules="formRules" label-position="right"
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="社团章程" prop="rulesFile">
<el-form-item label="协会章程" prop="rulesFile">
<file-upload :files.sync="formData.rulesFile" :max="5" :type="['doc','docx']">
</file-upload>
</el-form-item>
src/main/resources/views/platform/sys/club/regist/clubMyApply.html
+4 -4
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -43,16 +43,16 @@ layout("/layouts/platform.html"){
<el-card class="mt10" shadow="never">
<table-tool :app="this" label="申请列表">
<template #func>
<el-button @click="openAdd" size="small" type="primary">社团注册</el-button>
<el-button @click="openAdd" size="small" type="primary">协会注册</el-button>
</template>
</table-tool>
<el-table :data="tableData" :size="tableSize">
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
+20 -20
View File
@@ -15,18 +15,18 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<div slot="header" class="clearfix">
<h3 style="color: rgb(24, 103, 176);font-family: Microsoft YaHei;">注册社团</h3>
<h3 style="color: rgb(24, 103, 176);font-family: Microsoft YaHei;">注册协会</h3>
</div>
<el-steps :active="activeName" finish-status="success" align-center>
<el-step title="社团基本信息"></el-step>
<el-step title="社团发起人"></el-step>
<el-step title="社团理事机构"></el-step>
<el-step title="协会基本信息"></el-step>
<el-step title="协会发起人"></el-step>
<el-step title="协会理事机构"></el-step>
</el-steps>
<div style="margin-top: 10px">
<div v-show="activeName === '1'">
<vi-title title="请填写以下社团信息"></vi-title>
<vi-title title="请填写以下协会信息"></vi-title>
<el-form :model="formData" ref="form" :rules="formRules" label-width="150px" style="padding: 0 30px">
<el-row gutter="30">
<el-col :span="12">
@@ -40,23 +40,23 @@ layout("/layouts/platform.html"){
</el-row>
<el-row gutter="30">
<el-col :span="12">
<el-form-item label="社团名称" prop="name">
<el-input maxlength="100" placeholder="请填写社团名称" v-model="formData.name"
<el-form-item label="协会名称" prop="name">
<el-input maxlength="100" placeholder="请填写协会名称" v-model="formData.name"
type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="社团编码" prop="code">
<el-input placeholder="请填写社团编码" v-model="formData.code"></el-input>
<el-form-item label="协会编码" prop="code">
<el-input placeholder="请填写协会编码" v-model="formData.code"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="30">
<el-col :span="12">
<el-form-item label="社团类型" prop="type">
<el-form-item label="协会类型" prop="type">
<el-select v-model="formData.type" style="width: 100%"
placeholder="请选择社团类型">
placeholder="请选择协会类型">
<el-option
v-for="item in typeOptions"
:key="item.id"
@@ -114,11 +114,11 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<el-form-item label="社团介绍" prop="stjs">
<el-form-item label="协会介绍" prop="stjs">
<text-editor v-model="formData.stjs"></text-editor>
</el-form-item>
<el-form-item label="社团宗旨" prop="stzz">
<el-form-item label="协会宗旨" prop="stzz">
<text-editor v-model="formData.stzz"></text-editor>
</el-form-item>
@@ -174,7 +174,7 @@ layout("/layouts/platform.html"){
</div>
<div v-show="activeName === '2'">
<vi-title title="请填写社团发起人信息"></vi-title>
<vi-title title="请填写协会发起人信息"></vi-title>
<el-table :data="sponsorData">
<el-table-column label="姓名" prop="userId">
<template slot-scope="scope">
@@ -224,7 +224,7 @@ layout("/layouts/platform.html"){
</div>
<div v-show="activeName === '3'">
<vi-title title="请填写社团理事机构信息"></vi-title>
<vi-title title="请填写协会理事机构信息"></vi-title>
<el-table :data="managePerson">
<el-table-column label="职务" prop="roleId">
<template slot-scope="scope">
@@ -314,10 +314,10 @@ layout("/layouts/platform.html"){
sponsorType: 1,
},
formRules: {
name: [{required: true, message: '请填写社团名称', trigger: ['blur', 'change']}],
code: [{required: true, message: '请填写社团编码', trigger: ['blur', 'change']}],
type: [{required: true, message: '请选择社团类型', trigger: ['blur', 'change']}],
fzr: [{required: true, message: '请选择社团联系人', trigger: ['blur', 'change']}],
name: [{required: true, message: '请填写协会名称', trigger: ['blur', 'change']}],
code: [{required: true, message: '请填写协会编码', trigger: ['blur', 'change']}],
type: [{required: true, message: '请选择协会类型', trigger: ['blur', 'change']}],
fzr: [{required: true, message: '请选择协会联系人', trigger: ['blur', 'change']}],
sponsorType: [{required: true, message: '请选择发起类型', trigger: ['blur', 'change']}],
},
typeOptions: [],
@@ -386,7 +386,7 @@ layout("/layouts/platform.html"){
cloneData.splice(index, 1)
const u = cloneData.find(o => o.userId === val)
if (u) {
this.$message.warning('社团发起人不能重复')
this.$message.warning('协会发起人不能重复')
row.userId = ''
row.loginname = ''
row.unitname = ''
src/main/resources/views/platform/sys/club/regist/include_club_view.html
+7 -7
View File
@@ -1,24 +1,24 @@
<el-tabs v-model="activeName">
<el-tab-pane label="基础信息" name="1">
<vi-title title="社团信息"></vi-title>
<vi-title title="协会信息"></vi-title>
<el-descriptions :column="3" border class="table_fixed">
<el-descriptions-item :span="2" label="社团名称">
<el-descriptions-item :span="2" label="协会名称">
{{viewData.name}}
</el-descriptions-item>
<el-descriptions-item label="成立时间">
{{viewData.create_time}}
</el-descriptions-item>
<el-descriptions-item label="社团编码">
<el-descriptions-item label="协会编码">
{{viewData.code}}
</el-descriptions-item>
<el-descriptions-item label="社团类型">
<el-descriptions-item label="协会类型">
{{viewData.typeName}}
</el-descriptions-item>
<el-descriptions-item label="发起人">
{{viewData.sponsorName}}
</el-descriptions-item>
<el-descriptions-item label="社团联系人">
<el-descriptions-item label="协会联系人">
{{viewData.fzrName}}
</el-descriptions-item>
<el-descriptions-item label="所属单位">
@@ -57,11 +57,11 @@
<div class="text-left" v-html="viewData.yearPlan"></div>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">社团介绍</template>
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.stjs"></div>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">社团章程</template>
<template slot="label">协会章程</template>
<div class="text-left" v-html="viewData.stzc"></div>
</el-descriptions-item>
</el-descriptions>
src/main/resources/views/platform/sys/club/regist/unitPartAudit.html
+3 -3
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
src/main/resources/views/platform/sys/club/regist/xghReply.html
+3 -3
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
src/main/resources/views/platform/sys/club/regist/xldAudit.html
+3 -3
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
src/main/resources/views/platform/sys/club/regist/xtAudit.html
+3 -3
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">社团名称：</div>
<div class="search-item-label">协会名称：</div>
<div class="search-item-option">
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
clearable
@@ -53,9 +53,9 @@ layout("/layouts/platform.html"){
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="社团名称" prop="name" sortable align="center" header-align="center"
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="社团类型" prop="typeName" sortable align="center" header-align="center"
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
src/main/resources/views/platform/sys/club/users.html
+4 -4
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
</el-input>
</div>
<div class="btn-group tool-button mt5">
<el-select filterable placeholder="请选择社团"
<el-select filterable placeholder="请选择协会"
v-model="pageForm.clubid">
<el-option
:label="item.name"
@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
<el-lable v-if="scope.row.sf==2">成员</el-lable>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="社团名称"
<el-table-column align="center" header-align="center" label="协会名称"
prop="clubname"></el-table-column>
<el-table-column align="center" fixed="right" header-align="center" label="操作">
@@ -91,7 +91,7 @@ layout("/layouts/platform.html"){
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{type:'del',data:scope.row}" v-if="scope.row.sf==2">
移出社团
移出协会
</el-dropdown-item>
<el-dropdown-item :command="{type:'jf',jf:true,data:scope.row}">
已缴费
@@ -191,7 +191,7 @@ layout("/layouts/platform.html"){
dropdownCommand: function (command) {
const {type, jf, data} = command
if (type == 'del') {
this.$confirm('确定要将' + data.username + '移出社团吗？', '提示', {
this.$confirm('确定要将' + data.username + '移出协会吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
src/main/resources/views/platform/sys/gdh/jcgl.html
+2 -2
View File
@@ -274,7 +274,7 @@ layout("/layouts/platform.html"){
}, "json");
},
doDelete(id) {
this.$confirm('确定要删除该社团吗？', '提示', {
this.$confirm('确定要删除该协会吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
@@ -421,4 +421,4 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
#-->