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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-08-25 10:26:01 +08:00
parent fcd57ead6c
commit dde0dc9610
70 changed files with 1863 additions and 2739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/club/applyJoin/apply/index.html
-302
View File
@@ -1,302 +0,0 @@
<!--#
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-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
></el-input>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool label="协会列表">
<el-radio-group v-model="hasJoin" @change="joinChange" size="small">
<el-radio-button :label="false">{{'可加入协会' + noJoinCount + '（入会）'}}</el-radio-button>
<el-radio-button :label="true">{{'已加入协会' + hasJoinCount + '（退会）'}}</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="协会编码" sortable prop="clubCode"></el-table-column>
<el-table-column label="协会名称" prop="clubName" show-overflow-tooltip width="200px"></el-table-column>
<el-table-column label="成立时间" prop="foundTime"></el-table-column>
<el-table-column label="会长" prop="clubLeader" show-overflow-tooltip></el-table-column>
<el-table-column label="秘书长" prop="clubSecretary" show-overflow-tooltip></el-table-column>
<!-- <el-table-column sortable label="联系人" show-overflow-tooltip prop="concatPersonName"></el-table-column>-->
<!-- <el-table-column label="联系人电话" show-overflow-tooltip prop="concatPersonMobile"></el-table-column>-->
<el-table-column sortable label="当前人数" show-overflow-tooltip prop="currentPeopleNum"></el-table-column>
<!-- <el-table-column label="在职人数" show-overflow-tooltip prop="workNum"></el-table-column>-->
<!-- <el-table-column label="退休人数" show-overflow-tooltip prop="retireNum"></el-table-column>-->
<!-- <el-table-column v-if="hasJoin === true" label="入会状态" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag size="mini" v-if="scope.row.status==1" type="primary">待协会审核</el-tag>-->
<!-- <el-tag size="mini" type="danger" v-if="scope.row.status==2">协会不通过</el-tag>-->
<!-- <el-tag size="mini" v-if="scope.row.status==3" type="primary">待校工会审核</el-tag>-->
<!-- <el-tag size="mini" type="danger" v-if="scope.row.status==4">校工会不通过</el-tag>-->
<!-- <el-tag size="mini" v-if="scope.row.status==5" type="success">审核通过</el-tag>-->
<!-- <el-tag size="mini" type="info" v-if="!scope.row.status">暂无</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column v-if="hasJoin === true" label="退会状态" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag size="mini" type="primary" v-if="scope.row.exitStatus==1">待协会审核</el-tag>-->
<!-- <el-tag size="mini" type="danger" v-if="scope.row.exitStatus==2">协会不通过</el-tag>-->
<!-- <el-tag size="mini" type="primary" v-if="scope.row.exitStatus==3">待校工会审核</el-tag>-->
<!-- <el-tag size="mini" type="danger" v-if="scope.row.exitStatus==4">校工会不通过</el-tag>-->
<!-- <el-tag size="mini" type="success" v-if="scope.row.exitStatus==5">审核通过</el-tag>-->
<!-- <el-tag size="mini" type="info" v-if="!scope.row.exitStatus">暂无</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" width="250px">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="openDetail(scope.row)">查看</el-button>
<el-button size="mini" v-if="hasJoin === false" type="primary" @click="doSubmit(scope.row)">申请加入</el-button>
<!-- <el-button size="mini" v-if="hasJoin === true && scope.row.status == 1" type="danger" @click="doRevocation(scope.row.id)">-->
<!-- 撤销加入申请-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- v-if="hasJoin === true && scope.row.status==5 && !scope.row.exitStatus"-->
<!-- type="primary"-->
<!-- @click="exitClub(scope.row)"-->
<!-- >-->
<!-- 申请退会-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- v-if="hasJoin === true && scope.row.status!=1 && scope.row.exitStatus==1"-->
<!-- type="danger"-->
<!-- @click="cancelExitClub(scope.row.id)"-->
<!-- >-->
<!-- 撤销退会申请-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
<template #view>
<el-descriptions 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-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 :span="2">
<template slot="label">当前人数</template>
{{viewData.currentPeopleNum}}
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">协会介绍</template>
<div class="text-left" v-html="viewData.introduce"></div>
</el-descriptions-item>
<el-descriptions-item span="3">
<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>
<el-descriptions-item span="2">
<template slot="label">年度活动计划</template>
<file-preview :files="viewData.yearPlanFile" complete_result></file-preview>
</el-descriptions-item>
</el-descriptions>
</template>
</guava>
</div>
<script>
new Vue({
el: "#app",
store,
mixins: [initTableMixins],
components: {},
data() {
return {
viewData: {},
hasJoin: false,
hasJoinCount: 0,
noJoinCount: 0,
clickRow: {}
}
},
methods: {
async doSubmit(row) {
this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: row.id }).then((res) => {
if (res.code === 0) {
this.$store.dispatch("pjaxRoute", "/platform/club/join/apply?clubId=" + row.id)
}
})
// const { code, data, msg } = await this.$axios.post("/platform/club/applyJoin/apply/getInClubByCurUser")
// if (code !== 0) {
// this.$message.warning(msg)
// return
// }
// let str = "您还没有参加协会"
// if (data && data.length > 0) {
// str = "您已经加入了"
// data.forEach((item) => {
// str += "【" + item.clubName + "】"
// })
// }
// str += "，请确认是否申请加入【" + row.clubName + "】？"
// const confirm = await this.$confirm(str, "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// })
// if (confirm === "confirm") {
// const resp = await this.$axios.post("/platform/club/applyJoin/apply/submit", { id: row.id })
// if (resp.code === 0) {
// this.$message.success(resp.msg)
// await this.getCount()
// await this.pageData()
// } else {
// this.$message.warning(resp.msg)
// }
// }
},
async exitClub(row) {
const confirm = await this.$confirm("您确定要申请退会吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/applyJoin/apply/exitClub", { id: row.id })
if (resp.code === 0) {
await this.getCount()
this.pageData()
await this.$message.success(resp.msg)
} else {
this.$message.warning(resp.msg)
}
}
},
async cancelExitClub(id) {
const confirm = await this.$confirm("您确定要撤销申请吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/applyJoin/apply/cancelExitClub", { id: id })
if (resp.code === 0) {
await this.getCount()
await this.pageData()
this.$message.success(resp.msg)
} else {
this.$message.warning(resp.msg)
}
}
},
async doRevocation(id) {
const confirm = await this.$confirm("您确认要撤销申请吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/applyJoin/apply/revocation", { id: id })
if (resp.code === 0) {
this.$message.success(resp.msg)
await this.getCount()
await this.pageData()
} else {
this.$message.warning(resp.msg)
}
}
},
async openDetail(row) {
const resp = await this.$axios.post("/platform/club/applyJoin/apply/findOne", { id: row.id })
if (resp.code === 0) {
this.viewData = resp.data
this.$refs.guava.view()
} else {
this.$message.warning(resp.msg)
}
},
joinChange(val) {
this.pageForm.hasJoin = val
this.tableData = []
this.doSearch()
},
async getCount() {
const resp = await this.$axios.post("/platform/club/applyJoin/apply/getCount")
this.hasJoinCount = resp.data.hasJoinCount
this.noJoinCount = resp.data.noJoinCount
},
pageData() {
this.pageForm.hasJoin = this.hasJoin
this.$axios.post("/platform/club/applyJoin/apply/pageData", this.pageForm).then((res) => {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
})
}
},
async created() {
await this.getCount()
await this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/applyJoin/clubAudit/index.html
-213
View File
@@ -1,213 +0,0 @@
<!--#
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-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="协会：">
<el-select clearable filterable placeholder="请选择协会" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id" :key="item.id" v-for="item in clubOptions"></el-option>
</el-select>
</search-item>
<search-item label="人员类型：">
<dict-select code="PERSON_TYPE" placeholder="请选择人员类型" clearable v-model="pageForm.personType"></dict-select>
</search-item>
<search-item label="人员状态：">
<dict-select clearable code="USER_STATE" placeholder="请选择人员状态" v-model="pageForm.userState"></dict-select>
</search-item>
<search-item label="所属单位：">
<el-select clearable filterable placeholder="请选择所属单位" v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id" :key="item.id" v-for="item in unitList"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card class="mt10" shadow="never">
<table-tool label="申请列表">
<el-radio-group @change="(val) => doSearch()" style="margin-right: 10px" v-model="pageForm.applyType" size="small">
<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: 10px" v-model="pageForm.auditType" size="small">
<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 @click="openPayed(true)" sizi="small" type="success" size="small">通过</el-button>
<el-button @click="openPayed(false)" sizi="small" type="danger" size="small">不通过</el-button>
</table-tool>
<el-table
:data="tableData"
@selection-change="handleSelectionChange"
@sort-change="pageOrder"
ref="multipleTable"
row-key="id"
style="width: 100%"
>
<el-table-column
:reserve-selection="true"
:selectable="(row, index) => {return row.status === 1 || row.exitStatus === 1}"
type="selection"
v-if="pageForm.auditType !== 2"
width="55"
></el-table-column>
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="协会名称" prop="clubName" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="工号" prop="loginName" sortable width="100"></el-table-column>
<el-table-column label="姓名" prop="userName" sortable width="100"></el-table-column>
<el-table-column label="性别" prop="sex" sortable width="80"></el-table-column>
<el-table-column label="年龄" prop="birthday" width="60">
<template slot-scope="scope">
<span>{{getAge(scope.row)}}</span>
</template>
</el-table-column>
<el-table-column label="电话" prop="mobile" width="120"></el-table-column>
<el-table-column label="是否会员" prop="status" width="80">
<template slot-scope="scope">
<span v-if="scope.row.status != 5">否</span>
<span style="color: #236eb4" v-if="scope.row.status === 5">是</span>
</template>
</el-table-column>
<el-table-column label="人员类型" prop="personType" show-overflow-tooltip></el-table-column>
<el-table-column label="所属单位" prop="unitName" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="申请时间" prop="joinTime" show-overflow-tooltip sortable></el-table-column>
<el-table-column v-if="pageForm.applyType === 1" label="入会状态" prop="status">
<template slot-scope="scope">
<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" 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>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
</guava>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="payDialogVisible" title="是否缴费" width="30%">
<el-form label-width="80px">
<el-form-item label="是否缴费" prop="payed">
<el-radio :label="true" border v-model="payed">已缴费</el-radio>
<el-radio :label="false" border v-model="payed">未缴费</el-radio>
</el-form-item>
</el-form>
<span class="dialog-footer" slot="footer">
<el-button @click="payDialogVisible = false">取 消</el-button>
<el-button @click="doAudit" type="primary">确 定</el-button>
</span>
</el-dialog>
</div>
<script>
new Vue({
el: "#app",
store,
mixins: [initTableMixins],
components: {},
data() {
return {
unitList: [],
clubOptions: [],
multipleSelection: [],
pageForm: {
auditType: 3,
applyType: 1
},
auditResult: false,
payDialogVisible: false,
payed: false
}
},
methods: {
openPayed(flag) {
if (!this.multipleSelection.length) {
this.$message.warning("请先勾选需要进行审核的人员")
return
}
this.auditResult = flag
if (this.pageForm.applyType === 1) {
this.payDialogVisible = true
} else {
this.doAudit()
}
},
async doAudit() {
const ids = this.multipleSelection.map((v) => {
return v.id
})
const confirm = await this.$confirm("您确定要提交审核吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/applyJoin/clubAudit/doAudit", {
ids: JSON.stringify(ids),
auditResult: this.auditResult,
auditType: 1,
applyType: this.pageForm.applyType,
payed: this.payed
})
if (resp.code === 0) {
this.$message.success(resp.msg)
this.multipleSelection = []
this.$refs.multipleTable.clearSelection()
this.payDialogVisible = false
this.doSearch()
} else {
this.$message.warning(resp.msg)
}
}
},
getAge(row) {
if (row.birthday === null || row.birthday === undefined) {
return
}
const birthdayTime = new Date(row.birthday).getTime()
const nowTime = new Date().getTime()
return Math.ceil((nowTime - birthdayTime) / 31536000000)
},
handleSelectionChange(val) {
this.multipleSelection = val
},
async getMyMangeClub() {
const { data } = await this.$axios.post("/platform/club/applyJoin/clubAudit/getMyMangeClub")
return data
},
pageData() {
this.pageForm.source = 1
this.$axios.post("/platform/club/applyJoin/clubAudit/pageData", this.pageForm).then((res) => {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
})
}
},
async created() {
this.unitList = await this.$businessTool.listUnit()
this.clubOptions = await this.getMyMangeClub()
await this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/common/clubInfoComponent.js
+77 -70
View File
@@ -3,8 +3,11 @@ const REGISTER_INFO_COMPONENT = {
<div>
<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">
<div class="process-title">
协会信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border class="table_fixed">
<el-descriptions-item label="协会名称">
{{viewData.clubName}}
</el-descriptions-item>
@@ -17,65 +20,46 @@ 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="会费标准">
<el-descriptions-item label="会费标准" :span="4">
{{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>
<slot></slot>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</el-tab-pane>
<el-tab-pane name="2" label="成员信息">
<div class="process-title">成员信息</div>
@@ -83,7 +67,7 @@ const REGISTER_INFO_COMPONENT = {
: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>
<span>{{ getRoleName(scope.row.roleCode) }}</span>
</template>
</el-table-column>
<el-table-column label="工号" width="150px" prop="loginName"></el-table-column>
@@ -95,25 +79,34 @@ const REGISTER_INFO_COMPONENT = {
</el-table>
</el-tab-pane>
<el-tab-pane name="3" label="审核记录">
<template v-if="viewData.nodeTasks && viewData.nodeTasks.length > 0">
<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>
<template v-if="doneTasks.length > 0" v-for="task in doneTasks">
<div class="mt10">
<div class="process-title">{{ task.displayName }}</div>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
v-if="task.ext.isFirstTaskNode">
<el-descriptions-item label="申请用户">{{ task.ext.initiatorName
}}({{task.ext.initiatorAccount}})
</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<template v-else>
@@ -123,36 +116,50 @@ const REGISTER_INFO_COMPONENT = {
</el-tabs>
</div>
`,
dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
data() {
return {
viewData: {},
activeName: "1"
activeName: "1",
row: {},
doneTasks: [],
}
},
methods: {
getRoleName(roleCode) {
switch (roleCode) {
case "CLUB_PRESIDENT":
return "会长"
case "CLUB_VICE_PRESIDENT":
return "副会长"
case "CLUB_SECRETARY":
return "秘书长"
case "CLUB_VICE_SECRETARY":
return "副秘书长"
case "CLUB_MEMBER":
return "会员"
default:
return ""
}
return CLUB_ROLE_CONSTANT.getRoleName(roleCode)
},
onOpen(id) {
this.$axios.post("/platform/club/register/common/findOne", { id: id }).then((res) => {
onOpen(row) {
this.row = row
this.$axios.post("/platform/club/register/clubRegisterApply/info", { id: this.row.id }).then((res) => {
if (res.code === 0) {
this.viewData = res.data
}
})
this.getDoneTasks()
},
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
// 查看流程图
openChart(){
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
},
created() {}
created() {},
style: /*language=CSS*/ `
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
`
}
src/main/resources/views/platform/zhgh/club/common/clubRoleConstant.js
+5 -5
View File
@@ -7,15 +7,15 @@ const CLUB_ROLE_CONSTANT = {
CLUB_VICE_SECRETARY: "CLUB_VICE_SECRETARY",
getRoleName(roleCode) {
switch (roleCode) {
case CLUB_ROLE_CONSTANT.CLUB_PRESIDENT:
case this.CLUB_PRESIDENT:
return "会长"
case CLUB_ROLE_CONSTANT.CLUB_VICE_PRESIDENT:
case this.CLUB_VICE_PRESIDENT:
return "副会长"
case CLUB_ROLE_CONSTANT.CLUB_SECRETARY:
case this.CLUB_SECRETARY:
return "秘书长"
case CLUB_ROLE_CONSTANT.CLUB_VICE_SECRETARY:
case this.CLUB_VICE_SECRETARY:
return "副秘书长"
case CLUB_ROLE_CONSTANT.CLUB_MEMBER:
case this.CLUB_MEMBER:
return "会员"
default:
return ""
src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js
+106 -83
View File
@@ -3,108 +3,131 @@ const clubUserJoin = {
/*language=HTML*/
`
<div>
<div>
<div class="process-title">
申请信息
</div>
<el-descriptions border>
<el-descriptions-item label="姓名">
{{viewData.userName}}
</el-descriptions-item>
<el-descriptions-item label="工号">
{{viewData.loginName}}
</el-descriptions-item>
<el-descriptions-item label="性别">
{{viewData.sex}}
</el-descriptions-item>
<el-descriptions-item label="出生年月">
{{viewData.birthday}}
</el-descriptions-item>
<el-descriptions-item label="联系电话">
{{viewData.mobile}}
</el-descriptions-item>
<el-descriptions-item label="电子信箱">
{{viewData.email}}
</el-descriptions-item>
<el-descriptions-item label="分工会">
{{viewData.unionName}}
</el-descriptions-item>
<el-descriptions-item label="部门" :span="2">
{{viewData.unitName}}
</el-descriptions-item>
<el-descriptions-item label="职务">
{{viewData.governmentPosition}}
</el-descriptions-item>
<el-descriptions-item label="职称" :span="2">
{{viewData.technicalTitle}}
</el-descriptions-item>
<el-descriptions-item label="学历">
{{viewData.education}}
</el-descriptions-item>
<el-descriptions-item label="学位" :span="2">
{{viewData.academicDegree}}
</el-descriptions-item>
<el-descriptions-item label="同时参加其他协会情况" :span="3">
{{viewData.sameTimeJoinOtherClubSituation}}
</el-descriptions-item>
<el-descriptions-item label="文化、体育方面的活动经历、获奖情况" :span="3">
{{viewData.awardsExperience}}
</el-descriptions-item>
<el-descriptions-item label="照片" :span="3">
<img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">
</el-descriptions-item>
</el-descriptions>
<div class="process-title">
申请信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions border>
<el-descriptions-item label="姓名">
{{viewData.userName}}
</el-descriptions-item>
<el-descriptions-item label="工号">
{{viewData.loginName}}
</el-descriptions-item>
<el-descriptions-item label="性别">
{{viewData.sex}}
</el-descriptions-item>
<el-descriptions-item label="出生年月">
{{viewData.birthday}}
</el-descriptions-item>
<el-descriptions-item label="联系电话">
{{viewData.mobile}}
</el-descriptions-item>
<el-descriptions-item label="电子信箱">
{{viewData.email}}
</el-descriptions-item>
<el-descriptions-item label="分工会">
{{viewData.unionName}}
</el-descriptions-item>
<el-descriptions-item label="部门" :span="2">
{{viewData.unitName}}
</el-descriptions-item>
<el-descriptions-item label="职务">
{{viewData.governmentPosition}}
</el-descriptions-item>
<el-descriptions-item label="职称" :span="2">
{{viewData.technicalTitle}}
</el-descriptions-item>
<el-descriptions-item label="学历">
{{viewData.education}}
</el-descriptions-item>
<el-descriptions-item label="学位" :span="2">
{{viewData.academicDegree}}
</el-descriptions-item>
<el-descriptions-item label="同时参加其他协会情况" :span="3">
{{viewData.sameTimeJoinOtherClubSituation}}
</el-descriptions-item>
<el-descriptions-item label="文化、体育方面的活动经历、获奖情况" :span="3">
{{viewData.awardsExperience}}
</el-descriptions-item>
<el-descriptions-item label="照片" :span="3">
<img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">
</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
<div class="mt10">
<div class="process-title">{{ task.displayName }}</div>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
v-if="task.ext.isFirstTaskNode">
<el-descriptions-item label="申请用户">{{ task.ext.initiatorName
}}({{task.ext.initiatorAccount}})
</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</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 border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</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 label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
<!-- </el-descriptions-item>-->
</el-descriptions>
</div>
</div>
</template>
<slot></slot>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</div>
`,
dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
data() {
return {
viewData: {},
activeName: "first",
isScrollNow: "0"
row: {},
doneTasks: [],
}
},
methods: {
onOpen(id) {
this.$axios.post("/platform/club/join/common/info", { id }).then((res) => {
onOpen(row) {
this.row = row
this.$axios.post("/platform/club/join/mine/info", { id: row.id }).then((res) => {
if (res.code === 0) {
this.viewData = res.data
}
})
this.getDoneTasks()
},
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
// 查看流程图
openChart(){
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
}
},
style: /*language=CSS*/ `
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
`
}
src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html
+7 -12
View File
@@ -7,7 +7,9 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<guava ref="guava">
<el-card v-if="isCanApply" shadow="never">
<h5 style="text-align: center; color: #0e5996; margin-bottom: 20px">年度优秀协会申报</h5>
<div slot="header" class="clearfix">
<h3 style="color: rgb(24, 103, 176)">年度优秀协会申报</h3>
</div>
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px" style="padding: 0 30px">
<el-row :gutter="30">
@@ -102,17 +104,10 @@ layout("/layouts/platform.html"){
store,
mixins: [initTableMixins],
data() {
let validFiles = (rule, value, callback) => {
if (!this.formData.files || this.formData.files.length === 0) {
callback(new Error("请上传附件"))
} else {
callback()
}
}
return {
id: GetQueryString("id"),
formRules: {
files: [{ validator: validFiles, trigger: ["blur", "change"] }]
files: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
},
clubList: [],
formData: {
@@ -129,14 +124,14 @@ layout("/layouts/platform.html"){
methods: {
doBack() {
if (GetQueryString("id") !== "") {
this.$store.dispatch("pjaxRoute", "/platform/club/evaluate/mine")
location.href = '/platform/club/evaluate/mine'
}
},
doSave() {
this.$axios.post("/platform/club/evaluate/apply/doSave", { evaluate: JSON.stringify(this.formData) }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.$store.dispatch("pjaxRoute", "/platform/club/evaluate/mine")
location.href = '/platform/club/evaluate/mine'
}
})
},
@@ -158,7 +153,7 @@ layout("/layouts/platform.html"){
})
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$store.dispatch("pjaxRoute", "/platform/club/evaluate/mine")
location.href = '/platform/club/evaluate/mine'
} else {
this.$message.warning(resp.msg)
}
src/main/resources/views/platform/zhgh/club/evaluate/common/evaluateInfo.js
+86 -64
View File
@@ -1,85 +1,107 @@
const EVALUATE_INFO_COMPONENT = {
template: `
<div>
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane name="1" label="基础信息">
<div class="process-title">基础信息</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="协会名称">
{{viewData.clubName}}
<div class="process-title">
申请信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="协会名称">{{viewData.clubName}}</el-descriptions-item>
<el-descriptions-item label="协会编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="协会类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="成立时间">{{viewData.foundTime}}</el-descriptions-item>
<el-descriptions-item label="申报年份">{{$moment(viewData.applyTime).format('YYYY')}}</el-descriptions-item>
<el-descriptions-item label="申报时间">{{viewData.applyTime}}</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">附件</template>
<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-item span="3">
<template slot="label">两年获得的集体荣誉称号</template>
<div class="text-left" v-html="viewData.evaluateName"></div>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">年度组织活动及完成情况</template>
<div class="text-left" v-html="viewData.yearActivity"></div>
</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
<div class="mt10">
<div class="process-title">{{ task.displayName }}</div>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
v-if="task.ext.isFirstTaskNode">
<el-descriptions-item label="申请用户">{{ task.ext.initiatorName
}}({{task.ext.initiatorAccount}})
</el-descriptions-item>
<el-descriptions-item label="协会编码">
{{viewData.clubCode}}
</el-descriptions-item>
<el-descriptions-item label="协会类型">
{{viewData.typeName}}
</el-descriptions-item>
<el-descriptions-item label="成立时间">
{{viewData.foundTime}}
</el-descriptions-item>
<el-descriptions-item label="申报年份">
{{$moment(viewData.applyTime).format('YYYY')}}
</el-descriptions-item>
<el-descriptions-item label="申报时间">
{{viewData.applyTime}}
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">附件</template>
<file-preview :files="viewData.files" complete_result></file-preview>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">两年获得的集体荣誉称号</template>
<div class="text-left" v-html="viewData.evaluateName"></div>
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">年度组织活动及完成情况</template>
<div class="text-left" v-html="viewData.yearActivity"></div>
<el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane name="2" label="审核记录">
<template v-if="viewData.nodeTasks && viewData.nodeTasks.length > 0">
<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>
</template>
<template v-else>
<el-empty description="暂无审核记录"></el-empty>
</template>
</el-tab-pane>
</el-tabs>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<slot></slot>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</div>
`,
dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
data() {
return {
viewData: {},
activeName: "1"
activeName: "1",
row: {},
doneTasks: [],
}
},
methods: {
onOpen(id) {
this.$axios.post("/platform/club/evaluate/common/findOne", { id: id }).then((res) => {
onOpen(row) {
this.row = row
this.$axios.post("/platform/club/evaluate/apply/info", { id: row.id }).then((res) => {
if (res.code === 0) {
this.viewData = res.data
}
})
this.getDoneTasks()
},
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
// 查看流程图
openChart(){
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
}
},
style: /*language=CSS*/ `
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
`
}
src/main/resources/views/platform/zhgh/club/evaluate/mine/index.html
+24 -29
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
<el-card class="mt10" shadow="never">
<table-tool label="申请列表">
<el-button @click="openAdd" size="small" type="primary">评优申请</el-button>
</table-tool>
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
@@ -45,25 +45,21 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="申请时间" prop="applyTime" 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">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" @click="openEdit(row)" size="mini" type="primary">
编辑
</el-button>
<el-button
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
size="mini"
type="danger"
@click="openRevoke(row)"
>
撤销
</el-button>
<el-button v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" @click="deleteDo(row)" size="mini" type="danger">
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<el-button v-else-if="[10].includes(row.processInstanceNodeCode)" @click="deleteDo(row)" size="mini" type="danger">
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
</template>
@@ -98,37 +94,36 @@ layout("/layouts/platform.html"){
}
},
methods: {
openRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/club/evaluate/mine/revokeApply", { id: row.id }).then((resp) => {
this.$message.success(resp.msg)
this.doSearch()
this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
}
})
})
},
openAdd() {
this.$store.dispatch("pjaxRoute", "/platform/club/evaluate/apply")
},
openView(row) {
this.$refs.guava.view(() => {
this.$refs.evaluateInfoRef.onOpen(row.id)
this.$refs.evaluateInfoRef.onOpen(row)
})
},
openEdit(row) {
this.$store.dispatch("pjaxRoute", "/platform/club/evaluate/apply?id=" + row.id)
onEdit(row) {
location.href = '/platform/club/evaluate/apply?id=' + row.id
},
async deleteDo(row) {
async onDelete(id) {
const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/evaluate/mine/doDelete", { id: row.id })
const resp = await this.$axios.post("/platform/club/evaluate/mine/doDelete", { id: id })
this.$message.success(resp.msg)
this.doSearch()
}
src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html
+58 -52
View File
@@ -47,21 +47,17 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="申请时间" prop="applyTime" 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">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
审核
</el-button>
<el-button
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
@click="openRevoke(row.processInstanceTaskId)"
size="mini"
type="danger"
>
撤回
</el-button>
<el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -69,21 +65,26 @@ layout("/layouts/platform.html"){
</el-card>
<template #public>
<evaluate-info ref="examineInfoRef"></evaluate-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>
<evaluate-info ref="evaluateInfoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
</el-row>
</div>
</evaluate-info>
</template>
</guava>
</div>
@@ -112,42 +113,47 @@ layout("/layouts/platform.html"){
methods: {
openView(row) {
this.$refs.guava.public(() => {
this.$refs.examineInfoRef.onOpen(row.id)
this.$refs.evaluateInfoRef.onOpen(row)
this.showApprovalForm = false
})
},
openApproval(row) {
onAudit(row) {
this.$refs.guava.public(() => {
this.$refs.examineInfoRef.onOpen(row.id)
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()
}
})
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.showApprovalForm = true
this.$refs.evaluateInfoRef.onOpen(row)
})
},
openRevoke(taskId) {
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
submitType: val
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
src/main/resources/views/platform/zhgh/club/examine/apply/index.html
+6 -192
View File
@@ -4,11 +4,6 @@ layout("/layouts/platform.html"){
<style>
.left-span-label {
color: #236EB4;
margin: 10px 0;
}
</style>
<div id="app" v-cloak>
@@ -17,10 +12,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<div slot="header" class="clearfix">
<el-button icon="el-icon-back" style="font-size: 16px" type="text" @click="doBack"
v-if="formData.id">返回
</el-button>
<h3 style="color: rgb(24, 103, 176);font-family: Microsoft YaHei,serif;">考核登记</h3>
<h3 style="color: rgb(24, 103, 176)">考核登记</h3>
</div>
<el-steps :active="registerTypeName" finish-status="success" simple>
@@ -32,7 +24,6 @@ layout("/layouts/platform.html"){
<el-form v-show="registerTypeName === 0" :model="formData" ref="addForm1" :rules="formRules"
label-width="150px"
style="margin-top: 50px">
<!-- <div class="left-span-label">基础信息</div>-->
<el-row :gutter="20" type="flex">
<el-col :span="12">
<el-form-item prop="year" label="填报年度"
@@ -66,27 +57,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" type="flex">
<!-- <el-col :span="12">-->
<!-- <el-form-item prop="foundTime" label="成立时间">-->
<!-- <el-input v-model="formData.foundTime" placeholder="请输入成立时间"-->
<!-- disabled></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item prop="due" label="会费标准">-->
<!-- <el-input v-model="formData.due" placeholder="请输入会费标准"-->
<!-- readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="本年度活动开展情况" prop="yearActivity">
<!-- <el-button @click="formData.yearActivityList.push({})" icon="el-icon-plus" size="mini"-->
<!-- style="float: right;margin-bottom: 10px">-->
<!-- 添加-->
<!-- </el-button>-->
<span style="color: red">说明：非赛事活动无需填写赛事举办单位、获奖情况。</span>
<el-table
:data="formData.yearActivityList"
@@ -98,13 +71,6 @@ layout("/layouts/platform.html"){
<el-form-item :prop="'yearActivityList.'+$index+'.activityTime'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<!--<el-date-picker
style="width: 100%"
placeholder="选择日期"
type="date"
v-model="row.activityTime"
value-format="yyyy-MM-dd">
</el-date-picker>-->
<el-input clearable maxlength="100" placeholder="请输入活动时间"
v-model="row.activityTime"></el-input>
</el-form-item>
@@ -142,7 +108,7 @@ layout("/layouts/platform.html"){
<el-form-item :prop="'yearActivityList.'+$index+'.joinNum'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<el-input clearable maxlength="100" placeholder="请输入"
<el-input clearable maxlength="100" placeholder="请输入参加人数"
v-model="row.joinNum"></el-input>
</el-form-item>
</template>
@@ -154,7 +120,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="操作" width="80">
<template slot="header" slot-scope="scope">
<template slot="header" v-slot="scope">
<el-button size="mini" type="primary" icon="el-icon-plus"
@click="formData.yearActivityList.push({})"></el-button>
</template>
@@ -171,10 +137,6 @@ layout("/layouts/platform.html"){
</el-col>
<el-col :span="24">
<el-form-item class="is-required" label="下一年度活动计划" prop="plans">
<!-- <el-button @click="formData.plans.push({})" icon="el-icon-plus" size="mini"-->
<!-- style="float: right;margin-bottom: 10px">-->
<!-- 添加-->
<!-- </el-button>-->
<el-table
:data="formData.plans"
border
@@ -185,13 +147,6 @@ layout("/layouts/platform.html"){
<el-form-item :prop="'plans.'+$index+'.activityTime'"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
label-width="0">
<!--<el-date-picker
style="width: 100%"
placeholder="选择日期"
type="date"
v-model="row.activityTime"
value-format="yyyy-MM-dd">
</el-date-picker>-->
<el-input clearable maxlength="100" placeholder="请输入活动时间"
v-model="row.activityTime"></el-input>
</el-form-item>
@@ -229,7 +184,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="操作" width="80">
<template slot="header" slot-scope="scope">
<template slot="header" v-slot="scope">
<el-button size="mini" type="primary" icon="el-icon-plus"
@click="formData.plans.push({})"></el-button>
</template>
@@ -258,25 +213,7 @@ layout("/layouts/platform.html"){
></file-upload>
</el-form-item>
</el-col>
</el-row>
<!-- <div class="left-span-label">协会成员变化情况</div>-->
<!-- <el-row :gutter="20" type="flex">-->
<!-- <el-col :span="24">-->
<!-- <el-form-item prop="" label="">-->
<!-- <el-table :data="formData.changeUserNum" max-height="300">-->
<!-- <el-table-column label="序号" type="index"-->
<!-- width="50"></el-table-column>-->
<!-- <el-table-column label="人员类型" prop="userState"></el-table-column>-->
<!-- <el-table-column label="年初人员" prop="yearFirstNum"></el-table-column>-->
<!-- <el-table-column label="年度增加" prop="yearAddNum"></el-table-column>-->
<!-- <el-table-column label="年度减少" prop="yearEditNum"></el-table-column>-->
<!-- <el-table-column label="年末人数" prop="thisYearNum"></el-table-column>-->
<!-- </el-table>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<el-form v-show="registerTypeName===1" :model="cwsz" ref="addForm2" :rules="rules"
@@ -324,12 +261,10 @@ layout("/layouts/platform.html"){
value="年度结余"></el-option>
<el-option key="社会赞助" label="社会赞助" value="社会赞助"></el-option>
<el-option key="支出" label="支出" value="支出"></el-option>
<!-- <el-option key="其它" label="其它" value="其它"></el-option>-->
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="金额(元)" prop="money" width="120">
<template slot-scope="{row,$index}">
<el-form-item label-width="0">
@@ -337,47 +272,6 @@ layout("/layouts/platform.html"){
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column label="年初余额(元)" prop="qcMoney" width="120">-->
<!-- <template slot-scope="{row,$index}">-->
<!-- <el-form-item label-width="0">-->
<!-- <el-input :disabled="$index!=0" @input="inputQcMoney(row)"-->
<!-- type="number" v-model="row.qcMoney"></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="收入(元)" prop="income" width="120">-->
<!-- <template slot-scope="{row,$index}">-->
<!-- <el-form-item label-width="0">-->
<!-- <el-input-->
<!-- :disabled="!['会费收入','校工会拨款','社会赞助','其它'].includes(row.incomeType)"-->
<!-- @input="inputIncome(row)"-->
<!-- maxlength="15"-->
<!-- type="number"-->
<!-- v-model="row.income"></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="支出(元)" prop="expend" width="120">-->
<!-- <template slot-scope="{row,$index}">-->
<!-- <el-form-item label-width="0">-->
<!-- <el-input :disabled="!['支出','其它'].includes(row.incomeType)||$index===0"-->
<!-- @input="inputExpend(row)"-->
<!-- maxlength="15"-->
<!-- type="number"-->
<!-- v-model="row.expend"></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="年度结余(元)" prop="qmMoney" width="120">-->
<!-- <template slot-scope="{row}">-->
<!-- <el-form-item label-width="0">-->
<!-- <el-input disabled maxlength="15"-->
<!-- type="number"-->
<!-- v-model="row.qmMoney"></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" prop="notes">
<template slot-scope="{row}">
<el-form-item label-width="0">
@@ -393,7 +287,6 @@ layout("/layouts/platform.html"){
</template>
<template slot-scope="{row,$index}">
<el-form-item label-width="0">
<!-- :disabled="[0,1,2].includes($index)"-->
<el-button
@click="deleteIncomeDetailed(row,$index)"
icon="el-icon-delete"
@@ -405,67 +298,6 @@ layout("/layouts/platform.html"){
</el-table-column>
</el-table>
</div>
<!-- <div class="mt10">-->
<!-- <el-table :data="cwsz.incomeCensus" max-height="300">-->
<!-- <el-table-column label="去年年度结余(元)" prop="lasYearSurplus">-->
<!-- <template slot-scope="{row}">-->
<!-- <template v-if="lasYearSurplus">-->
<!-- {{row.lasYearSurplus=parseFloat(lasYearSurplus.toFixed(2))}}-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- <template v-if="row.lasYearSurplus">-->
<!-- {{row.lasYearSurplus=parseFloat(row.lasYearSurplus.toFixed(2))}}-->
<!-- </template>-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="会费收入(元)" prop="income">-->
<!-- <template slot-scope="{row}">-->
<!-- <template v-if="income">-->
<!-- {{row.income=parseFloat(income.toFixed(2))}}-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- {{row.income=parseFloat(row.income.toFixed(2))}}-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="校工会拨款(元)" prop="allocate">-->
<!-- <template slot-scope="{row}">-->
<!-- <template v-if="allocate">-->
<!-- {{row.allocate=parseFloat(allocate.toFixed(2))}}-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- {{row.allocate=parseFloat(row.allocate.toFixed(2))}}-->
<!-- </template>-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="社会赞助(元)" prop="support">-->
<!-- <template slot-scope="{row}">-->
<!-- <template v-if="row.support">-->
<!-- {{parseFloat(row.support.toFixed(2))}}-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="年度总支出(元)" prop="totalExpend">-->
<!-- <template slot-scope="{row}">-->
<!-- <template v-if="row.totalExpend">-->
<!-- {{parseFloat(row.totalExpend.toFixed(2))}}-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="年度结余(元)" prop="surplus">-->
<!-- <template slot-scope="{row}">-->
<!-- <template v-if="row.income+row.support+row.allocate+row.lasYearSurplus-row.totalExpend">-->
<!-- {{row.surplus=row.income+row.support+row.allocate+row.lasYearSurplus-row.totalExpend}}-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
</el-form>
<el-form v-show="registerTypeName===2" ref="addForm3" :rules="rules"
@@ -502,15 +334,11 @@ layout("/layouts/platform.html"){
v-show="registerTypeName===2">提交
</el-button>
</el-row>
<!-- <el-row v-else class="mt10" justify="center" type="flex">-->
<!-- <el-button type="info">{{formData.clubName}}当前年度已提交考核登记</el-button>-->
<!-- </el-row>-->
</el-card>
</guava>
</div>
<script>
new Vue({
el: "#app",
@@ -557,7 +385,7 @@ layout("/layouts/platform.html"){
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.$store.dispatch("pjaxRoute", "/platform/club/examine/mine")
location.href = '/platform/club/examine/mine'
}
})
},
@@ -575,7 +403,7 @@ layout("/layouts/platform.html"){
})
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$store.dispatch("pjaxRoute", "/platform/club/examine/mine")
location.href = '/platform/club/examine/mine'
} else {
this.$message.warning(resp.msg)
}
@@ -752,7 +580,6 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "foundTime", this.$moment().format("YYYY-MM-DD"))
}
this.$set(this.formData, "clubName", club?.clubName)
// await this.getClubUserNum(val)
await this.getJgUser(val)
await this.getCount()
@@ -789,26 +616,15 @@ layout("/layouts/platform.html"){
this.clubOptions = await this.getClubsByRole()
const { data } = await this.$axios.post("/platform/club/examine/apply/info", { id: id })
// if (!data.register.yearActivityList) {
// data.register.yearActivityList = [{}]
// }
// if (!data.register.plans) {
// data.register.plans = [{}]
// }
if (!data.yearActivityList) {
data.yearActivityList = [{}]
}
if (!data.plans) {
data.plans = [{}]
}
if(data.year){
data.year = data.year.toString()
}
this.formData = data
this.$set(this.cwsz, "incomeCensus", data.incomeCensus)
this.$set(this.cwsz, "incomeDetailed", data.detailedList)
@@ -823,14 +639,12 @@ layout("/layouts/platform.html"){
})
this.isRegister = resp.data > 0
},
async yearChange() {
await this.getCount()
if (this.isRegister) {
this.$message.warning(this.formData.year + "年度已经登记，请勿重复登记")
}
}
},
async created() {
if (this.id) {
src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js
+73 -37
View File
@@ -3,17 +3,14 @@ const EXAMINE_INFO_COMPONENT = {
<div>
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane name="1" label="基础信息">
<div class="process-title">基础信息</div>
<div class="process-title">
申请信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions v-if="viewData" :column="3" border class="table_fixed">
<el-descriptions-item label="协会名称">
{{ viewData.clubName }}
</el-descriptions-item>
<el-descriptions-item label="成立时间">
{{ viewData.foundTime }}
</el-descriptions-item>
<el-descriptions-item label="会费标准">
{{ viewData.due }}
</el-descriptions-item>
<el-descriptions-item label="协会名称">{{ viewData.clubName }}</el-descriptions-item>
<el-descriptions-item label="成立时间">{{ viewData.foundTime }} </el-descriptions-item>
<el-descriptions-item label="会费标准">{{ viewData.due }}</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label">工作总结</template>
<file-preview :files="viewData.summaryFiles" complete_result></file-preview>
@@ -28,6 +25,9 @@ const EXAMINE_INFO_COMPONENT = {
<!-- <el-table-column label="年度减少" prop="yearEditNum"></el-table-column>-->
<!-- <el-table-column label="年末人数" prop="thisYearNum"></el-table-column>-->
<!-- </el-table>-->
<slot></slot>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</el-tab-pane>
<el-tab-pane name="2" label="本年度活动开展情况">
<div class="process-title">本年度活动开展情况</div>
@@ -86,48 +86,62 @@ const EXAMINE_INFO_COMPONENT = {
</el-table>
</el-tab-pane>
<el-tab-pane name="5" label="审核记录">
<template v-if="viewData.nodeTasks && viewData.nodeTasks.length > 0">
<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>
<template v-if="doneTasks.length > 0" v-for="task in doneTasks">
<div class="mt10">
<div class="process-title">{{ task.displayName }}</div>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
v-if="task.ext.isFirstTaskNode">
<el-descriptions-item label="申请用户">{{ task.ext.initiatorName
}}({{task.ext.initiatorAccount}})
</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<template v-else>
<el-empty description="暂无审核记录"></el-empty>
</template>
</template>
<template v-else>
<el-empty description="暂无审核记录"></el-empty>
</template>
</el-tab-pane>
</el-tabs>
</div>
`,
dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
data() {
return {
viewData: {},
activeName: "1"
activeName: "1",
row: {},
doneTasks: [],
}
},
methods: {
async onOpen(id) {
const resp = await this.$axios.post("/platform/club/examine/common/findOne", { id: id })
async onOpen(row) {
this.row = row
const resp = await this.$axios.post("/platform/club/examine/common/findOne", { id: row.id })
if (resp.code === 0) {
this.viewData = resp.data
await this.getClubUserNum(resp.data.clubId)
await this.getJgUser(resp.data.clubId)
}
this.getDoneTasks()
},
async getClubUserNum(clubId) {
const resp = await this.$axios.post("/platform/club/examine/apply/getClubUserNum", {
@@ -140,6 +154,28 @@ const EXAMINE_INFO_COMPONENT = {
clubId: clubId
})
this.$set(this.viewData, "jgUser", respUser.data)
},
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
// 查看流程图
openChart(){
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
}
},
style: /*language=CSS*/ `
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
`
}
src/main/resources/views/platform/zhgh/club/examine/mine/index.html
+28 -36
View File
@@ -2,9 +2,7 @@
layout("/layouts/platform.html"){
#-->
<style>
.left-span-label {
margin: 20px 0;
}
</style>
<div id="app" v-cloak>
@@ -19,6 +17,7 @@ layout("/layouts/platform.html"){
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
@@ -30,11 +29,9 @@ layout("/layouts/platform.html"){
</el-card>
<el-card class="mt10" shadow="never">
<table-tool label="申请列表">
<el-button @click="openAdd" size="small" type="primary">年审申请</el-button>
</table-tool>
<table-tool label="申请列表"></table-tool>
<el-table :data="tableData">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column :index="indexMethod" label="序号" type="index" width="80"></el-table-column>
<el-table-column label="年度" prop="year" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="成立时间" prop="foundTime" sortable show-overflow-tooltip>
@@ -43,25 +40,21 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="申请时间" prop="registerDate" 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}">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" @click="openEdit(row)" size="mini" type="primary">
编辑
</el-button>
<el-button
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
size="mini"
type="danger"
@click="openRevoke(row)"
>
撤销
</el-button>
<el-button v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" @click="deleteDo(row)" size="mini" type="danger">
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<el-button v-else-if="[10].includes(row.processInstanceNodeCode)" @click="deleteDo(row)" size="mini" type="danger">
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<!--<el-button
@@ -104,37 +97,36 @@ layout("/layouts/platform.html"){
}
},
methods: {
openRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/club/examine/mine/revokeApply", { id: row.id }).then((resp) => {
this.$message.success(resp.msg)
this.doSearch()
this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
}
})
})
},
openAdd() {
this.$store.dispatch("pjaxRoute", "/platform/club/examine/apply")
},
openView(row) {
this.$refs.guava.view(() => {
this.$refs.examineInfoRef.onOpen(row.id)
this.$refs.examineInfoRef.onOpen(row)
})
},
openEdit(row) {
this.$store.dispatch("pjaxRoute", "/platform/club/examine/apply?id=" + row.id)
onEdit(row) {
location.href = '/platform/club/examine/apply?id=' + row.id
},
async deleteDo(row) {
async onDelete(id) {
const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/examine/mine/doDelete", { id: row.id })
const resp = await this.$axios.post("/platform/club/examine/mine/doDelete", { id: id })
this.$message.success(resp.msg)
this.doSearch()
}
src/main/resources/views/platform/zhgh/club/examine/schoolAudit/index.html
+61 -56
View File
@@ -2,9 +2,7 @@
layout("/layouts/platform.html"){
#-->
<style>
.left-span-label {
margin: 20px 0;
}
</style>
<div id="app" v-cloak>
@@ -18,6 +16,7 @@ layout("/layouts/platform.html"){
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
@@ -45,21 +44,17 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="申请时间" prop="registerDate" 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}">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
审核
</el-button>
<el-button
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
@click="openRevoke(row.processInstanceTaskId)"
size="mini"
type="danger"
>
撤回
</el-button>
<el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -67,21 +62,26 @@ layout("/layouts/platform.html"){
</el-card>
<template #public>
<examine-info ref="examineInfoRef"></examine-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>
<examine-info ref="examineInfoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
</el-row>
</div>
</examine-info>
</template>
</guava>
</div>
@@ -109,42 +109,47 @@ layout("/layouts/platform.html"){
methods: {
openView(row) {
this.$refs.guava.public(() => {
this.$refs.examineInfoRef.onOpen(row.id)
this.$refs.examineInfoRef.onOpen(row)
this.showApprovalForm = false
})
},
openApproval(row) {
onAudit(row) {
this.$refs.guava.public(() => {
this.$refs.examineInfoRef.onOpen(row.id)
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()
}
})
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.showApprovalForm = true
this.$refs.examineInfoRef.onOpen(row)
})
},
openRevoke(taskId) {
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
submitType: val
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
+3 -50
View File
@@ -35,23 +35,6 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
<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="roleName" 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="操作">
<template slot-scope="{row}">
<el-dropdown>
@@ -60,13 +43,6 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
<span class="ti-angle-down"></span>
</el-button>
<el-dropdown-menu slot="dropdown">
<!-- <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">
设置会长
@@ -87,15 +63,10 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
设置会员
</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>
@@ -148,19 +119,17 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
</span>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
:visible.sync="importDialog"
title="导入成员"
width="50%"
>
>
<file-import ref="viewImport" temp_url="/platform/club/infoManage/manage/downloadUserImport"
post_url="/platform/club/infoManage/manage/doImportUser" is_show_radio
@flush="successImport" :business_id="parentNode.currentTreeData.id"
></file-import>
</el-dialog>
</el-dialog>
</div>
`,
mixins: [initTableMixins],
@@ -296,22 +265,6 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
}
}
},
async rollbackChange(row) {
const confirm = await this.$confirm("确定要撤回变更吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/infoManage/manage/rollbackChange", { id: row.id })
if (resp.code === 0) {
this.$message.success(resp.msg)
await this.pageData()
} else {
this.$message.warning(resp.msg)
}
}
},
async userDelete(row) {
const confirm = await this.$confirm("删除后年度统计时将不会纳入年度减少人数，确定要将" + row.userName + "删除吗？", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
+3 -1
View File
@@ -91,7 +91,9 @@ layout("/layouts/platform.html"){
treeNodeClick(data, node) {
this.currentTreeData = data
this.currentTreeNode = node
this.$refs.clubInfo.pageData()
this.$nextTick(() => {
this.$refs.clubInfo.pageData()
})
},
getTreeData() {
this.$axios.post("/platform/club/infoManage/manage/getClubTreeData").then((res) => {
src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js
+1 -3
View File
@@ -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">
@@ -95,7 +93,7 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
const { id } = row
this.parentNode.clubId = id
this.parentNode.$refs.guava.view(() => {
this.parentNode.$refs.registerInfoRef.onOpen(id)
this.parentNode.$refs.registerInfoRef.onOpen(row)
})
},
openEdit(row) {
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+5 -6
View File
@@ -3,13 +3,13 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never" class="form-box" style="width: 1000px">
<h3 style="color: var(--color-primary)" slot="header">文体协会会员申请</h3>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0">
<el-card shadow="never">
<snaker-start slot="header" label="文体协会会员申请" define_key="XHRH"></snaker-start>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
<el-descriptions border class="descriptions-form">
<el-descriptions-item label="协会" :span="3">
<el-form-item prop="clubId" label="协会">
<el-select v-model="formData.clubId" filterable @change="checkApplyClub">
<el-select v-model="formData.clubId" filterable @change="checkApplyClub" placeholder="请选择协会">
<el-option v-for="item in clubOptions" :label="item.clubName" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
@@ -160,11 +160,10 @@ layout("/layouts/platform.html"){
this.$message.warning("请先阅读并同意协议")
return
}
this.$confirm("您确定要提交申请吗？", "提示", { type: "warning" }).then(() => {
this.$axios.post("/platform/club/join/apply/submit", this.formData).then((res) => {
if (res.code === 0) {
this.$store.dispatch("pjaxRoute", "/platform/club/join/mine")
location.href = '/platform/club/join/mine'
this.$message.success(res.msg)
}
})
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+62 -59
View File
@@ -11,8 +11,9 @@ layout("/layouts/platform.html"){
v-model="pageForm.year"
type="year"
value-format="yyyy"
placeholder="选择年度"
placeholder="请选择年度"
style="width: 100%"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="姓名：">
@@ -56,21 +57,17 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间" 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}">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
审核
</el-button>
<el-button
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
@click="openRevoke(row.processInstanceTaskId)"
size="mini"
type="danger"
>
撤回
</el-button>
<el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -78,31 +75,32 @@ layout("/layouts/platform.html"){
</el-card>
<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-item label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- </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>
<info ref="infoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
</el-row>
</div>
</info>
</template>
</guava>
</div>
<script>
<!--#include('../../common/clubUserJoin.js'){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -127,49 +125,54 @@ layout("/layouts/platform.html"){
methods: {
openView(row) {
this.$refs.guava.public(() => {
this.$refs.infoRef.onOpen(row.id)
this.$refs.infoRef.onOpen(row)
this.showApprovalForm = false
})
},
openApproval(row) {
onAudit(row) {
this.$refs.guava.public(() => {
this.$refs.infoRef.onOpen(row.id)
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()
}
})
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.showApprovalForm = true
this.$refs.infoRef.onOpen(row)
})
},
openRevoke(taskId) {
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
submitType: val
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
}
},
},
async created() {
this.unitList = await this.$businessTool.listUnit()
src/main/resources/views/platform/zhgh/club/join/list/index.html
+156
View File
@@ -0,0 +1,156 @@
<!--#
layout("/layouts/platform.html"){
#-->
<style>
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
<template>
<el-card shadow="never">
<search @search="doSearch">
<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 shadow="never">
<table-tool label="协会列表">
<el-radio-group v-model="hasJoin" @change="joinChange" size="small">
<el-radio-button :label="false">{{'可加入协会' + noJoinCount + '（入会）'}}</el-radio-button>
<el-radio-button :label="true">{{'已加入协会' + hasJoinCount + '（退会）'}}</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="协会编码" sortable prop="clubCode"></el-table-column>
<el-table-column label="协会名称" prop="clubName" show-overflow-tooltip width="200px"></el-table-column>
<el-table-column label="成立时间" prop="foundTime"></el-table-column>
<el-table-column label="会长" prop="clubLeader" show-overflow-tooltip></el-table-column>
<el-table-column label="秘书长" prop="clubSecretary" show-overflow-tooltip></el-table-column>
<el-table-column sortable label="当前人数" show-overflow-tooltip prop="currentPeopleNum"></el-table-column>
<el-table-column label="操作" width="250px">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="openDetail(scope.row)">查看</el-button>
<el-button size="mini" v-if="hasJoin === false" type="primary" @click="doSubmit(scope.row)">申请加入</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
<template #view>
<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>
<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.due}}
</el-descriptions-item>
<el-descriptions-item :span="2">
<template slot="label">当前人数</template>
{{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="2">
<template slot="label">协会宗旨</template>
<div class="text-left" v-html="viewData.purpose"></div>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">协会章程</template>
<file-preview :files="viewData.rulesFile" complete_result></file-preview>
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label">年度活动计划</template>
<file-preview :files="viewData.yearPlanFile" complete_result></file-preview>
</el-descriptions-item>
</el-descriptions>
</template>
</guava>
</div>
<script>
new Vue({
el: "#app",
store,
mixins: [initTableMixins],
components: {},
data() {
return {
viewData: {},
hasJoin: false,
hasJoinCount: 0,
noJoinCount: 0,
clickRow: {}
}
},
methods: {
async doSubmit(row) {
this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: row.id }).then((res) => {
if (res.code === 0) {
location.href = '/platform/club/join/apply?clubId=' + row.id
}
})
},
async openDetail(row) {
const resp = await this.$axios.post("/platform/club/join/list/findOne", { id: row.id })
if (resp.code === 0) {
this.viewData = resp.data
this.$refs.guava.view()
} else {
this.$message.warning(resp.msg)
}
},
joinChange(val) {
this.pageForm.hasJoin = val
this.tableData = []
this.doSearch()
},
async getCount() {
const resp = await this.$axios.post("/platform/club/join/list/getCount")
this.hasJoinCount = resp.data.hasJoinCount
this.noJoinCount = resp.data.noJoinCount
},
pageData() {
this.pageForm.hasJoin = this.hasJoin
this.$axios.post("/platform/club/join/list/pageData", this.pageForm).then((res) => {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
})
}
},
async created() {
await this.getCount()
await this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/join/mine/index.html
+33 -49
View File
@@ -11,7 +11,8 @@ layout("/layouts/platform.html"){
v-model="pageForm.year"
type="year"
value-format="yyyy"
placeholder="选择年度"
placeholder="请选择年度"
@change="doSearch"
style="width: 100%"
></el-date-picker>
</search-item>
@@ -19,34 +20,36 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never">
<table-tool label="申请列表"></table-tool>
<el-table :data="tableData" @sort-change="pageOrder">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="clubName" label="协会名称"></el-table-column>
<el-table-column prop="mode" label="申请模式">
<template slot-scope="scope">
<template v-slot="scope">
<el-tag size="mini" v-if="scope.row.mode" type="success">加入</el-tag>
<el-tag size="mini" v-else type="danger">退出</el-tag>
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间"></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}">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" size="mini" type="primary" @click="openEdit(row)">
编辑
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<el-button
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
size="mini"
type="danger"
@click="openRevoke(row)"
>
撤销
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<el-button v-if="[10].includes(row.processInstanceNodeCode)" size="mini" type="danger" @click="doDelete(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -55,30 +58,12 @@ layout("/layouts/platform.html"){
<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-item label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- </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('../../common/clubUserJoin.js'){}#-->
new Vue({
el: "#app",
store,
@@ -90,36 +75,35 @@ layout("/layouts/platform.html"){
return {}
},
methods: {
openView(row) {
this.$refs.guava.public(() => {
this.$refs.infoRef.onOpen(row.id)
this.showApprovalForm = false
})
},
openEdit(row) {
this.$store.dispatch("pjaxRoute", "/platform/club/join/apply?id=" + row.id)
},
openRevoke(row) {
this.$confirm("您确定要撤销申请吗？", "提示", {
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
type: "warning"
}).then(() => {
this.$axios.post(loc() + "/revokeApply", { id: row.id }).then((res) => {
this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
this.pageData()
}
})
})
},
doDelete(row) {
openView(row) {
this.$refs.guava.public(() => {
this.$refs.infoRef.onOpen(row)
})
},
onEdit(row) {
location.href = '/platform/club/join/apply?id=' + row.id
},
onDelete(id) {
this.$confirm("确定要删除此申请吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post(loc() + "/delete", { id: row.id }).then((resp) => {
this.$axios.post(loc() + "/delete", { id: id }).then((resp) => {
if (resp.code === 0) {
this.$message.success(resp.msg)
this.doSearch()
src/main/resources/views/platform/zhgh/club/join/mineclub/index.html
+19 -45
View File
@@ -1,6 +1,18 @@
<!--#
layout("/layouts/platform.html"){
#-->
<style>
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
<template>
@@ -44,60 +56,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>
@@ -148,7 +123,7 @@ layout("/layouts/platform.html"){
}
},
async findOne(data) {
const resp = await this.$axios.post("/platform/club/applyJoin/apply/findOne", {id: data.id})
const resp = await this.$axios.post("/platform/club/join/list/findOne", {id: data.id})
if (resp.code === 0) {
this.viewData = resp.data
}
@@ -158,7 +133,6 @@ layout("/layouts/platform.html"){
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
})
console.log(this.tableData)
}
},
created() {
src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html
+62 -59
View File
@@ -11,8 +11,9 @@ layout("/layouts/platform.html"){
v-model="pageForm.year"
type="year"
value-format="yyyy"
placeholder="选择年度"
placeholder="请选择年度"
style="width: 100%"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="姓名：">
@@ -56,21 +57,17 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间" 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}">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
审核
</el-button>
<el-button
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
@click="openRevoke(row.processInstanceTaskId)"
size="mini"
type="danger"
>
撤回
</el-button>
<el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -78,31 +75,32 @@ layout("/layouts/platform.html"){
</el-card>
<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-item label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- </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>
<info ref="infoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
</el-row>
</div>
</info>
</template>
</guava>
</div>
<script>
<!--#include('../../common/clubUserJoin.js'){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -127,49 +125,54 @@ layout("/layouts/platform.html"){
methods: {
openView(row) {
this.$refs.guava.public(() => {
this.$refs.infoRef.onOpen(row.id)
this.$refs.infoRef.onOpen(row)
this.showApprovalForm = false
})
},
openApproval(row) {
onAudit(row) {
this.$refs.guava.public(() => {
this.$refs.infoRef.onOpen(row.id)
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()
}
})
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.showApprovalForm = true
this.$refs.infoRef.onOpen(row)
})
},
openRevoke(taskId) {
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
submitType: val
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
}
},
},
async created() {
this.unitList = await this.$businessTool.listUnit()
src/main/resources/views/platform/zhgh/club/register/apply/index.html
+4 -4
View File
@@ -63,10 +63,10 @@ layout("/layouts/platform.html"){
methods: {
doBack() {
if (this.id !== "" && this.from === "") {
this.$store.dispatch("pjaxRoute", "/platform/club/clubMyApply")
location.href = '/platform/club/clubMyApply'
}
if (this.from !== "") {
this.$store.dispatch("pjaxRoute", "/platform/sys/club/clubInfoManage")
location.href = '/platform/sys/club/clubInfoManage'
}
},
nextStep() {
@@ -149,7 +149,7 @@ layout("/layouts/platform.html"){
})
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$store.dispatch("pjaxRoute", "/platform/club/register/clubMyApply")
location.href = '/platform/club/register/clubMyApply'
}
} catch (e) {
console.log(e)
@@ -201,7 +201,7 @@ layout("/layouts/platform.html"){
await this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
}
} else {
$.post("/platform/club/register/clubRegisterApply/createCode").then((res) => {
this.$axios.post("/platform/club/register/clubRegisterApply/createCode").then((res) => {
if (res.code === 0) {
if (this.$refs.clubFormRef) {
this.$refs.clubFormRef.formData.clubCode = res.data
src/main/resources/views/platform/zhgh/club/register/mine/index.html
+25 -27
View File
@@ -46,27 +46,22 @@ layout("/layouts/platform.html"){
<span>{{ $moment(row.createTime).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="processInstanceNodeName" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="300px">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[10,40,70].includes(row.processInstanceNodeCode)" @click="openEdit(row)" size="mini" type="primary">
编辑
</el-button>
<el-button
v-if="[20].includes(row.processInstanceNodeCode) && !row.nextTaskIsComplete"
size="mini"
type="danger"
@click="openRevoke(row)"
>
撤销
</el-button>
<el-button v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" @click="deleteDo(row)" size="mini" type="danger">
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<el-button v-else-if="[10].includes(row.processInstanceNodeCode)" @click="deleteDo(row)" size="mini" type="danger">
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
</template>
@@ -83,6 +78,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../../common/clubInfoComponent.js"){}#-->
<!--#include("../../common/clubRoleConstant.js"){}#-->
new Vue({
el: "#app",
store,
@@ -95,37 +91,39 @@ layout("/layouts/platform.html"){
return {}
},
methods: {
openRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/club/register/clubMyApply/revokeApply", { id: row.id }).then((resp) => {
this.$message.success(resp.msg)
this.doSearch()
this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
}
})
})
},
openAdd() {
this.$store.dispatch("pjaxRoute", "/platform/club/register/clubRegisterApply")
location.href = '/platform/club/register/clubRegisterApply'
},
openView(row) {
this.$refs.guava.view(() => {
this.$refs.registerInfoRef.onOpen(row.id)
this.$refs.registerInfoRef.onOpen(row)
})
},
openEdit(row) {
this.$store.dispatch("pjaxRoute", "/platform/club/register/clubRegisterApply?id=" + row.id)
onEdit(row) {
location.href = '/platform/club/register/clubRegisterApply?id=' + row.id
},
async deleteDo(row) {
async onDelete(id) {
const confirm = await this.$confirm("此操作将永久删除, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
if (confirm === "confirm") {
const resp = await this.$axios.post("/platform/club/register/clubMyApply/doDelete", { id: row.id })
const resp = await this.$axios.post("/platform/club/register/clubMyApply/doDelete", { id: id })
this.$message.success(resp.msg)
this.doSearch()
}
src/main/resources/views/platform/zhgh/club/register/schoolReply/index.html
+62 -58
View File
@@ -49,23 +49,18 @@ layout("/layouts/platform.html"){
<span>{{ $moment(row.createTime).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="processInstanceNodeName" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="300px">
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template v-slot="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="mini" type="primary">
审核
</el-button>
<el-button
v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
@click="openRevoke(row.processInstanceTaskId)"
size="mini"
type="danger"
>
撤回
</el-button>
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.taskState === 10" @click="onAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -73,21 +68,26 @@ layout("/layouts/platform.html"){
</el-card>
<template #public>
<register-info ref="registerInfoRef"></register-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>
<register-info ref="registerInfoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
</el-row>
</div>
</register-info>
</template>
</guava>
</div>
@@ -104,53 +104,57 @@ layout("/layouts/platform.html"){
name: "",
audit: false
},
viewData: {},
formData: {},
showApprovalForm: false
}
},
components: {
"register-info": REGISTER_INFO_COMPONENT,
showApprovalForm: false
"register-info": REGISTER_INFO_COMPONENT
},
methods: {
openView(row) {
onView(row) {
this.$refs.guava.public(() => {
this.$refs.registerInfoRef.onOpen(row.id)
this.$refs.registerInfoRef.onOpen(row)
this.showApprovalForm = false
})
},
openApproval(row) {
onAudit(row) {
this.$refs.guava.public(() => {
this.$refs.registerInfoRef.onOpen(row.id)
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()
}
})
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.showApprovalForm = true
this.$refs.registerInfoRef.onOpen(row)
})
},
openRevoke(taskId) {
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
submitType: val
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/revoke", { taskId }).then((res) => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
src/main/resources/views/platform/zhgh/club/statistics/index.html
+3 -3
View File
@@ -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>
@@ -52,7 +52,7 @@ layout("/layouts/platform.html"){
<el-table-column label="女" prop="woman"></el-table-column>
<el-table-column label="理事机构人数" prop="governing_body"></el-table-column>
<el-table-column fixed="right" label="操作">
<template scope="{row}">
<template v-slot="{row}">
<el-dropdown @command="dropdownCommand">
<el-button plain size="mini">
<i class="ti-settings"></i>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js
+11 -1
View File
@@ -105,5 +105,15 @@ const condolenceInfo = {
openChart(){
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
}
},
style: /*language=CSS*/ `
.el-descriptions-item__label {
width: 200px;
min-width: 200px;
max-width: 200px;
}
.el-tabs__header {
margin: 0;
}
`
}
src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html
+4 -1
View File
@@ -62,7 +62,10 @@ layout("/layouts/platform.html"){
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
删除
</el-button>
</template>
src/main/resources/views/platform/zhgh/staffbenefit/recuperation/lineSelect/index.html
+4 -4
View File
@@ -244,7 +244,7 @@ layout("/layouts/platform.html"){
type: 'warning'
})
if (confirm !== 'confirm') return
const resp = await this.$axios.post(loc() + '/deSelect', {lineId, unionId})
const resp = await this.$axios.post('/platform/recuperation/lineSelect/deSelect', {lineId, unionId})
if (resp.code === 0) {
this.doSearch()
this.$message.success(resp.msg)
@@ -277,7 +277,7 @@ layout("/layouts/platform.html"){
this.$refs.batchSelectRef.onOpen(this.multipleSelection, this.pageForm.year)
},
pageData() {
this.$axios.post(loc() + "/pageData", this.pageForm).then((res) => {
this.$axios.post("/platform/recuperation/lineSelect/pageData", this.pageForm).then((res) => {
if (res.code === 0) {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
@@ -285,7 +285,7 @@ layout("/layouts/platform.html"){
})
},
async getTravelAgencyOptions() {
const {data} = await this.$axios.post(loc() + '/getTravelAgencyOptions')
const {data} = await this.$axios.post('/platform/recuperation/lineSelect/getTravelAgencyOptions')
this.travelAgencyOptions = data
},
async getEnumOptions(enumName) {
@@ -294,7 +294,7 @@ layout("/layouts/platform.html"){
},
},
async created() {
this.$set(this.pageForm, 'mode', Number(GetQueryString('mode')))
this.$set(this.pageForm, 'mode', Number(`${mode}`))
if(this.pageForm.mode === 2) {
this.$set(this.pageForm, 'regionalNature', '全部')
}