c-hongqw1/zhgh_hhu
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-10 15:51:37 +08:00
parent 30a17cb884
commit 61511ae0e9
38 changed files with 812 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/sys/club/shrt.html
+48 -25
View File
@@ -29,30 +29,37 @@ layout("/layouts/platform.html"){
<div class="btn-group tool-button mt5">
<el-button @click="doSearch" icon="el-icon-search" type="primary"></el-button>
</div>
<div class="pull-right offscreen-right mt5">
<el-button :disabled="subDis" @click="check(true)" icon="el-icon-check" plain type="success">同意
</el-button>
<el-button :disabled="subDis" @click="check(false)" icon="el-icon-close" plain type="danger">拒绝
</el-button>
</div>
<div class="pull-right offscreen-right mt5" style="margin-right: 40px">
<el-radio-group v-model="pageForm.radioType" @change="(val) => doSearch()">
<el-radio-button label="1">全部</el-radio-button>
<el-radio-button label="2">已审核</el-radio-button>
<el-radio-button label="3">未审核</el-radio-button>
</el-radio-group>
</div>
</el-card>
<el-card class="mt10" shadow="never">
<vi-title2 title="温馨提醒：如下方没有数据，可能是其他理事成员已审核，审核信息请切换已审核查看">
<template #func>
<el-radio-group @change="(val) => doSearch()" style="margin-right: 6px"
v-model="pageForm.applyType">
<el-radio-button :label="1">申请加入</el-radio-button>
<el-radio-button :label="2">申请退会</el-radio-button>
</el-radio-group>
<el-radio-group @change="(val) => doSearch()" style="margin-right: 6px"
v-model="pageForm.radioType">
<el-radio-button label="1">全部</el-radio-button>
<el-radio-button label="2">已审核</el-radio-button>
<el-radio-button label="3">未审核</el-radio-button>
</el-radio-group>
<el-button :disabled="subDis" @click="check(true)" icon="el-icon-check" plain
type="success">通过
</el-button>
<el-button :disabled="subDis" @click="check(false)" icon="el-icon-close"
plain type="danger">不通过
</el-button>
</template>
</vi-title2>
<el-table :data="tableData" :key="tabKey" @selection-change="handleSelectionChange" @sort-change="pageOrder"
ref="multipleTable"
row-key="id"
style="width: 100%" v-loading="tabloading">
<el-table-column :reserve-selection="true" v-if="pageForm.radioType !== '2'" :selectable="(row, index) => {return row.status === 1}"
<el-table-column :reserve-selection="true" :selectable="(row, index) => {return row.status === 1 || row.exitStatus === 1}"
type="selection"
v-if="pageForm.radioType !== '2'"
width="55">
</el-table-column>
<el-table-column align="center" header-align="center" label="序号" type="index">
@@ -89,14 +96,24 @@ layout("/layouts/platform.html"){
prop="userState"></el-table-column>
<el-table-column align="center" header-align="center" label="所属单位" prop="unitname" show-overflow-tooltip
sortable></el-table-column>
<el-table-column align="center" header-align="center" label="审核状态"
<el-table-column v-if="pageForm.applyType === 1" 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==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>
<el-tag type="primary" v-if="scope.row.status==1">待社团审核</el-tag>
<el-tag type="danger" v-if="scope.row.status==2">社团不通过</el-tag>
<el-tag type="primary" v-if="scope.row.status==3">待校工会审核</el-tag>
<el-tag type="danger" v-if="scope.row.status==4">校工会不通过</el-tag>
<el-tag type="success" v-if="scope.row.status==5">审核通过</el-tag>
</template>
</el-table-column>
<el-table-column v-if="pageForm.applyType === 2" align="center" header-align="center" label="退会状态"
prop="exitStatus">
<template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.exitStatus==1">待社团审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitStatus==2">社团不通过</el-tag>
<el-tag type="primary" v-if="scope.row.exitStatus==3">待校工会审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitStatus==4">校工会不通过</el-tag>
<el-tag type="success" v-if="scope.row.exitStatus==5">审核通过</el-tag>
</template>
</el-table-column>
</el-table>
@@ -134,7 +151,8 @@ layout("/layouts/platform.html"){
totalCount: 0,
pageOrderName: "",
pageOrderBy: "",
radioType: 3
radioType: 3,
applyType: 1,
},
formRules: {
code: [{required: true, message: '必填', trigger: ['blur', 'change']}],
@@ -165,7 +183,12 @@ layout("/layouts/platform.html"){
return v.id
})
this.subDis = true
$.post(base + "/platform/sys/club/sh/check", {ids: JSON.stringify(ids), flag: flag, type: 1}, (data) => {
$.post(base + "/platform/sys/club/sh/check", {
ids: JSON.stringify(ids),
flag: flag,
type: 1,
applyType: this.pageForm.applyType,
}, (data) => {
this.subDis = false
if (data.code === 0) {
this.$message({
@@ -239,4 +262,4 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
#-->
src/main/resources/views/platform/sys/club/sqrt.html
+61 -3
View File
@@ -109,7 +109,7 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="退休人数" show-overflow-tooltip
prop="outnum"></el-table-column>
<el-table-column align="center" v-if="activeName=='true'" header-align="center" label="申请状态" sortable>
<el-table-column align="center" v-if="activeName=='true'" header-align="center" label="入会状态" sortable>
<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>
@@ -119,6 +119,17 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column align="center" v-if="activeName=='true'" header-align="center" label="退会状态" sortable>
<template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.exitstatus==1">待社团审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitstatus==2">社团不通过</el-tag>
<el-tag type="primary" v-if="scope.row.exitstatus==3">待校工会审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitstatus==4">校工会不通过</el-tag>
<el-tag type="success" v-if="scope.row.exitstatus==5">审核通过</el-tag>
<el-tag type="success" v-if="!scope.row.exitstatus">暂无</el-tag>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="操作" fixed="right" width="250px">
<template slot-scope="scope">
<el-button size="mini" @click="openDetail(scope.row.id)">查看</el-button>
@@ -127,7 +138,16 @@ layout("/layouts/platform.html"){
</el-button>
<el-button size="mini" v-if="activeName=='true'&&scope.row.status==1" type="danger"
@click="doRevocation(scope.row.id)">
撤销申请
撤销加入申请
</el-button>
<el-button size="mini" v-if="activeName=='true' && scope.row.status==5 && !scope.row.exitstatus" type="primary" @click="exitClub(scope.row)">
申请退会
</el-button>
<el-button size="mini" v-if="activeName=='true' && scope.row.status!=1 && scope.row.exitstatus==1"
type="danger"
@click="cancelExitClub(scope.row.id)">
撤销退会申请
</el-button>
</template>
</el-table-column>
@@ -250,6 +270,44 @@ layout("/layouts/platform.html"){
}
},
methods: {
exitClub(row) {
this.$confirm('您确定要申请退会吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
callback: async (a, b) => {
if ("confirm" === a) {//确认后再执行
const resp = await $.post('/platform/sys/club/sq/exitClub', {id: row.id})
if (resp.code === 0) {
await this.getCount()
this.pageData()
this.$message.success(resp.msg)
} else {
this.$message.warning(resp.msg)
}
}
}
});
},
cancelExitClub(id) {
this.$confirm('您确定要撤销申请吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
callback: async (a, b) => {
if ("confirm" === a) {//确认后再执行
const resp = await $.post('/platform/sys/club/sq/cancelExitClub', {id: id})
if (resp.code === 0) {
await this.getCount()
this.pageData()
this.$message.success(resp.msg)
} else {
this.$message.warning(resp.msg)
}
}
}
});
},
doRevocation(id) {
this.$confirm('是否撤销申请？', '提示', {
confirmButtonText: '确定',
@@ -394,4 +452,4 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
#-->