commit
This commit is contained in:
@jyuhsin
@@ -17,7 +17,7 @@ const commonUtil = {
|
||||
if (response.config.responseType === "blob") {
|
||||
return response
|
||||
}
|
||||
if (response.data && response.data.code !== 0) {
|
||||
if (response.data && response.data.code !== 0 && response.data.code !== 99) {
|
||||
if (isMobile) {
|
||||
vant.Toast(response.data.msg)
|
||||
} else {
|
||||
|
||||
@@ -96,8 +96,8 @@ layout("/layouts/platform.html"){
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<el-descriptions class="margin-top" title="" :column="3" border>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions class="margin-top" title="" :column="2" border>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">协会名称</template>
|
||||
<div v-html="viewData.clubName"></div>
|
||||
</el-descriptions-item>
|
||||
@@ -105,18 +105,6 @@ layout("/layouts/platform.html"){
|
||||
<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>
|
||||
<template slot="label">报名联系人</template>
|
||||
{{viewData.concatPersonName}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">联系人电话</template>
|
||||
{{viewData.concatPersonMobile}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">联系人邮箱</template>
|
||||
{{viewData.concatPersonEmail}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">会费标准</template>
|
||||
{{viewData.due}}
|
||||
@@ -125,35 +113,19 @@ layout("/layouts/platform.html"){
|
||||
<template slot="label">当前人数</template>
|
||||
{{viewData.currentPeopleNum}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="3">
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">协会介绍</template>
|
||||
<div class="text-left" v-html="viewData.introduce"></div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="3">
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">协会宗旨</template>
|
||||
<div class="text-left" v-html="viewData.purpose"></div>
|
||||
</el-descriptions-item>
|
||||
<!--<el-descriptions-item span="1.5">
|
||||
<template slot="label">QQ群二维码</template>
|
||||
<file-upload
|
||||
v-if="viewData.QQGroupCode && viewData.QQGroupCode.length > 0"
|
||||
:files="JSON.parse(viewData.QQGroupCode)"
|
||||
:view="true"
|
||||
></file-upload>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">微信群二维码</template>
|
||||
<file-upload
|
||||
v-if="viewData.wechatGroupCode && viewData.wechatGroupCode.length > 0"
|
||||
:files="JSON.parse(viewData.wechatGroupCode)"
|
||||
:view="true"
|
||||
></file-upload>
|
||||
</el-descriptions-item>-->
|
||||
<el-descriptions-item :span="3">
|
||||
<template slot="label">协会章程</template>
|
||||
<file-preview :files="viewData.rulesFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="3">
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">年度活动计划</template>
|
||||
<file-preview :files="viewData.yearPlanFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
|
||||
@@ -4,7 +4,7 @@ const REGISTER_INFO_COMPONENT = {
|
||||
<el-tabs tab-position="top" v-model="activeName">
|
||||
<el-tab-pane name="1" label="基础信息">
|
||||
<div class="process-title">协会信息</div>
|
||||
<el-descriptions :column="4" border class="table_fixed">
|
||||
<el-descriptions :column="3" border class="table_fixed">
|
||||
<el-descriptions-item label="协会名称">
|
||||
{{viewData.clubName}}
|
||||
</el-descriptions-item>
|
||||
@@ -17,75 +17,54 @@ const REGISTER_INFO_COMPONENT = {
|
||||
<el-descriptions-item label="发起人">
|
||||
{{ viewData.sponsorName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="协会类型" :span="4">
|
||||
<el-descriptions-item label="协会类型">
|
||||
{{ viewData.typeName }}
|
||||
</el-descriptions-item>
|
||||
<!-- <el-descriptions-item label="报名联系人">-->
|
||||
<!-- {{ viewData.concatPersonName }}-->
|
||||
<!-- </el-descriptions-item>-->
|
||||
<!-- <el-descriptions-item label="联系人电话">-->
|
||||
<!-- {{ viewData.concatPersonMobile }}-->
|
||||
<!-- </el-descriptions-item>-->
|
||||
<!-- <el-descriptions-item label="联系人邮箱">-->
|
||||
<!-- {{ viewData.concatPersonEmail }}-->
|
||||
<!-- </el-descriptions-item>-->
|
||||
<el-descriptions-item label="申请时间">
|
||||
{{viewData.createTime}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="3" label="会费标准">
|
||||
{{viewData.due}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="4">
|
||||
<el-descriptions-item :span="4">
|
||||
<template slot="label">协会介绍</template>
|
||||
<div class="text-left" v-html="viewData.introduce"></div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="4">
|
||||
<el-descriptions-item :span="4">
|
||||
<template slot="label">活动形式</template>
|
||||
<div class="text-left" v-html="viewData.purpose"></div>
|
||||
</el-descriptions-item>
|
||||
<!--<el-descriptions-item span="2">
|
||||
<template slot="label">QQ群二维码</template>
|
||||
<file-preview :files="viewData.QQGroupCode" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">微信群二维码</template>
|
||||
<file-preview :files="viewData.wechatGroupCode" complete_result></file-preview>
|
||||
</el-descriptions-item>-->
|
||||
<el-descriptions-item span="4">
|
||||
<el-descriptions-item :span="2">
|
||||
<template slot="label">申请成立报告</template>
|
||||
<file-preview :files="viewData.establishReport" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="4">
|
||||
<el-descriptions-item :span="2">
|
||||
<template slot="label">章程草案</template>
|
||||
<file-preview :files="viewData.rulesFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="4">
|
||||
<el-descriptions-item :span="2">
|
||||
<template slot="label">经费来源及管理办法</template>
|
||||
<file-preview :files="viewData.manageFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="4">
|
||||
<el-descriptions-item :span="2">
|
||||
<template slot="label">年度活动计划</template>
|
||||
<file-preview :files="viewData.yearPlanFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="2">
|
||||
<el-descriptions-item :span="2">
|
||||
<template slot="label">其他附件</template>
|
||||
<file-preview :files="viewData.files" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<!--<el-descriptions-item span="2">
|
||||
<template slot="label">校工会批复附件</template>
|
||||
<file-preview :files="viewData.schoolReplyFile" complete_result></file-preview>
|
||||
</el-descriptions-item>-->
|
||||
<el-descriptions-item :span="2">
|
||||
<template slot="label">换届报告</template>
|
||||
<file-preview :files="viewData.replaceReport" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="2" label="成员信息">
|
||||
<div class="process-title">成员信息</div>
|
||||
<el-table :data="viewData.clubUser" size="small" border
|
||||
:header-cell-style="{background:'#F5F5F5',color:'#606266'}">
|
||||
<el-table-column label="人员身份" width="150px" prop="roleCode">
|
||||
<template v-slot="scope">
|
||||
<span>{{getRoleName(scope.row.roleCode)}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="人员身份" width="150px" prop="roleName"></el-table-column>
|
||||
<el-table-column label="工号" width="150px" prop="loginName"></el-table-column>
|
||||
<el-table-column label="姓名" width="150px" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" width="150px" prop="sex"></el-table-column>
|
||||
|
||||
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
v-if="[50].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="openRevoke(row)"
|
||||
|
||||
@@ -101,7 +101,6 @@ layout("/layouts/platform.html"){
|
||||
year: this.$moment().format("YYYY"),
|
||||
audit: false
|
||||
},
|
||||
viewData: {},
|
||||
clubList: [],
|
||||
showApprovalForm: false
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ layout("/layouts/platform.html"){
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
v-if="[50].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="openRevoke(row)"
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
<!--#
|
||||
layout("/layouts/platform.html"){
|
||||
#-->
|
||||
<style></style>
|
||||
|
||||
<div id="app" v-cloak>
|
||||
<guava ref="guava">
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年度：">
|
||||
<el-date-picker
|
||||
placeholder="选择年度"
|
||||
type="year"
|
||||
style="width: 100%"
|
||||
v-model="pageForm.year"
|
||||
value-format="yyyy"
|
||||
></el-date-picker>
|
||||
</search-item>
|
||||
<search-item label="协会名称：">
|
||||
<el-input
|
||||
@keyup.enter.native="doSearch"
|
||||
clearable
|
||||
placeholder="请输入内容"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.clubName"
|
||||
></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="申请列表">
|
||||
<el-radio-group v-model="pageForm.audit" size="small" @change="doSearch">
|
||||
<el-radio-button :label="true">已审核</el-radio-button>
|
||||
<el-radio-button :label="false">未审核</el-radio-button>
|
||||
</el-radio-group>
|
||||
</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="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>
|
||||
<el-table-column label="旧身份" prop="oldRoleName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="新身份" prop="nowRoleName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="onApproval(row)" size="mini" type="primary">
|
||||
审核
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
|
||||
@click="onRevoke(row.processInstanceTaskId)"
|
||||
size="mini"
|
||||
type="danger"
|
||||
>
|
||||
撤回
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--#include("/layouts/pagination.html"){}#-->
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #public>
|
||||
<info ref="infoRef"></info>
|
||||
<div v-if="showApprovalForm">
|
||||
<div class="process-title">{{formData.processInstanceNodeName}}</div>
|
||||
<el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
|
||||
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row type="flex" justify="end">
|
||||
<el-button plain @click="$refs.guava.index()">取消</el-button>
|
||||
<el-button type="danger" @click="doApproval('BACK')">退回</el-button>
|
||||
<el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
|
||||
<el-button type="primary" @click="doApproval('PASS')">同意</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("../change/info.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
"info": clubManagerInfo,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pageForm: {
|
||||
clubId: "",
|
||||
year: this.$moment().format("YYYY"),
|
||||
audit: false
|
||||
},
|
||||
formData: {},
|
||||
showApprovalForm: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onView(row) {
|
||||
this.$refs.guava.public(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
this.showApprovalForm = false
|
||||
})
|
||||
},
|
||||
onApproval(row) {
|
||||
this.$refs.guava.public(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
this.formData = row.approvalParam
|
||||
this.showApprovalForm = true
|
||||
})
|
||||
},
|
||||
doApproval(approvalType) {
|
||||
this.formData.bpmTaskApprovalType = approvalType
|
||||
this.$refs.approvalFormRef.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$axios
|
||||
.post(loc() + "/approval", {
|
||||
approval: JSON.stringify(this.formData)
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$refs.guava.index()
|
||||
this.$message.success(res.msg)
|
||||
this.doSearch()
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
onRevoke(taskId) {
|
||||
this.$confirm("您确定要撤回吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "info"
|
||||
}).then(() => {
|
||||
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success(res.msg)
|
||||
this.doSearch()
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
async pageData() {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/auditManager/pageData", this.pageForm)
|
||||
if (resp.code === 0) {
|
||||
this.tableData = resp.data.list
|
||||
this.pageForm.totalCount = resp.data.totalCount
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
await this.pageData()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
@@ -0,0 +1,235 @@
|
||||
<!--#
|
||||
layout("/layouts/platform.html"){
|
||||
#-->
|
||||
<style></style>
|
||||
|
||||
<div id="app" v-cloak>
|
||||
<guava ref="guava">
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年度：">
|
||||
<el-date-picker
|
||||
placeholder="选择年度"
|
||||
type="year"
|
||||
style="width: 100%"
|
||||
v-model="pageForm.year"
|
||||
value-format="yyyy"
|
||||
></el-date-picker>
|
||||
</search-item>
|
||||
<search-item label="协会名称：">
|
||||
<el-input
|
||||
@keyup.enter.native="doSearch"
|
||||
clearable
|
||||
placeholder="请输入内容"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.clubName"
|
||||
></el-input>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="申请列表">
|
||||
<el-button type="primary" size="small" @click="openAdd">
|
||||
<i class="ti-plus"></i>
|
||||
变更成员
|
||||
</el-button>
|
||||
</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="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>
|
||||
<el-table-column label="旧身份" prop="oldRoleName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="新身份" prop="nowRoleName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="当前节点" prop="processInstanceNodeName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="300">
|
||||
<template v-slot="{row}">
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" @click="onEdit(row)" size="mini" type="primary">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="[50].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="onRevoke(row)"
|
||||
>
|
||||
撤销
|
||||
</el-button>
|
||||
<el-button v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" @click="onDelete(row)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button v-else-if="[10].includes(row.processInstanceNodeCode)" @click="onDelete(row)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--#include("/layouts/pagination.html"){}#-->
|
||||
</el-card>
|
||||
</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-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="userId">
|
||||
<el-select v-model="formData.userId" @change="userChange" placeholder="请选择协会成员" filterable clearable style="width: 100%">
|
||||
<el-option v-for="item in userList" :key="item.userId" :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-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="float: right;margin: 20px 0">
|
||||
<el-button @click="$refs.guava.index()">取 消</el-button>
|
||||
<el-button type="primary" @click="onSubmit">提 交</el-button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<info ref="infoRef"></info>
|
||||
</template>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("info.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
"info": clubManagerInfo
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
clubList: [],
|
||||
userList: [],
|
||||
formData: {
|
||||
nowRoleCode: [],
|
||||
},
|
||||
formRules: {
|
||||
clubId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
userId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
nowRoleCode: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
clubChange(key) {
|
||||
if(!key) {
|
||||
this.$set(this.formData, 'userId', '')
|
||||
this.$set(this.formData, 'nowRoleCode', '')
|
||||
}
|
||||
this.$axios.post("/platform/club/infoManage/change/queryClubUsers", {clubId: this.formData.clubId}).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.userList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
userChange(key) {
|
||||
const user = this.userList.find(o => o.userId === key)
|
||||
this.$set(this.formData, 'nowRoleCode', user?.roleCode)
|
||||
this.$set(this.formData, 'changeUserId', key)
|
||||
this.$set(this.formData, 'changeUserName', user?.userName)
|
||||
},
|
||||
openAdd() {
|
||||
this.$refs.guava.edit(() => {
|
||||
this.formData = {nowRoleCode: []}
|
||||
})
|
||||
},
|
||||
onRevoke(row) {
|
||||
this.$confirm("您确定要撤回吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post("/platform/club/infoManage/ruleUpdate/revokeApply", { id: row.id }).then((resp) => {
|
||||
this.$message.success(resp.msg)
|
||||
this.doSearch()
|
||||
})
|
||||
})
|
||||
},
|
||||
onEdit(row) {
|
||||
this.formData = clone(row)
|
||||
this.$refs.guava.edit(() => {})
|
||||
},
|
||||
async onSubmit() {
|
||||
this.$refs.formRef.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$confirm("您确定要提交吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post('/platform/club/infoManage/change/submit', {
|
||||
data: JSON.stringify(this.formData)
|
||||
}).then(res => {
|
||||
if (res.code === 0) {
|
||||
this.pageData()
|
||||
this.$message.success(res.msg)
|
||||
this.$refs.guava.index()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
onDelete(row) {
|
||||
this.$confirm("您确定要删除吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post("/platform/club/infoManage/change/delete", { id: row.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success(res.msg)
|
||||
this.pageData()
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
onView(row) {
|
||||
this.$refs.guava.view(() =>{
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
})
|
||||
},
|
||||
async getMyClub() {
|
||||
const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole")
|
||||
this.clubList = resp.data
|
||||
},
|
||||
async pageData() {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/change/pageData", this.pageForm)
|
||||
if (resp.code === 0) {
|
||||
this.tableData = resp.data.list
|
||||
this.pageForm.totalCount = resp.data.totalCount
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
await this.getMyClub()
|
||||
await this.pageData()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
@@ -0,0 +1,69 @@
|
||||
const clubManagerInfo = {
|
||||
template: /*language=HTML*/ `
|
||||
<div>
|
||||
<div class="process-title">
|
||||
申请信息
|
||||
</div>
|
||||
<el-descriptions :column="3" border>
|
||||
<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>
|
||||
<el-descriptions-item label="旧身份">{{ viewData.oldRoleName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="新身份">{{ viewData.nowRoleName }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
|
||||
<div class="process-title">
|
||||
{{nodeTask.nodeName}}
|
||||
</div>
|
||||
<div>
|
||||
<el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
|
||||
<el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
|
||||
task.actualOwnerUserName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核时间">{{ task.endOn }}</el-descriptions-item>
|
||||
<el-descriptions-item label="审核结果">
|
||||
<div v-if="task.extVariable">
|
||||
<el-tag type="success" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意
|
||||
</el-tag>
|
||||
<el-tag type="danger" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写
|
||||
</el-tag>
|
||||
<el-tag type="danger" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">拒绝
|
||||
</el-tag>
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`,
|
||||
data() {
|
||||
return {
|
||||
viewData: {},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onOpen(row) {
|
||||
this.$axios.post("/platform/club/infoManage/change/info", { id: row.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.viewData = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
style: /*language=CSS*/ `
|
||||
.el-descriptions-item__label {
|
||||
width: 200px;
|
||||
min-width: 200px;
|
||||
max-width: 200px;
|
||||
}
|
||||
.el-tabs__header {
|
||||
margin: 0;
|
||||
}
|
||||
`
|
||||
}
|
||||
-149
@@ -1,149 +0,0 @@
|
||||
<!--#
|
||||
layout("/layouts/platform.html"){
|
||||
#-->
|
||||
<style></style>
|
||||
|
||||
<div id="app" v-cloak>
|
||||
<guava ref="guava">
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="协会名称：">
|
||||
<el-select filterable placeholder="请选择协会" style="width: 100%" v-model="pageForm.clubId">
|
||||
<el-option :label="item.clubName" :value="item.id" v-for="item in clubList"></el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
</search>
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="理事机构审核">
|
||||
<el-button @click="doReview(false)" size="small" type="danger">批量不通过</el-button>
|
||||
<el-button @click="doReview(true)" size="small" type="primary">批量通过</el-button>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" @selection-change="handleSelectionChange" ref="table" :row-key="()=>{new Date().getTime()}">
|
||||
<el-table-column :reserve-selection="true" type="selection" width="40"></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="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="userName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="职务" prop="roleCode" sortable show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span>{{getRoleName(scope.row.roleCode)}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="职务变更" prop="changeRoleCode" sortable show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.changeRoleCode">
|
||||
<span>{{getRoleName(scope.row.changeRoleCode)}}</span>
|
||||
</div>
|
||||
<span v-else>暂无变更</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变更时间" prop="roleCodeChangeTime" sortable show-overflow-tooltip>
|
||||
<template slot-scope="{row}">
|
||||
<span v-if="row.changeRoleCode !== undefined">{{ $moment(row.roleCodeChangeTime).format('YYYY-MM-DD') }}</span>
|
||||
<span v-else>暂无变更</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" prop="state" sortable show-overflow-tooltip>
|
||||
<template v-if="row.state === 1 || row.status === 3" slot-scope="{row}">
|
||||
<span>待校工会审核</span>
|
||||
</template>
|
||||
<template v-else slot-scope="scope">暂无状态</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--#include("/layouts/pagination.html"){}#-->
|
||||
</el-card>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("../../common/clubRoleConstant.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
components: {},
|
||||
data() {
|
||||
return {
|
||||
clubList: [],
|
||||
multipleSelection: []
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getRoleName(roleCode) {
|
||||
return CLUB_ROLE_CONSTANT.getRoleName(roleCode)
|
||||
},
|
||||
showFiles(row) {
|
||||
if (row.replaceReport && row.replaceReport.length > 0) {
|
||||
let res = row.replaceReport[0]
|
||||
let fileId = res?.response?.data.substring(res?.response?.data.lastIndexOf("=") + 1)
|
||||
let fileName = res?.name
|
||||
window.open(
|
||||
"/assets/platform/plugins/pdfJs/web/viewer.html?file=" + encodeURIComponent("/platform/sys/file/convertPDF?id=" + fileId),
|
||||
fileName
|
||||
)
|
||||
}
|
||||
},
|
||||
getFileName(row) {
|
||||
if (row.replaceReport && row.replaceReport.length > 0) {
|
||||
return row.replaceReport[0].name
|
||||
} else {
|
||||
return ""
|
||||
}
|
||||
},
|
||||
async doReview(flag) {
|
||||
if (this.multipleSelection.length === 0) {
|
||||
this.$message.warning("请先在多选框中选择")
|
||||
return
|
||||
}
|
||||
const str = flag ? "通过" : "不通过"
|
||||
const confirm = await this.$confirm("您确定要批量审核" + str + "吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const array = this.multipleSelection.map((o) => o.id)
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/clubManagePersonAudit/doAudit", {
|
||||
ids: JSON.stringify(array),
|
||||
isPass: flag
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.$refs.table.clearSelection()
|
||||
await this.pageData()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val
|
||||
},
|
||||
async pageData() {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/clubManagePersonAudit/pageData", this.pageForm)
|
||||
if (resp.code === 0) {
|
||||
this.tableData = resp.data.list
|
||||
this.pageForm.totalCount = resp.data.totalCount
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
},
|
||||
async getAllClub() {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/clubManagePersonAudit/getAllClub")
|
||||
if (resp.code === 0) {
|
||||
this.clubList = resp.data
|
||||
}
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
await this.getAllClub()
|
||||
await this.pageData()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
@@ -19,12 +19,12 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
|
||||
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="会员信息">
|
||||
<el-button size="small" type="primary" icon="el-icon-download" @click="exportRegistrationDoc">
|
||||
导出登记表
|
||||
</el-button>
|
||||
<el-button @click="openImport" size="small" type="primary">导入成员</el-button>
|
||||
<el-button size="small" type="primary" @click="openUserAdd(true)">录入成员</el-button>
|
||||
<el-button size="small" type="primary" @click="openUserAdd(false)">设置理事机构</el-button>
|
||||
<template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">
|
||||
<el-button size="small" type="primary" icon="el-icon-download" @click="exportRegistrationDoc">导出登记表</el-button>
|
||||
<el-button @click="openImport" size="small" type="primary">导入成员</el-button>
|
||||
<el-button size="small" type="primary" @click="openUserAdd(true)">录入成员</el-button>
|
||||
<el-button size="small" type="primary" @click="openUserAdd(false)">设置理事机构</el-button>
|
||||
</template>
|
||||
<el-radio-group @change="doSearch" style="margin-left: 10px" v-model="pageForm.radioType"
|
||||
size="small">
|
||||
<el-radio-button label="3">全部</el-radio-button>
|
||||
@@ -39,24 +39,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
|
||||
<el-table-column label="性别" prop="sex" show-overflow-tooltip sortable></el-table-column>
|
||||
<el-table-column label="电话" prop="mobile" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="所属单位" prop="unitName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="身份" prop="roleNames" show-overflow-tooltip></el-table-column>
|
||||
<!-- <el-table-column label="变更状态" prop="state"show-overflow-tooltip sortable>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.state==1">待校工会审核</span>
|
||||
<span v-else-if="scope.row.state==2">校工会审核拒绝</span>
|
||||
<span v-else-if="scope.row.state==3">审核通过</span>
|
||||
<span v-else-if="scope.row.state === '' || scope.row.state === undefined">暂无变更</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请状态" show-overflow-tooltip sortable>
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.status==1" size="mini" type="primary">待协会审核</el-tag>
|
||||
<el-tag v-if="scope.row.status==2" size="mini" type="danger">协会拒绝</el-tag>
|
||||
<el-tag v-if="scope.row.status==3" size="mini" type="primary">待校工会审核</el-tag>
|
||||
<el-tag v-if="scope.row.status==4" size="mini" type="danger">校工会拒绝</el-tag>
|
||||
<el-tag v-if="scope.row.status==5" size="mini" type="success">审核通过</el-tag>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
<el-table-column label="身份" prop="roleName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作">
|
||||
<template slot-scope="{row}">
|
||||
<el-dropdown>
|
||||
@@ -66,55 +49,8 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item @click.native="openAuth(row)">授权</el-dropdown-item>
|
||||
|
||||
<!-- <el-dropdown-item @click.native="updatePayed(row)" class="text-primary">-->
|
||||
<!-- {{row.payed === true ? '设置为未缴费' : '设置为缴费'}}-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item @click.native="updateGive(row)" class="text-primary">-->
|
||||
<!-- {{row.giveMoney === true ? '设置为不拨付' : '设置为拨付'}}-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!--v-if="row.changeRoleCode === '' || row.changeRoleCode === undefined || row.state !== 1"-->
|
||||
<!-- <template>-->
|
||||
<!-- <el-dropdown-item v-if="row.roleCode !== 'CLUB_PRESIDENT'"-->
|
||||
<!-- @click.native="updateRoleCode(row, 'CLUB_PRESIDENT', '会长')"-->
|
||||
<!-- class="text-primary">-->
|
||||
<!-- 设置会长-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item v-if="row.roleCode !== 'CLUB_VICE_PRESIDENT'"-->
|
||||
<!-- @click.native="updateRoleCode(row, 'CLUB_VICE_PRESIDENT', '副会长')"-->
|
||||
<!-- class="text-primary">-->
|
||||
<!-- 设置副会长-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item v-if="row.roleCode !== 'CLUB_SECRETARY'"-->
|
||||
<!-- @click.native="updateRoleCode(row, 'CLUB_SECRETARY', '秘书长')"-->
|
||||
<!-- class="text-primary">-->
|
||||
<!-- 设置秘书长-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item v-if="row.roleCode !== 'CLUB_VICE_SECRETARY'"-->
|
||||
<!-- @click.native="updateRoleCode(row, 'CLUB_VICE_SECRETARY', '副秘书长')"-->
|
||||
<!-- class="text-primary">-->
|
||||
<!-- 设置副秘书长-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item v-if="row.roleCode !== 'CLUB_OPERATOR'"-->
|
||||
<!-- @click.native="updateRoleCode(row, 'CLUB_OPERATOR', '操作员')"-->
|
||||
<!-- class="text-primary">-->
|
||||
<!-- 设置操作员-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item v-if="row.roleCode !== 'CLUB_MEMBER'"-->
|
||||
<!-- @click.native="updateRoleCode(row, 'CLUB_MEMBER', '会员')"-->
|
||||
<!-- class="text-primary">-->
|
||||
<!-- 设置会员-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- </template>-->
|
||||
<!-- <template v-else>
|
||||
<el-dropdown-item @click.native="rollbackChange(row)" class="text-primary">
|
||||
撤回变更
|
||||
</el-dropdown-item>
|
||||
</template>-->
|
||||
<!--<el-dropdown-item @click.native="viewInfo(row)">查看注册信息</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="exportInfo(row)">导出登记表</el-dropdown-item>-->
|
||||
<el-dropdown-item @click.native="userDelete(row)">删除</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="exitClub(row)">退会</el-dropdown-item>
|
||||
<!--<el-dropdown-item @click.native="exitClub(row)">退会</el-dropdown-item>-->
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
@@ -138,7 +74,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
|
||||
<el-form :model="formData" ref="userForm" :rules="userFormRules" label-width="80px">
|
||||
<el-form-item label="成员" prop="users">
|
||||
<el-select v-model="formData.users" style="width: 100%" multiple filterable
|
||||
remote reserve-keyword :remote-method="selectUser">
|
||||
placeholder="请根据姓名或工号选择" remote reserve-keyword :remote-method="selectUser">
|
||||
<el-option
|
||||
v-for="item in userOptions"
|
||||
:key="item.id"
|
||||
@@ -183,10 +119,10 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
|
||||
<el-dialog title="授权身份" :visible.sync="authDialogVisible" width="50%">
|
||||
<el-form :model="authFormData" ref="authForm" label-width="80px">
|
||||
<el-form-item label="姓名">
|
||||
<el-input v-model="authFormData.userName" disabled></el-input>
|
||||
<el-input placeholder="请输入姓名" v-model="authFormData.userName" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="工号">
|
||||
<el-input v-model="authFormData.loginName" disabled></el-input>
|
||||
<el-input placeholder="请输入工号" v-model="authFormData.loginName" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="身份" prop="roleCode"
|
||||
:rules="[{required: true, message: '请选择身份', trigger: 'blur'}]">
|
||||
@@ -250,7 +186,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
|
||||
userName: row.userName,
|
||||
loginName: row.loginName,
|
||||
clubId: row.clubId,
|
||||
roleCode: row.roleCode ? JSON.parse(row.roleCode) : []
|
||||
roleCode: row.roleCode
|
||||
}
|
||||
console.log(this.authFormData)
|
||||
},
|
||||
|
||||
@@ -27,8 +27,6 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
|
||||
<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="concatPersonName"></el-table-column> -->
|
||||
<!-- <el-table-column label="联系人电话" show-overflow-tooltip prop="concatPersonMobile"></el-table-column> -->
|
||||
<el-table-column label="当前人数" show-overflow-tooltip prop="currentNum"></el-table-column>
|
||||
<el-table-column label="成立时间" show-overflow-tooltip prop="foundTime"></el-table-column>
|
||||
<el-table-column label="状态" show-overflow-tooltip prop="dismiss">
|
||||
|
||||
@@ -31,41 +31,38 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="申请列表">
|
||||
<el-button type="primary" size="small" @click="openAdd">
|
||||
<i class="ti-plus"></i>
|
||||
上传报告
|
||||
</el-button>
|
||||
</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="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>
|
||||
</template>
|
||||
</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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="联系人" prop="concatPersonName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="换届报告" prop="replaceReport" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span style="color: #0e78c5; text-decoration: underline; cursor: pointer" @click="showFiles(scope.row)">
|
||||
{{getFileName(scope.row)}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核状态" prop="reportState" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span v-if="scope.row.reportState === 1">待校工会审核</span>
|
||||
<span v-if="scope.row.reportState === 2">校工会审核不通过</span>
|
||||
<span v-if="scope.row.reportState === 3">审核通过</span>
|
||||
</template>
|
||||
</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="processInstanceNodeName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="300px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="uploadRefreshReport(row)" size="mini" type="primary">上传换届报告</el-button>
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" @click="onEdit(row)" size="mini" type="primary">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="[50].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="onRevoke(row)"
|
||||
>
|
||||
撤销
|
||||
</el-button>
|
||||
<el-button v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" @click="onDelete(row)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button v-else-if="[10].includes(row.processInstanceNodeCode)" @click="onDelete(row)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -73,92 +70,121 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</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-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">
|
||||
<file-upload
|
||||
:value.sync="formData.files"
|
||||
:upload_number="1"
|
||||
upload_result_category="array"
|
||||
complete_result
|
||||
upload_mode="drag"
|
||||
accept=".doc,.docx,.pdf"
|
||||
></file-upload>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="float: right;margin: 20px 0">
|
||||
<el-button @click="$refs.guava.index()">取 消</el-button>
|
||||
<el-button type="primary" @click="onSubmit">提 交</el-button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<club-info ref="info"></club-info>
|
||||
<info ref="infoRef"></info>
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
<el-dialog width="40%" :visible.sync="refreshDialogVisible" title="上传换届报告">
|
||||
<file-upload
|
||||
:value.sync="replaceReport"
|
||||
:upload_number="1"
|
||||
upload_result_category="array"
|
||||
complete_result
|
||||
upload_mode="drag"
|
||||
accept=".doc,.docx,.pdf"
|
||||
></file-upload>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="refreshDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="refreshDo">确定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("../../common/clubInfoComponent.js"){}#-->
|
||||
<!--#include("info.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
"club-info": REGISTER_INFO_COMPONENT
|
||||
"info": clubRefreshInfo
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
refreshDialogVisible: false,
|
||||
replaceReport: [],
|
||||
clickRow: {}
|
||||
clubList: [],
|
||||
formData: {},
|
||||
formRules: {
|
||||
clubId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showFiles(row) {
|
||||
if (row.replaceReport && row.replaceReport.length > 0) {
|
||||
let res = row.replaceReport[0]
|
||||
let fileId = res?.response?.data.substring(res?.response?.data.lastIndexOf("=") + 1)
|
||||
let fileName = res?.name
|
||||
window.open(
|
||||
"/assets/platform/plugins/pdfJs/web/viewer.html?file=" + encodeURIComponent("/platform/sys/file/convertPDF?id=" + fileId),
|
||||
fileName
|
||||
)
|
||||
}
|
||||
openAdd() {
|
||||
this.$refs.guava.edit(() => {
|
||||
this.formData = {}
|
||||
})
|
||||
},
|
||||
getFileName(row) {
|
||||
if (row.replaceReport && row.replaceReport.length > 0) {
|
||||
return row.replaceReport[0].name
|
||||
} else {
|
||||
return ""
|
||||
}
|
||||
},
|
||||
async refreshDo() {
|
||||
const confirm = await this.$confirm("您确定要上传换届报告吗？", "提示", {
|
||||
onRevoke(row) {
|
||||
this.$confirm("您确定要撤回吗?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/refreshReport/refreshDo", {
|
||||
id: this.clickRow.id,
|
||||
replaceReport: JSON.stringify(this.replaceReport)
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
}).then(() => {
|
||||
this.$axios.post("/platform/club/infoManage/refreshReport/revokeApply", { id: row.id }).then((resp) => {
|
||||
this.$message.success(resp.msg)
|
||||
this.refreshDialogVisible = false
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
uploadRefreshReport(row) {
|
||||
this.clickRow = row
|
||||
this.replaceReport = []
|
||||
this.refreshDialogVisible = true
|
||||
},
|
||||
openView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.info.onOpen(row.id)
|
||||
})
|
||||
})
|
||||
},
|
||||
onEdit(row) {
|
||||
this.formData = clone(row)
|
||||
this.formData.files = JSON.parse(this.formData.files)
|
||||
this.$refs.guava.edit(() => {})
|
||||
},
|
||||
async onSubmit() {
|
||||
this.$refs.formRef.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$confirm("您确定要提交吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post('/platform/club/infoManage/refreshReport/submit', {
|
||||
data: JSON.stringify(this.formData)
|
||||
}).then(res => {
|
||||
if (res.code === 0) {
|
||||
this.pageData()
|
||||
this.$message.success(res.msg)
|
||||
this.$refs.guava.index()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
onDelete(row) {
|
||||
this.$confirm("您确定要删除吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post("/platform/club/infoManage/refreshReport/delete", { id: row.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success(res.msg)
|
||||
this.pageData()
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
onView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
})
|
||||
},
|
||||
async getMyClub() {
|
||||
const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole")
|
||||
this.clubList = resp.data
|
||||
},
|
||||
async pageData() {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/refreshReport/pageData", this.pageForm)
|
||||
if (resp.code === 0) {
|
||||
@@ -170,6 +196,7 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
await this.getMyClub()
|
||||
await this.pageData()
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
const clubRefreshInfo = {
|
||||
template: /*language=HTML*/ `
|
||||
<div>
|
||||
<div class="process-title">
|
||||
申请信息
|
||||
</div>
|
||||
<el-descriptions :column="3" border>
|
||||
<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">
|
||||
<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">
|
||||
<file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
|
||||
<span v-else>暂无附件</span>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
|
||||
<div class="process-title">
|
||||
{{nodeTask.nodeName}}
|
||||
</div>
|
||||
<div>
|
||||
<el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
|
||||
<el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
|
||||
task.actualOwnerUserName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核时间">{{ task.endOn }}</el-descriptions-item>
|
||||
<el-descriptions-item label="审核结果">
|
||||
<div v-if="task.extVariable">
|
||||
<el-tag type="success" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意
|
||||
</el-tag>
|
||||
<el-tag type="danger" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写
|
||||
</el-tag>
|
||||
<el-tag type="danger" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">拒绝
|
||||
</el-tag>
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`,
|
||||
data() {
|
||||
return {
|
||||
viewData: {},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onOpen(row) {
|
||||
this.$axios.post("/platform/club/infoManage/refreshReport/info", { id: row.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.viewData = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
style: /*language=CSS*/ `
|
||||
.el-descriptions-item__label {
|
||||
width: 200px;
|
||||
min-width: 200px;
|
||||
max-width: 200px;
|
||||
}
|
||||
.el-tabs__header {
|
||||
margin: 0;
|
||||
}
|
||||
`
|
||||
}
|
||||
@@ -31,42 +31,38 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="申请列表">
|
||||
<el-button type="primary" size="small" @click="openAdd">
|
||||
<i class="ti-plus"></i>
|
||||
章程修订
|
||||
</el-button>
|
||||
</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="typeName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="申请时间" prop="createTime" sortable show-overflow-tooltip>
|
||||
<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="processInstanceNodeName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="300px">
|
||||
<template slot-scope="{row}">
|
||||
<span>{{ $moment(row.createTime).format('YYYY-MM-DD') }}</span>
|
||||
</template>
|
||||
</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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="联系人" prop="concatPersonName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="协会章程" prop="afterRulesFile" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span style="color: #0e78c5; text-decoration: underline; cursor: pointer" @click="showFiles(scope.row)">
|
||||
{{getFileName(scope.row)}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="审核状态" prop="ruleState" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span v-if="scope.row.ruleState === 1">待校工会审核</span>
|
||||
<span v-if="scope.row.ruleState === 2">校工会审核不通过</span>
|
||||
<span v-if="scope.row.ruleState === 3">审核通过</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" width="200px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="uploadRule(row)" size="mini" type="primary">章程修订</el-button>
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" @click="onEdit(row)" size="mini" type="primary">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="[50].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="onRevoke(row)"
|
||||
>
|
||||
撤销
|
||||
</el-button>
|
||||
<el-button v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" @click="onDelete(row)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button v-else-if="[10].includes(row.processInstanceNodeCode)" @click="onDelete(row)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -74,96 +70,121 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</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-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">
|
||||
<file-upload
|
||||
:value.sync="formData.files"
|
||||
:upload_number="1"
|
||||
upload_result_category="array"
|
||||
complete_result
|
||||
upload_mode="drag"
|
||||
accept=".doc,.docx,.pdf"
|
||||
></file-upload>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="float: right;margin: 20px 0">
|
||||
<el-button @click="$refs.guava.index()">取 消</el-button>
|
||||
<el-button type="primary" @click="onSubmit">提 交</el-button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<club-info ref="info"></club-info>
|
||||
<info ref="infoRef"></info>
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
<el-dialog width="40%" :visible.sync="ruleDialogVisible" title="章程修订">
|
||||
<file-upload
|
||||
:value.sync="ruleReport"
|
||||
:upload_number="1"
|
||||
upload_result_category="array"
|
||||
complete_result
|
||||
upload_mode="drag"
|
||||
accept=".doc,.docx,.pdf"
|
||||
></file-upload>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="ruleDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="ruleDo">确定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("../../common/clubInfoComponent.js"){}#-->
|
||||
<!--#include("info.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
"club-info": REGISTER_INFO_COMPONENT
|
||||
"info": clubRuleInfo,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
ruleDialogVisible: false,
|
||||
ruleReport: [],
|
||||
clickRow: {}
|
||||
clubList: [],
|
||||
formData: {},
|
||||
formRules: {
|
||||
clubId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showFiles(row) {
|
||||
if (row.afterRulesFile && row.afterRulesFile.length > 0) {
|
||||
let res = row.afterRulesFile[0]
|
||||
let fileId = res?.response?.data.substring(res?.response?.data.lastIndexOf("=") + 1)
|
||||
let fileName = res?.name
|
||||
window.open(
|
||||
"/assets/platform/plugins/pdfJs/web/viewer.html?file=" + encodeURIComponent("/platform/sys/file/convertPDF?id=" + fileId),
|
||||
fileName
|
||||
)
|
||||
}
|
||||
openAdd() {
|
||||
this.$refs.guava.edit(() => {
|
||||
this.formData = {}
|
||||
})
|
||||
},
|
||||
getFileName(row) {
|
||||
if (row.afterRulesFile && row.afterRulesFile.length > 0) {
|
||||
return row.afterRulesFile[0].name
|
||||
} else {
|
||||
return ""
|
||||
}
|
||||
},
|
||||
async ruleDo() {
|
||||
const confirm = await this.$confirm("您确定要修订章程吗？", "提示", {
|
||||
onRevoke(row) {
|
||||
this.$confirm("您确定要撤回吗?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/ruleUpdate/ruleDo", {
|
||||
id: this.clickRow.id,
|
||||
afterRulesFile: JSON.stringify(this.ruleReport)
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
}).then(() => {
|
||||
this.$axios.post("/platform/club/infoManage/ruleUpdate/revokeApply", { id: row.id }).then((resp) => {
|
||||
this.$message.success(resp.msg)
|
||||
this.ruleDialogVisible = false
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
uploadRule(row) {
|
||||
/*if(row.afterRulesFile && row.ruleState === 1) {
|
||||
this.$message.warning('您已上传新的协会章程，待校工会审核')
|
||||
return
|
||||
}*/
|
||||
this.clickRow = row
|
||||
this.ruleReport = []
|
||||
this.ruleDialogVisible = true
|
||||
},
|
||||
openView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.info.onOpen(row.id)
|
||||
})
|
||||
})
|
||||
},
|
||||
onEdit(row) {
|
||||
this.formData = clone(row)
|
||||
this.formData.files = JSON.parse(this.formData.files)
|
||||
this.$refs.guava.edit(() => {})
|
||||
},
|
||||
async onSubmit() {
|
||||
this.$refs.formRef.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$confirm("您确定要提交吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post('/platform/club/infoManage/ruleUpdate/submit', {
|
||||
data: JSON.stringify(this.formData)
|
||||
}).then(res => {
|
||||
if (res.code === 0) {
|
||||
this.pageData()
|
||||
this.$message.success(res.msg)
|
||||
this.$refs.guava.index()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
onDelete(row) {
|
||||
this.$confirm("您确定要删除吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post("/platform/club/infoManage/ruleUpdate/delete", { id: row.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success(res.msg)
|
||||
this.pageData()
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
onView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
})
|
||||
},
|
||||
async getMyClub() {
|
||||
const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole")
|
||||
this.clubList = resp.data
|
||||
},
|
||||
async pageData() {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/ruleUpdate/pageData", this.pageForm)
|
||||
if (resp.code === 0) {
|
||||
@@ -175,6 +196,7 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
await this.getMyClub()
|
||||
await this.pageData()
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
const clubRuleInfo = {
|
||||
template: /*language=HTML*/ `
|
||||
<div>
|
||||
<div class="process-title">
|
||||
申请信息
|
||||
</div>
|
||||
<el-descriptions :column="3" border>
|
||||
<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">
|
||||
<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">
|
||||
<file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
|
||||
<span v-else>暂无附件</span>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<div v-for="nodeTask in viewData.nodeTasks" :key="nodeTask.id">
|
||||
<div class="process-title">
|
||||
{{nodeTask.nodeName}}
|
||||
</div>
|
||||
<div>
|
||||
<el-descriptions :column="3" border v-for="task in nodeTask.tasks" :key="task.id">
|
||||
<el-descriptions-item label="审核人">{{ task.actualOwnerLoginName + '-' +
|
||||
task.actualOwnerUserName }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核时间">{{ task.endOn }}</el-descriptions-item>
|
||||
<el-descriptions-item label="审核结果">
|
||||
<div v-if="task.extVariable">
|
||||
<el-tag type="success" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'PASS'">同意
|
||||
</el-tag>
|
||||
<el-tag type="danger" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'BACK'">退回重新填写
|
||||
</el-tag>
|
||||
<el-tag type="danger" size="mini"
|
||||
v-if="task.extVariable.bpmTaskApprovalType === 'REJECT'">拒绝
|
||||
</el-tag>
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`,
|
||||
data() {
|
||||
return {
|
||||
viewData: {},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onOpen(row) {
|
||||
this.$axios.post("/platform/club/infoManage/ruleUpdate/info", { id: row.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.viewData = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
style: /*language=CSS*/ `
|
||||
.el-descriptions-item__label {
|
||||
width: 200px;
|
||||
min-width: 200px;
|
||||
max-width: 200px;
|
||||
}
|
||||
.el-tabs__header {
|
||||
margin: 0;
|
||||
}
|
||||
`
|
||||
}
|
||||
+85
-91
@@ -31,40 +31,32 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="申请列表">
|
||||
<el-radio-group v-model="pageForm.audit" size="small" @change="doSearch">
|
||||
<el-radio-button :label="true">已审核</el-radio-button>
|
||||
<el-radio-button :label="false">未审核</el-radio-button>
|
||||
</el-radio-group>
|
||||
</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="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>
|
||||
</template>
|
||||
</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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="联系人" prop="concatPersonName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="换届报告" prop="replaceReport" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span style="color: #0e78c5; text-decoration: underline; cursor: pointer" @click="showFiles(scope.row)">
|
||||
{{getFileName(scope.row)}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核状态" prop="ruleState" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span v-if="scope.row.reportState === 1">待校工会审核</span>
|
||||
<span v-if="scope.row.reportState === 2">校工会审核不通过</span>
|
||||
<span v-if="scope.row.reportState === 3">审核通过</span>
|
||||
</template>
|
||||
</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="processInstanceNodeName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="audit(row)" size="mini" type="primary">审核</el-button>
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="onApproval(row)" size="mini" type="primary">
|
||||
审核
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
|
||||
@click="onRevoke(row.processInstanceTaskId)"
|
||||
size="mini"
|
||||
type="danger"
|
||||
>
|
||||
撤回
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -72,88 +64,90 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<club-info ref="info"></club-info>
|
||||
<template #public>
|
||||
<info ref="infoRef"></info>
|
||||
<div v-if="showApprovalForm">
|
||||
<div class="process-title">{{formData.processInstanceNodeName}}</div>
|
||||
<el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
|
||||
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row type="flex" justify="end">
|
||||
<el-button plain @click="$refs.guava.index()">取消</el-button>
|
||||
<el-button type="danger" @click="doApproval('BACK')">退回</el-button>
|
||||
<el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
|
||||
<el-button type="primary" @click="doApproval('PASS')">同意</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
<el-dialog width="40%" :visible.sync="dialogVisible" title="校工会审核">
|
||||
<el-descriptions :column="2" border class="table_fixed">
|
||||
<el-descriptions-item label="换届报告">
|
||||
<file-preview :files="clickRow.replaceReport" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button @click="auditDo(false)" type="primary">不通过</el-button>
|
||||
<el-button type="primary" @click="auditDo(true)">通过</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("../../common/clubInfoComponent.js"){}#-->
|
||||
<!--#include("../refreshReport/info.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
dicts: ["PROCESS_INSTANCE_STATE"],
|
||||
components: {
|
||||
"club-info": REGISTER_INFO_COMPONENT
|
||||
"info": clubRefreshInfo,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
clickRow: {},
|
||||
clubId: ""
|
||||
pageForm: {
|
||||
clubId: "",
|
||||
year: this.$moment().format("YYYY"),
|
||||
audit: false
|
||||
},
|
||||
formData: {},
|
||||
showApprovalForm: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showFiles(row) {
|
||||
if (row.replaceReport && row.replaceReport.length > 0) {
|
||||
let res = row.replaceReport[0]
|
||||
let fileId = res?.response?.data.substring(res?.response?.data.lastIndexOf("=") + 1)
|
||||
let fileName = res?.name
|
||||
window.open(
|
||||
"/assets/platform/plugins/pdfJs/web/viewer.html?file=" + encodeURIComponent("/platform/sys/file/convertPDF?id=" + fileId),
|
||||
fileName
|
||||
)
|
||||
}
|
||||
onView(row) {
|
||||
this.$refs.guava.public(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
this.showApprovalForm = false
|
||||
})
|
||||
},
|
||||
getFileName(row) {
|
||||
if (row.replaceReport && row.replaceReport.length > 0) {
|
||||
return row.replaceReport[0].name
|
||||
} else {
|
||||
return ""
|
||||
}
|
||||
onApproval(row) {
|
||||
this.$refs.guava.public(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
this.formData = row.approvalParam
|
||||
this.showApprovalForm = true
|
||||
})
|
||||
},
|
||||
async auditDo(pass) {
|
||||
const str = pass ? "通过" : "不通过"
|
||||
const confirm = await this.$confirm("您确定要审核" + str + "吗？", "提示", {
|
||||
doApproval(approvalType) {
|
||||
this.formData.bpmTaskApprovalType = approvalType
|
||||
this.$refs.approvalFormRef.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$axios
|
||||
.post(loc() + "/approval", {
|
||||
approval: JSON.stringify(this.formData)
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$refs.guava.index()
|
||||
this.$message.success(res.msg)
|
||||
this.doSearch()
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
onRevoke(taskId) {
|
||||
this.$confirm("您确定要撤回吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/schoolAuditReport/auditDo", {
|
||||
id: this.clickRow.id,
|
||||
pass: pass
|
||||
type: "info"
|
||||
}).then(() => {
|
||||
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success(res.msg)
|
||||
this.doSearch()
|
||||
}
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.dialogVisible = false
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
audit(row) {
|
||||
this.clickRow = clone(row)
|
||||
this.dialogVisible = true
|
||||
},
|
||||
openView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.info.onOpen(row.id)
|
||||
})
|
||||
},
|
||||
async pageData() {
|
||||
|
||||
@@ -31,40 +31,32 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool label="申请列表">
|
||||
<el-radio-group v-model="pageForm.audit" size="small" @change="doSearch">
|
||||
<el-radio-button :label="true">已审核</el-radio-button>
|
||||
<el-radio-button :label="false">未审核</el-radio-button>
|
||||
</el-radio-group>
|
||||
</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="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>
|
||||
</template>
|
||||
</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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="联系人" prop="concatPersonName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="协会章程" prop="afterRulesFile" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span style="color: #0e78c5; text-decoration: underline; cursor: pointer" @click="showFiles(scope.row)">
|
||||
{{getFileName(scope.row)}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核状态" prop="ruleState" sortable show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
<span v-if="scope.row.ruleState === 1">待校工会审核</span>
|
||||
<span v-if="scope.row.ruleState === 2">校工会审核不通过</span>
|
||||
<span v-if="scope.row.ruleState === 3">审核通过</span>
|
||||
</template>
|
||||
</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="processInstanceNodeName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="audit(row)" size="mini" type="primary">审核</el-button>
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="onApproval(row)" size="mini" type="primary">
|
||||
审核
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
|
||||
@click="onRevoke(row.processInstanceTaskId)"
|
||||
size="mini"
|
||||
type="danger"
|
||||
>
|
||||
撤回
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -72,91 +64,90 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<club-info ref="info"></club-info>
|
||||
<template #public>
|
||||
<info ref="infoRef"></info>
|
||||
<div v-if="showApprovalForm">
|
||||
<div class="process-title">{{formData.processInstanceNodeName}}</div>
|
||||
<el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
|
||||
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row type="flex" justify="end">
|
||||
<el-button plain @click="$refs.guava.index()">取消</el-button>
|
||||
<el-button type="danger" @click="doApproval('BACK')">退回</el-button>
|
||||
<el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
|
||||
<el-button type="primary" @click="doApproval('PASS')">同意</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
<el-dialog width="40%" :visible.sync="dialogVisible" title="校工会审核">
|
||||
<el-descriptions :column="2" border class="table_fixed">
|
||||
<el-descriptions-item :span="2" label="旧协会章程">
|
||||
<file-preview :files="clickRow.rulesFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="新协会章程">
|
||||
<file-preview :files="clickRow.afterRulesFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button @click="auditDo(false)" type="primary">不通过</el-button>
|
||||
<el-button type="primary" @click="auditDo(true)">通过</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
<!--#include("../../common/clubInfoComponent.js"){}#-->
|
||||
<!--#include("../ruleUpdate/info.js"){}#-->
|
||||
new Vue({
|
||||
el: "#app",
|
||||
mixins: [initTableMixins],
|
||||
dicts: ["PROCESS_INSTANCE_STATE"],
|
||||
components: {
|
||||
"club-info": REGISTER_INFO_COMPONENT
|
||||
"info": clubRuleInfo,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
clickRow: {},
|
||||
clubId: ""
|
||||
pageForm: {
|
||||
clubId: "",
|
||||
year: this.$moment().format("YYYY"),
|
||||
audit: false
|
||||
},
|
||||
formData: {},
|
||||
showApprovalForm: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showFiles(row) {
|
||||
if (row.afterRulesFile && row.afterRulesFile.length > 0) {
|
||||
let res = row.afterRulesFile[0]
|
||||
let fileId = res?.response?.data.substring(res?.response?.data.lastIndexOf("=") + 1)
|
||||
let fileName = res?.name
|
||||
window.open(
|
||||
"/assets/platform/plugins/pdfJs/web/viewer.html?file=" + encodeURIComponent("/platform/sys/file/convertPDF?id=" + fileId),
|
||||
fileName
|
||||
)
|
||||
}
|
||||
onView(row) {
|
||||
this.$refs.guava.public(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
this.showApprovalForm = false
|
||||
})
|
||||
},
|
||||
getFileName(row) {
|
||||
if (row.afterRulesFile && row.afterRulesFile.length > 0) {
|
||||
return row.afterRulesFile[0].name
|
||||
} else {
|
||||
return ""
|
||||
}
|
||||
onApproval(row) {
|
||||
this.$refs.guava.public(() => {
|
||||
this.$refs.infoRef.onOpen(row)
|
||||
this.formData = row.approvalParam
|
||||
this.showApprovalForm = true
|
||||
})
|
||||
},
|
||||
async auditDo(pass) {
|
||||
const str = pass ? "通过" : "不通过"
|
||||
const confirm = await this.$confirm("您确定要审核" + str + "吗？", "提示", {
|
||||
doApproval(approvalType) {
|
||||
this.formData.bpmTaskApprovalType = approvalType
|
||||
this.$refs.approvalFormRef.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$axios
|
||||
.post(loc() + "/approval", {
|
||||
approval: JSON.stringify(this.formData)
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$refs.guava.index()
|
||||
this.$message.success(res.msg)
|
||||
this.doSearch()
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
onRevoke(taskId) {
|
||||
this.$confirm("您确定要撤回吗？", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await this.$axios.post("/platform/club/infoManage/schoolAuditRule/auditDo", {
|
||||
id: this.clickRow.id,
|
||||
pass: pass
|
||||
type: "info"
|
||||
}).then(() => {
|
||||
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success(res.msg)
|
||||
this.doSearch()
|
||||
}
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.dialogVisible = false
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
},
|
||||
audit(row) {
|
||||
this.clickRow = clone(row)
|
||||
this.dialogVisible = true
|
||||
},
|
||||
openView(row) {
|
||||
this.$refs.guava.view(() => {
|
||||
this.$refs.info.onOpen(row.id)
|
||||
})
|
||||
},
|
||||
async pageData() {
|
||||
|
||||
@@ -174,7 +174,7 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
checkApplyClub(val) {
|
||||
this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: val }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
if (res.code !== 0) {
|
||||
if (res.data) {
|
||||
this.$message.warning("您已申请加入该协会，请勿重复申请")
|
||||
this.formData.clubId = ""
|
||||
|
||||
@@ -44,60 +44,23 @@ layout("/layouts/platform.html"){
|
||||
<template #view>
|
||||
<el-tabs tab-position="top" v-model="activeName">
|
||||
<el-tab-pane label="协会基础信息" name="1">
|
||||
<el-descriptions style="margin-top: 20px;" class="margin-top" title="" :column="3" border>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">协会名称</template>
|
||||
<div v-html="viewData.clubName"></div>
|
||||
</el-descriptions-item>
|
||||
<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.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.sponsorName}}</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">报名联系人</template>
|
||||
{{viewData.concatPersonName}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">联系人电话</template>
|
||||
{{viewData.concatPersonMobile}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">联系人邮箱</template>
|
||||
{{viewData.concatPersonEmail}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">会费标准</template>
|
||||
{{viewData.due}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">当前人数</template>
|
||||
{{viewData.currentPeopleNum}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="3">
|
||||
<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>
|
||||
<div class="text-left" v-html="viewData.introduce"></div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="3">
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">协会宗旨</template>
|
||||
<div class="text-left" v-html="viewData.purpose"></div>
|
||||
</el-descriptions-item>
|
||||
<!--<el-descriptions-item span="1.5">
|
||||
<template slot="label">QQ群二维码</template>
|
||||
<file-upload
|
||||
v-if="viewData.QQGroupCode && viewData.QQGroupCode.length > 0"
|
||||
:files="JSON.parse(viewData.QQGroupCode)"
|
||||
:view="true"
|
||||
></file-upload>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">微信群二维码</template>
|
||||
<file-upload
|
||||
v-if="viewData.wechatGroupCode && viewData.wechatGroupCode.length > 0"
|
||||
:files="JSON.parse(viewData.wechatGroupCode)"
|
||||
:view="true"
|
||||
></file-upload>
|
||||
</el-descriptions-item>-->
|
||||
<el-descriptions-item span="1.5">
|
||||
<template slot="label">协会章程</template>
|
||||
<file-preview :files="viewData.rulesFile" complete_result></file-preview>
|
||||
</el-descriptions-item>
|
||||
|
||||
@@ -10,7 +10,7 @@ const CLUB_FORM_TEMPLATE = {
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="协会编码" prop="clubCode">
|
||||
<el-input placeholder="请输入协会编码" v-model="formData.clubCode" disabled></el-input>
|
||||
<el-input placeholder="请输入协会编码" v-model="formData.clubCode"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
@@ -103,12 +103,12 @@ layout("/layouts/platform.html"){
|
||||
let formData = {}
|
||||
try {
|
||||
let hz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_PRESIDENT)
|
||||
if (hz.length > 1) {
|
||||
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) {
|
||||
if (msz.length !== 1) {
|
||||
this.$message.warning({ title: "警告", message: "秘书长只能有1人" })
|
||||
return
|
||||
}
|
||||
@@ -173,6 +173,11 @@ layout("/layouts/platform.html"){
|
||||
await this.userRemoteMethod(resp.data.concatPerson)
|
||||
let formData = resp.data
|
||||
if (resp.data.clubUser.length > 0) {
|
||||
resp.data.clubUser.forEach(item => {
|
||||
if(item.roleCode) {
|
||||
item.roleCode = JSON.parse(item.roleCode)[0]
|
||||
}
|
||||
})
|
||||
resp.data.clubUser = resp.data.clubUser.filter((o) => o.roleCode !== "CLUB_MEMBER")
|
||||
}
|
||||
this.$refs.clubManagerRef.managePerson = clone(resp.data.clubUser)
|
||||
@@ -198,7 +203,7 @@ layout("/layouts/platform.html"){
|
||||
this.$refs.clubSponsorRef.sponsorData.push(row)
|
||||
})
|
||||
this.$refs.clubFormRef.formData = formData
|
||||
await this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
|
||||
//await this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
|
||||
}
|
||||
} else {
|
||||
$.post("/platform/club/register/clubRegisterApply/createCode").then((res) => {
|
||||
|
||||
@@ -56,7 +56,7 @@ layout("/layouts/platform.html"){
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
v-if="[50].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
|
||||
size="mini"
|
||||
type="danger"
|
||||
@click="openRevoke(row)"
|
||||
|
||||
@@ -7,13 +7,13 @@ layout("/layouts/platform.html"){
|
||||
<el-row style="padding-right: 10px">
|
||||
<el-card shadow="never">
|
||||
<search @search="doSearch">
|
||||
<search-item label="年审状态：">
|
||||
<!--<search-item label="年审状态：">
|
||||
<el-select @change="getClub" v-model="pageForm.auditState" placeholder="请选择年审状态">
|
||||
<el-option label="全部" :value="null"></el-option>
|
||||
<el-option label="年审通过" :value="true"></el-option>
|
||||
<el-option label="年审未通过" :value="false"></el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
</search-item>-->
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user