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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-01-10 09:18:38 +08:00
parent f67d610fbb
commit f5d963cb06
7 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java
+3 -2
View File
@@ -66,7 +66,7 @@ public class ClubXTAuditController {
@At
@ViReturn
@RequiresPermissions("sys.club.clubRegist.xtAudit")
public Object doReview(Audit audit, String clubId, Integer pass) {
public Object doReview(Audit audit, String clubId, Integer pass, @Param("..")Sys_club sys_club) {
audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString());
audit.setLoginname(ShiroUtil.getPlatformLoginname());
audit.setUsername(ShiroUtil.getPlatformUsername());
@@ -82,6 +82,7 @@ public class ClubXTAuditController {
club.setState(ClubRegistAuditState.XGH_READY);
}
club.setXtAuditId(audit.getId());
club.setSchoolReplyFile(sys_club.getSchoolReplyFile());
dao.updateIgnoreNull(club);
return null;
}
@@ -90,7 +91,7 @@ public class ClubXTAuditController {
@ViReturn
@RequiresPermissions("sys.club.clubRegist.xtAudit")
public Object rollback(String id) {
dao.update(Sys_club.class, Chain.make("state", ClubRegistAuditState.XT_READY), Cnd.where("id", "=", id));
dao.update(Sys_club.class, Chain.make("state", ClubRegistAuditState.XT_READY).add("schoolReplyFile", null), Cnd.where("id", "=", id));
return null;
}
}
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java
+1 -2
View File
@@ -116,7 +116,6 @@ public class ClubXghReplyController {
sysRoleService.clearCache();
club.setFoundTime(StrUtil.blankToDefault(sys_club.getFoundTime(), DateUtil.now()));
}
club.setSchoolReplyFile(sys_club.getSchoolReplyFile());
club.setXghAuditId(audit.getId());
dao.updateIgnoreNull(club);
return null;
@@ -127,7 +126,7 @@ public class ClubXghReplyController {
@RequiresPermissions("sys.club.clubRegist.xghReply")
public Object rollback(String id) {
dao.update(Sys_club.class, Chain.make("state", ClubRegistAuditState.XGH_READY)
.add("foundTime", null).add("schoolReplyFile", null)
.add("foundTime", null)
, Cnd.where("id", "=", id));
//删除对应角色
List<Sys_club_user> sysClubUsers = dao.query(Sys_club_user.class,
src/main/resources/static/components/club/clubRegistInfo.vue
+8 -6
View File
@@ -96,8 +96,10 @@
</el-descriptions>
<vi-title title="成员列表" style="margin-top: 20px"></vi-title>
<el-table :data="viewData.clubuser" size="small" border
<el-table :data="viewData.clubuser" size="small" border max-height="500"
:header-cell-style="{background:'#F5F5F5',color:'#606266'}">
<el-table-column align="center" header-align="center" label="序号" type="index"
width="80px"></el-table-column>
<el-table-column label="人员身份" width="150px" prop="sf" header-align="center"
align="center">
<template slot-scope="scope">
@@ -157,6 +159,11 @@
<el-descriptions-item :span="2" label="审核意见">
{{ viewData.xtAudit.auditOpinion }}
</el-descriptions-item>
<el-descriptions-item label="审核附件">
<file-upload v-if="viewData.schoolReplyFile && viewData.schoolReplyFile.length > 0"
:files="JSON.parse(viewData.schoolReplyFile)"
:view="true"></file-upload>
</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
@@ -190,11 +197,6 @@
<el-descriptions-item label="成立时间">
{{ viewData.foundTime }}
</el-descriptions-item>
<el-descriptions-item label="审核附件">
<file-upload v-if="viewData.schoolReplyFile && viewData.schoolReplyFile.length > 0"
:files="JSON.parse(viewData.schoolReplyFile)"
:view="true"></file-upload>
</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
src/main/resources/views/platform/sys/club/regist/clubMyApply.html
+6 -2
View File
@@ -52,8 +52,12 @@ layout("/layouts/platform.html"){
<el-table-column label="协会名称" prop="name" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="协会类型" prop="typeName" sortable align="center" header-align="center"
show-overflow-tooltip></el-table-column>
<el-table-column label="发起类型" prop="sponsorType" sortable align="center" header-align="center"
show-overflow-tooltip>
<template slot-scope="{row}">
<span>{{ row.sponsorType === 1 ? '基层单位申请' : '协会发起人申请' }}</span>
</template>
</el-table-column>
<el-table-column label="申请时间" prop="create_time" sortable align="center" header-align="center"
show-overflow-tooltip>
<template slot-scope="{row}">
src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
+2 -2
View File
@@ -437,7 +437,7 @@ layout("/layouts/platform.html"){
}
}
})
this.sponsorData.forEach(item => item.disabled = true)
this.sponsorData.forEach(item => item.disabled = (item.userId !== '' && item.userId !== undefined))
this.activeName = '3'
},
manageNext() {
@@ -451,7 +451,7 @@ layout("/layouts/platform.html"){
}
}
})
this.managePerson.forEach(item => item.disabled = true)
this.managePerson.forEach(item => item.disabled = (item.userId !== '' && item.userId !== undefined))
this.activeName = '4'
},
deleteRow(row, index) {
src/main/resources/views/platform/sys/club/regist/xghReply.html
-8
View File
@@ -125,13 +125,6 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
</el-row>
<el-form-item prop="schoolReplyFile" label="审核附件">
<file-upload :files.sync="formData.schoolReplyFile" :max="5" :type="['doc','docx']">
<template #el-upload__tip>
<div class="el-upload__tip" slot="tip">请上传审核附件，格式为word</div>
</template>
</file-upload>
</el-form-item>
</el-form>
@@ -192,7 +185,6 @@ layout("/layouts/platform.html"){
await this.$refs["form"].validate(async(valid) => {
if (valid) {
this.formData.pass = flag
this.formData.schoolReplyFile = JSON.stringify(this.formData.schoolReplyFile)
const resp = await $.post('/platform/sys/club/xghReply/doReview', this.formData)
if(resp.code === 0) {
await this.pageData()
src/main/resources/views/platform/sys/club/regist/xtAudit.html
+9
View File
@@ -111,6 +111,14 @@ layout("/layouts/platform.html"){
placeholder="请填写您的审核意见"></el-input>
</el-form-item>
<el-form-item prop="schoolReplyFile" label="审核附件">
<file-upload :files.sync="formData.schoolReplyFile" :max="5" :type="['doc','docx']">
<template #el-upload__tip>
<div class="el-upload__tip" slot="tip">请上传审核附件，格式为word</div>
</template>
</file-upload>
</el-form-item>
</el-form>
<div style="float: right;margin: 20px 0">
@@ -170,6 +178,7 @@ layout("/layouts/platform.html"){
await this.$refs["form"].validate(async(valid) => {
if (valid) {
this.formData.pass = flag
this.formData.schoolReplyFile = JSON.stringify(this.formData.schoolReplyFile)
const resp = await $.post('/platform/sys/club/xtAudit/doReview', this.formData)
if(resp.code === 0) {
await this.pageData()