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

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-01-22 13:53:50 +08:00
parent 7eac8b00b5
commit c50bcbf869
52 changed files with 1454 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/assets/platform/css/common.css
+5 -1
View File
@@ -729,4 +729,8 @@ td.no-b {
/*********END********设置工作流表单el-description嵌套el-form的格式**************************END*********/
.el-form-item .form-item-tooltip {
color: rgb(153, 153, 153);
font-size: 13px;
display: block;
}
src/main/resources/static/assets/platform/js/tool/businessTool.js
+1 -1
View File
@@ -36,7 +36,7 @@ const businessTool = {
}
})
},
listCLubByRole() {
listClubByRole() {
return commonUtil
.axiosService()
.post("/platform/club/common/listClubByRole", {})
src/main/resources/static/components/module/activity/UserScope.vue
+1 -1
View File
@@ -661,7 +661,7 @@ module.exports = {
async created() {
this.listSession()
await this.getRolesAndUnion()
this.clubOptions = await this.$businessTool.listCLubByRole()
this.clubOptions = await this.$businessTool.listClubByRole()
if ((this.is_sysadmin || this.is_A06 || this.is_H02) === false && this.is_H04 === true) {
this.unions = this.$businessTool.listUnion(this.unionid)
this.$set(this.pageForm, "unionId", this.unions[0].id)
src/main/resources/static/components/plugins/snaker/snakerStart.vue
+9 -2
View File
@@ -23,7 +23,10 @@ module.exports = {
<div>
<el-row type="flex" justify="space-between" slot="header">
<h3 style="color: var(--color-primary)">{{ label }}</h3>
<el-link type="primary" @click="openChart">流程图</el-link>
<div class="header-right">
<slot name="header-right-label"></slot>
<el-link type="primary" @click="openChart">流程图</el-link>
</div>
</el-row>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</div>
@@ -31,5 +34,9 @@ module.exports = {
</template>
<style scoped>
.header-right {
display: flex;
align-items: center;
justify-content: space-between;
}
</style>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+1 -1
View File
@@ -432,7 +432,7 @@ layout("/layouts/platform.html"){
async created() {
this.init()
//社团查询
this.$businessTool.listCLubByRole().then((res) => (this.clubList = res))
this.$businessTool.listClubByRole().then((res) => (this.clubList = res))
}
})
</script>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/clubprincipal/index.html
+1 -1
View File
@@ -201,7 +201,7 @@ layout("/layouts/platform.html"){
},
async created() {
this.pageData()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolprincipal/index.html
+1 -1
View File
@@ -230,7 +230,7 @@ layout("/layouts/platform.html"){
async created() {
this.pageData()
this.unions = await this.$businessTool.listUnion()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/schoolunion/index.html
+1 -1
View File
@@ -230,7 +230,7 @@ layout("/layouts/platform.html"){
async created() {
this.pageData()
this.unions = await this.$businessTool.listUnion()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+1 -1
View File
@@ -549,7 +549,7 @@ layout("/layouts/platform.html"){
},
},
async created() {
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
this.initBudgetType()
if (this.bizId) {
this.findOne()
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html
+1 -1
View File
@@ -247,7 +247,7 @@ layout("/layouts/platform.html"){
async created() {
this.pageData()
this.unions = await this.$businessTool.listUnion()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html
+1 -1
View File
@@ -245,7 +245,7 @@ layout("/layouts/platform.html"){
async created() {
this.pageData()
this.unions = await this.$businessTool.listUnion()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html
+1 -1
View File
@@ -246,7 +246,7 @@ layout("/layouts/platform.html"){
async created() {
this.pageData()
this.unions = await this.$businessTool.listUnion()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html
+1 -1
View File
@@ -245,7 +245,7 @@ layout("/layouts/platform.html"){
async created() {
this.pageData()
this.unions = await this.$businessTool.listUnion()
this.clubs = await this.$businessTool.listCLubByRole()
this.clubs = await this.$businessTool.listClubByRole()
this.activityDeclareReimbursementList = await this.$businessTool.getEnumOptions("ActivityDeclareReimbursement")
}
})
src/main/resources/views/platform/zhgh/club/common/clubInfoComponent.js
+9
View File
@@ -23,6 +23,15 @@ const REGISTER_INFO_COMPONENT = {
<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>
src/main/resources/views/platform/zhgh/club/infoManage/pay/index.html
+262
View File
@@ -0,0 +1,262 @@
<!--#
layout("/layouts/platform.html"){
#-->
<style>
.el-tooltip__popper {
line-height: 20px;
}
.left-span-label {
margin: 0;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
:clearable="false"
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称">
<el-select clearable filterable placeholder="请选择协会" @change="doSearch"
style="width: 100%;" v-model="pageForm.clubId">
<el-option :label="item.clubName" :value="item.id"
v-for="item in clubs"></el-option>
</el-select>
</search-item>
<search-item label="关键字">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
clearable @keyup.enter="doSearch"></el-input>
</search-item>
<search-item label="缴费状态">
<el-select clearable filterable placeholder="请选择缴费状态" @change="doSearch"
style="width: 100%;" v-model="pageForm.payed">
<el-option label="已缴费" :value="1"></el-option>
<el-option label="未缴费" :value="0"></el-option>
</el-select>
</search-item>
<search-item label="拨付状态">
<el-select clearable filterable placeholder="请选择拨付状态" @change="doSearch"
style="width: 100%;" v-model="pageForm.assign">
<el-option label="拨付" :value="1"></el-option>
<el-option label="不拨付" :value="0"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card class="mt10" shadow="never">
<table-tool label="缴费记录">
<el-button @click="batchOperatePay" size="small" type="primary">
批量设置
</el-button>
</table-tool>
<el-table :data="tableData" row-key="id" @selection-change="handleSelectionChange" ref="tableRef">
<el-table-column
:reserve-selection="true"
type="selection"
width="55">
</el-table-column>
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="工号" prop="loginName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="姓名" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="所属单位" prop="unitName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="加入时间" prop="applyTime" sortable show-overflow-tooltip>
<template v-slot="{ row }">
{{ $moment(row.applyTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
<el-table-column label="在职状态" prop="userState" sortable show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.userState === '退休' && row.retireDate">
{{ row.userState + '(' + row.retireDate + ')' }}
</span>
<span v-else>{{ row.userState }}</span>
</template>
</el-table-column>
<el-table-column label="拨付状态" prop="assign" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<el-tooltip placement="bottom">
<div slot="content">
是否具备拨付资格，将按以下规则判定：<br/>
第一步：缴费记录必须是已缴费状态，否则直接判定无资格；<br/>
第二步：如果在职状态不是“退休”，则直接判定有领取资格；<br/>
第三步：如果是“退休”状态但未有退休日期信息，判定无领取资格；<br/>
第四步：如果是“退休”状态且填写了退休日期，当您的退休年份 ≥ 缴费记录年份（无缴费年份则按今年算）时，判定有资格，反之则无。
</div>
<span>是否拨付<i class="el-icon-question"></i></span>
</el-tooltip>
</template>
<template v-slot="{ row }">
<el-tag v-if="row.assign === true" size="mini" type="success">拨付</el-tag>
<el-tag v-else size="mini" type="danger">不拨付</el-tag>
</template>
</el-table-column>
<el-table-column label="缴费状态" prop="payed" sortable show-overflow-tooltip>
<template v-slot="{ row }">
<el-tag v-if="row.payed === true" size="mini" type="success">已缴费</el-tag>
<el-tag v-else size="mini" type="danger">未缴费</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="160">
<template v-slot="{ row }">
<el-button @click="onHandle(row)" size="mini" type="primary">设置状态</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
<template #view>
</template>
</guava>
<el-dialog
:close-on-click-modal="false"
:visible.sync="payDialogVisible"
title="缴费设置"
width="30%">
<div v-if="isBatch" class="left-span-label">
{{ '您选择了' + multipleSelection.length + '位人员，请确认这' + multipleSelection.length + '位人员' + pageForm.year + '年的缴费状态' }}
</div>
<div v-if="!isBatch" class="left-span-label">
{{ '您选择了1位人员，请确认这1位人员' + pageForm.year + '年的缴费状态' }}
</div>
<div class="demo-input-suffix mt20">
缴费状态：
<el-radio v-model="payed" :label="true" border size="medium">已缴费</el-radio>
<el-radio v-model="payed" :label="false" border size="medium">未缴费</el-radio>
</div>
<span class="dialog-footer" slot="footer">
<el-button @click="row = {}; payDialogVisible = false">取消</el-button>
<el-button @click="onBatchHandle" type="primary">确定</el-button>
</span>
</el-dialog>
</div>
<script nonce="${cspNonce!}">
new Vue({
el: "#app",
mixins: [initTableMixins],
components: {
},
data() {
return {
pageForm: {
payed: null,
year: new Date().getFullYear() + '',
},
clubs: [],
row: {},
isBatch: false,
payDialogVisible: false,
payed: false,
multipleSelection: [],
}
},
methods: {
handleSelectionChange(val) {
this.multipleSelection = val
},
onHandle(row) {
const year = new Date().getFullYear()
if(this.pageForm.year > year) {
this.$message.error('只能设置今年之前的缴费记录')
return
}
this.row = row
this.isBatch = false
this.payDialogVisible = true
},
batchOperatePay() {
const year = new Date().getFullYear()
if(this.pageForm.year > year) {
this.$message.error('只能设置今年之前的缴费记录')
return
}
if (this.multipleSelection.length === 0) {
this.$message.error('请先选择需要设置的成员')
return
}
/*const length = this.multipleSelection.filter(m => m.systemUser === "否").length
if (length>0){
this.$message.warning('您选择的人员当中有不是库内人员，暂无法设置！')
return
}*/
this.isBatch = true
this.payDialogVisible = true
},
onBatchHandle() {
let data
if (!this.isBatch) {
data = [this.row.id]
} else {
data = this.multipleSelection.map(item => item.id)
}
this.operateRequest(data)
},
operateRequest(data) {
let message
if (this.payed === false) {
message = '您确定要设置为未缴费吗，此操作将影响该成员的拨付状态。'
} else {
message = '您确定要设置为缴费吗？'
}
this.$confirm(message, '温馨提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
const resp = await this.$axios.post("/platform/club/pay/handle", {
ids: JSON.stringify(data),
payed: this.payed,
})
if (resp.code === 0) {
this.$message.success(resp.msg)
this.doSearch()
this.payDialogVisible = false
this.multipleSelection = []
this.$refs.tableRef.clearSelection()
} else {
this.$message.error(resp.msg)
}
})
.catch(() => {})
},
async pageData() {
const resp = await this.$axios.post("/platform/club/pay/pageData", this.pageForm)
if (resp.code === 0) {
this.tableData = resp.data.list
this.pageForm.totalCount = resp.data.totalCount
} else {
this.$message.warning(resp.msg)
}
}
},
async created() {
this.clubs = await this.$businessTool.listClubByRole()
await this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+22 -22
View File
@@ -3,7 +3,7 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<custom-card>
<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">
@@ -78,33 +78,33 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="同时参加其他协会情况" :span="3">
<el-form-item prop="sameTimeJoinOtherClubSituation" label="同时参加其他协会情况">
<el-input
maxlength="500"
v-model="formData.sameTimeJoinOtherClubSituation"
placeholder="请填写同时参加其他协会情况"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6}"
maxlength="500"
v-model="formData.sameTimeJoinOtherClubSituation"
placeholder="请填写同时参加其他协会情况"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6}"
></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="文化、体育方面的活动经历、获奖情况" :span="3">
<el-form-item prop="awardsExperience" label="文化、体育方面的活动经历、获奖情况">
<el-input
maxlength="500"
v-model="formData.awardsExperience"
placeholder="请填写文化、体育方面的活动经历、获奖情况"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6}"
maxlength="500"
v-model="formData.awardsExperience"
placeholder="请填写文化、体育方面的活动经历、获奖情况"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6}"
></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="照片" :span="3">
<el-form-item prop="avatar" label="照片">
<file-upload
:value.sync="formData.avatar"
:upload_number="1"
upload_mode="image"
upload_result_category="interval"
upload_result_type="url"
:value.sync="formData.avatar"
:upload_number="1"
upload_mode="image"
upload_result_category="interval"
upload_result_type="url"
></file-upload>
</el-form-item>
</el-descriptions-item>
@@ -113,17 +113,17 @@ layout("/layouts/platform.html"){
<pc-signature v-model="formData.signature"></pc-signature>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="本人承诺" :span="3">
<el-checkbox v-model="isAgree">注：本人已仔细阅读并愿意遵守所参加本校教职工文体协会的章程和规定，自愿加入所报名协会。</el-checkbox>
</el-descriptions-item>
</el-descriptions>
</el-form>
<el-row class="mt20">
<el-checkbox v-model="isAgree">注：本人已仔细阅读并愿意遵守所参加本校教职工文体协会的章程和规定，自愿加入所报名协会。</el-checkbox>
</el-row>
<el-row type="flex" justify="end" class="mt10">
<template slot="footer">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
</el-row>
</el-card>
</template>
</custom-card>
</div>
<script nonce="${cspNonce!}">
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+14 -3
View File
@@ -77,8 +77,17 @@ layout("/layouts/platform.html"){
<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 :model="formData" ref="formRef" label-width="80px" :rules="formRules" label-suffix="">
<el-form-item label="缴费状态" prop="payed"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<span class="form-item-tooltip">
(说明：请确认{{ formData.userName }}当年是否缴费)
</span>
<el-radio-group v-model="formData.tf_payed" size="medium">
<el-radio-button :label="false">未缴费</el-radio-button>
<el-radio-button :label="true">已缴费</el-radio-button>
</el-radio-group>
</el-form-item>
<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>
@@ -130,7 +139,9 @@ layout("/layouts/platform.html"){
this.$refs.guava.public(() => {
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
taskName: row.curTaskName,
tf_payed: false,
userName: row.userName
}
this.showApprovalForm = true
this.$refs.infoRef.onOpen(row)
src/main/resources/views/platform/zhgh/club/join/list/index.html
+3
View File
@@ -67,6 +67,9 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="协会编码">{{viewData.clubCode}}</el-descriptions-item>
<el-descriptions-item label="协会类型">{{viewData.typeName}}</el-descriptions-item>
<el-descriptions-item label="发起人">{{viewData.sponsorName}}</el-descriptions-item>
<el-descriptions-item 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>
<template slot="label">会费标准</template>
{{viewData.due}}
src/main/resources/views/platform/zhgh/club/join/mine/index.html
+1 -1
View File
@@ -33,7 +33,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间"></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterForm.js
+42 -42
View File
@@ -9,7 +9,7 @@ const CLUB_FORM_TEMPLATE = {
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="协会编码" prop="clubCode">
<el-form-item label="协会编码" prop="clubCode" required>
<el-input v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" placeholder="请输入协会编码" v-model="formData.clubCode"></el-input>
<el-input v-else placeholder="请输入协会编码" v-model="formData.clubCode" disabled></el-input>
</el-form-item>
@@ -32,39 +32,39 @@ const CLUB_FORM_TEMPLATE = {
</el-row>
<el-row :gutter="30">
<!-- <el-col :span="12">-->
<!-- <el-form-item label="报名联系人" prop="concatPerson">-->
<!-- <user-select-->
<!-- placeholder="请输入姓名或工号选择报名联系人"-->
<!-- ref="userSelectRef"-->
<!-- @change="concatPersonChange"-->
<!-- v-model="formData.concatPerson"-->
<!-- style="width: 100%"-->
<!-- api="/platform/club/register/clubRegisterApply/getUserByKeyWord"-->
<!-- api_input_key_name="keyWord"-->
<!-- :option_label_func="(item)=>{return item.userName + item.loginName + '(' + item.unitName + ')'}"-->
<!-- ></user-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="所属单位" prop="concatPersonUnitName">-->
<!-- <el-input placeholder="此项自动填充" readonly v-model="formData.concatPersonUnitName"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="联系人电话" prop="concatPersonMobile">-->
<!-- <el-input placeholder="请填写联系人电话" v-model="formData.concatPersonMobile"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item-->
<!-- label="联系人邮箱"-->
<!-- prop="concatPersonEmail"-->
<!-- :rules="[{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]"-->
<!-- >-->
<!-- <el-input placeholder="请填写联系人邮箱" type="email" v-model="formData.concatPersonEmail"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="报名联系人" prop="concatPerson">
<user-select
placeholder="请输入姓名或工号选择报名联系人"
ref="userSelectRef"
@change="concatPersonChange"
v-model="formData.concatPerson"
style="width: 100%"
api="/platform/club/register/clubRegisterApply/getUserByKeyWord"
api_input_key_name="keyWord"
:option_label_func="(item)=>{return item.userName + item.loginName + '(' + item.unitName + ')'}"
></user-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属单位" prop="concatPersonUnitName">
<el-input placeholder="此项自动填充" readonly v-model="formData.concatPersonUnitName"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人电话" prop="concatPersonMobile">
<el-input placeholder="请填写联系人电话" v-model="formData.concatPersonMobile"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="联系人邮箱"
prop="concatPersonEmail"
:rules="[{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]"
>
<el-input placeholder="请填写联系人邮箱" type="email" v-model="formData.concatPersonEmail"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="成立时间" prop="foundTime">
@@ -162,23 +162,23 @@ const CLUB_FORM_TEMPLATE = {
clubName: [{ required: true, message: "请填写协会名称", trigger: ["blur", "change"] }],
clubCode: [{ required: false, message: "请填写协会编码", trigger: ["blur", "change"] }],
clubType: [{ required: true, message: "请选择协会类型", trigger: ["blur", "change"] }],
concatPerson: [{ required: true, message: "请选择协会联系人", trigger: ["blur", "change"] }],
foundTime: [{ required: true, message: "请选择成立时间", trigger: ["blur", "change"] }]
// establishReport: [{ required: true, message: "请上传申请成立报告", trigger: ["blur", "change"] }]
//rulesFile: [{ required: true, message: "请上传章程草案", trigger: ["blur", "change"] }],
//manageFile: [{ required: true, message: "请上传经费来源及管理办法", trigger: ["blur", "change"] }],
//yearPlanFile: [{ required: true, message: "请上传年度活动计划", trigger: ["blur", "change"] }]
//concatPerson: [{ required: true, message: "请选择协会联系人", trigger: ["blur", "change"] }],
foundTime: [{ required: true, message: "请选择成立时间", trigger: ["blur", "change"] }],
establishReport: [{ required: true, message: "请上传申请成立报告", trigger: ["blur", "change"] }],
rulesFile: [{ required: true, message: "请上传章程草案", trigger: ["blur", "change"] }],
manageFile: [{ required: true, message: "请上传经费来源及管理办法", trigger: ["blur", "change"] }],
yearPlanFile: [{ required: true, message: "请上传年度活动计划", trigger: ["blur", "change"] }]
}
}
},
computed: {},
methods: {
/*concatPersonChange(id) {
concatPersonChange(id) {
const user = this.$refs.userSelectRef.options.find((user) => user.id === id)
this.$set(this.formData, "concatPersonUnitName", user.unitName)
this.$set(this.formData, "concatPersonMobile", user.mobile)
this.$set(this.formData, "concatPersonEmail", user.email)
}*/
}
},
created() {}
}
src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterManager.js
+1 -1
View File
@@ -58,7 +58,7 @@ const CLUB_MANAGER_TEMPLATE = {
</template>
<template slot-scope="scope">
<el-button
:disabled="scope.row.roleCode === 'CLUB_PRESIDENT'"
:disabled="['CLUB_PRESIDENT', 'CLUB_SECRETARY'].includes(scope.row.roleCode)"
@click="deleteRow(scope.row, scope.$index)"
size="mini" type="danger">删除
</el-button>
src/main/resources/views/platform/zhgh/club/register/apply/index.html
+63 -31
View File
@@ -2,6 +2,15 @@
layout("/layouts/platform.html"){
#-->
<style>
.el-step__title.is-process {
color: var(--color-primary);
}
.el-step__head.is-process .el-step__icon.is-text {
border-color: var(--color-primary);
}
</style>
<div id="app" v-cloak>
<custom-card>
@@ -58,51 +67,48 @@ layout("/layouts/platform.html"){
activeName: 0,
id: GetQueryString("bizId"),
taskId: GetQueryString("taskId"),
from: GetQueryString("from")
from: GetQueryString("from"),
retryCount: 0, // 新增：重试计数器
maxRetryTimes: 3 // 新增：最大重试次数
}
},
methods: {
nextStep() {
let valid = true
this.$refs.clubFormRef.$refs.form.validateField(
["clubName", "establishReport", "rulesFile", "manageFile", "yearPlanFile"],
(errMsg) => {
if (!errMsg) {
valid = false
}
this.$refs.clubFormRef.$refs.form.validateField(["clubName"], (errMsg) => {
if (!errMsg) {
valid = false
} else {
this.$message.error(errMsg)
}
)
})
if (valid) return
this.activeName = 1
},
async onSave() {
let valid = true
this.$refs.clubFormRef.$refs.form.validateField("clubName", (errMsg) => {
if (errMsg) {
if (!errMsg) {
valid = false
} else {
this.$message.error(errMsg)
}
})
if (!valid) return
if (valid) return
await this.doHandle("onSave")
},
onSubmit() {
this.$refs.clubFormRef.$refs.form.validate().then(() => {
this.doHandle("onSubmit")
}).catch(() => {
this.$message.warning({ title: "警告", message: "存在必填项未填写！" })
})
async onSubmit() {
const valid = await this.$refs.clubFormRef.$refs.form.validate()
if(valid) await this.doHandle("onSubmit")
},
onFinishTask() {
this.$refs.clubFormRef.$refs.form.validate().then(() => {
this.doHandle("onFinishTask")
}).catch(() => {
this.$message.warning({ title: "警告", message: "存在必填项未填写！" })
})
async onFinishTask() {
const valid = await this.$refs.clubFormRef.$refs.form.validate()
if(valid) await this.doHandle("onFinishTask")
},
async doHandle(type) {
let formData = {}
try {
/*let hz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_PRESIDENT)
let hz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_PRESIDENT)
if (hz.length !== 1) {
this.$message.warning({ title: "警告", message: "会长需要1人" })
return
@@ -111,14 +117,14 @@ layout("/layouts/platform.html"){
if (msz.length !== 1) {
this.$message.warning({ title: "警告", message: "秘书长需要1人" })
return
}*/
}
formData.sponsor = this.$refs.clubSponsorRef.sponsorData
.filter((o) => o.userId !== "" && o.userId !== undefined)
.map((o) => o.userId)
/*if (['onFinishTask', 'onSubmit'].includes(type) && formData.sponsor && formData.sponsor.length < 3) {
if (['onFinishTask', 'onSubmit'].includes(type) && formData.sponsor && formData.sponsor.length < 3) {
this.$message.warning({ title: "警告", message: "发起人要求不少于3人" })
return
}*/
}
let manageValid = false
for (const item of this.$refs.clubManagerRef.managePerson) {
if (!item.userId) {
@@ -126,10 +132,10 @@ layout("/layouts/platform.html"){
break
}
}
/*if (['onFinishTask', 'onSubmit'].includes(type) && (this.$refs.clubManagerRef.managePerson.length === 0 || manageValid)) {
if (['onFinishTask', 'onSubmit'].includes(type) && (this.$refs.clubManagerRef.managePerson.length === 0 || manageValid)) {
this.$message.warning({ title: "警告", message: "请填写理事机构信息" })
return
}*/
}
const cloneData = clone(this.$refs.clubFormRef.formData)
let array = []
if (formData.sponsor) {
@@ -210,7 +216,7 @@ layout("/layouts/platform.html"){
this.$refs.clubSponsorRef.sponsorData.push(row)
})
this.$refs.clubFormRef.formData = formData
//await this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
this.$refs.clubFormRef.concatPersonChange(resp.data.concatPerson)
}
} else {
this.$axios.post("/platform/club/register/clubRegisterApply/createCode").then((res) => {
@@ -221,10 +227,36 @@ layout("/layouts/platform.html"){
}
})
}
}
},
async init() {
await this.$nextTick()
// 检查是否满足初始化条件
if (this.$refs.clubFormRef && this.$refs.clubSponsorRef && this.$refs.clubManagerRef) {
await this.initData()
// 重置重试计数器（避免后续再次调用时计数异常）
this.retryCount = 0
} else {
// 检查是否已达到最大重试次数
if (this.retryCount < this.maxRetryTimes) {
this.retryCount++
// 延迟100ms后重试，给组件挂载留时间
setTimeout(() => {
this.init()
}, 100)
} else {
// 达到最大重试次数，提示错误
this.$message.error({
title: "初始化失败",
message: '尝试' + this.maxRetryTimes + '次后仍未加载完成组件，请刷新页面重试！'
})
// 重置计数器
this.retryCount = 0
}
}
},
},
created() {
this.initData()
this.init()
}
})
</script>
src/main/resources/views/platform/zhgh/club/register/clubConfirm/index.html
+72 -67
View File
@@ -13,21 +13,21 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年&emsp;&emsp;度：">
<el-date-picker
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@keyup.enter.native="doSearch"
clearable
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
></el-input>
</search-item>
</search>
@@ -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="curTaskName" 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,7 +104,7 @@ layout("/layouts/platform.html"){
name: "",
audit: false
},
viewData: {},
formData: {},
showApprovalForm: false
}
},
@@ -112,44 +112,49 @@ layout("/layouts/platform.html"){
"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/register/mine/index.html
+1 -1
View File
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/register/officeAudit/index.html
+183
View File
@@ -0,0 +1,183 @@
<!--#
layout("/layouts/platform.html"){
#-->
<style>
.left-span-label {
margin: 10px 0;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年&emsp;&emsp;度：">
<el-date-picker
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
></el-input>
</search-item>
</search>
</el-card>
<el-card class="mt10" shadow="never">
<table-tool label="申请列表">
<el-radio-group v-model="pageForm.audit" @change="doSearch" size="small">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize">
<el-table-column :index="indexMethod" label="序号" type="index" width="80px"></el-table-column>
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="createTime" sortable show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ $moment(row.createTime).format('YYYY-MM-DD') }}</span>
</template>
</el-table-column>
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="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="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>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #public>
<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>
<script nonce="${cspNonce!}">
<!--#include("../../common/clubInfoComponent.js"){}#-->
<!--#include("../../common/clubRoleConstant.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
data() {
return {
pageForm: {
name: "",
audit: false
},
formData: {},
showApprovalForm: false
}
},
components: {
"register-info": REGISTER_INFO_COMPONENT
},
methods: {
onView(row) {
this.$refs.guava.public(() => {
this.$refs.registerInfoRef.onOpen(row)
this.showApprovalForm = false
})
},
onAudit(row) {
this.$refs.guava.public(() => {
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.showApprovalForm = true
this.$refs.registerInfoRef.onOpen(row)
})
},
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/club/register/officeAudit/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("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
async pageData() {
const resp = await this.$axios.post("/platform/club/register/officeAudit/pageData", this.pageForm)
if (resp.code === 0) {
this.tableData = resp.data.list
this.pageForm.totalCount = resp.data.totalCount
} else {
this.$message.warning(resp.msg)
}
}
},
async created() {
await this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/register/schoolLeaderAudit/index.html
+72 -67
View File
@@ -13,21 +13,21 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年&emsp;&emsp;度：">
<el-date-picker
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="协会名称：">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@keyup.enter.native="doSearch"
clearable
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
></el-input>
</search-item>
</search>
@@ -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="curTaskName" 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,7 +104,7 @@ layout("/layouts/platform.html"){
name: "",
audit: false
},
viewData: {},
formData: {},
showApprovalForm: false
}
},
@@ -112,44 +112,49 @@ layout("/layouts/platform.html"){
"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/register/schoolReply/index.html
+2 -1
View File
@@ -122,7 +122,8 @@ layout("/layouts/platform.html"){
this.$refs.guava.public(() => {
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
taskName: row.curTaskName,
clubId: row.id
}
this.showApprovalForm = true
this.$refs.registerInfoRef.onOpen(row)
src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html
+1 -1
View File
@@ -94,7 +94,7 @@ layout("/layouts/platform.html"){
created() {
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res))
this.$businessTool.listClubByRole().then((res) => (this.clubOptions = res))
this.pageData()
}
})
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/allocationEdit/index.html
+1 -1
View File
@@ -257,7 +257,7 @@ layout("/layouts/platform.html"){
async created() {
this.budgetTypeOption = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE")
this.budgetTypeOption.unshift({name: "全部类型", code: ""})
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
this.unionList = await this.$businessTool.listUnion()
this.getApplyMoney()
this.pageData()
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html
+1 -1
View File
@@ -344,7 +344,7 @@ layout("/layouts/platform.html"){
await this.getActivityBudgetType()
await this.getSchoolBudget()
this.unionList = await this.$businessTool.listUnion(this.$store.state.user.union.id)
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
}
})
</script>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
+1 -1
View File
@@ -233,7 +233,7 @@ layout("/layouts/platform.html"){
async created() {
this.budgetTypeOption = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE")
this.budgetTypeOption.unshift({name: "全部类型", code: ""})
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
this.unionList = await this.$businessTool.listUnion()
this.getApplyMoney()
this.pageData()
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html
+1 -1
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
},
async created() {
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
this.pageData()
}
})
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/apply/index.html
+1 -1
View File
@@ -302,7 +302,7 @@ layout("/layouts/platform.html"){
}
},
async init() {
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
this.budgetTypeOption = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE")
const budgetTypeOption = []
if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
+1 -1
View File
@@ -488,7 +488,7 @@ layout("/layouts/platform.html"){
created() {
this.init()
//社团查询
this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res))
this.$businessTool.listClubByRole().then((res) => (this.clubOptions = res))
}
})
</script>
src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html
+1 -1
View File
@@ -386,7 +386,7 @@ layout("/layouts/platform_h5.html"){
}
},
async init() {
this.clubOption = await this.$businessTool.listCLubByRole()
this.clubOption = await this.$businessTool.listClubByRole()
this.budgetTypeOption = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE")
const budgetTypeOption = []
if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html
+1 -1
View File
@@ -581,7 +581,7 @@ layout("/layouts/platform_h5.html"){
// 查询社团
queryClubs() {
this.$businessTool.listCLubByRole().then((res) => {
this.$businessTool.listClubByRole().then((res) => {
this.clubOptions = res
this.clubColumns = res.map(item => {
return { text: item.clubName, value: item.id }