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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-05-06 19:21:24 +08:00
parent a4e8706cf2
commit 4b0dfc8f0e
9 changed files with 601 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java
+2 -1
View File
@@ -222,7 +222,8 @@ public class ActUserController {
add(new ExcelExportEntity("联系方式", "mobile", 20)); add(new ExcelExportEntity("联系方式", "mobile", 20));
add(new ExcelExportEntity("职务", "position", 20)); add(new ExcelExportEntity("职务", "position", 20));
add(new ExcelExportEntity("所属单位", "unitName", 20)); add(new ExcelExportEntity("所属单位", "unitName", 20));
add(new ExcelExportEntity("报名时间", "signUpTime2", 20)); add(new ExcelExportEntity("报名时间", "signUpTime", 20));
add(new ExcelExportEntity("是否签到", "isSignInDesc", 20));
}}; }};
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment;filename=" + new String((activity.getTitle() + "报名数据表.xlsx").getBytes(StandardCharsets.UTF_8), "ISO8859-1")); response.setHeader("Content-Disposition", "attachment;filename=" + new String((activity.getTitle() + "报名数据表.xlsx").getBytes(StandardCharsets.UTF_8), "ISO8859-1"));
backend/src/main/java/com/budwk/app/module/activity/controller/ActivityItemApplyQueryController.java
+2 -1
View File
@@ -79,9 +79,10 @@ public class ActivityItemApplyQueryController {
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup(); SqlExpressionGroup group = new SqlExpressionGroup();
group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"); group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.unitName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"); group.or("au.phone", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group); cnd.and(group);
} }
cnd.andEX("au.unitId","=",pageForm.getUnitId());
cnd.and("au.activityId", "=", pageForm.getActivityId()); cnd.and("au.activityId", "=", pageForm.getActivityId());
cnd.andEX("aiu.itemId", "=", pageForm.getItemId()); cnd.andEX("aiu.itemId", "=", pageForm.getItemId());
cnd.asc("ai.`name`"); cnd.asc("ai.`name`");
backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java
+20 -4
View File
@@ -76,9 +76,12 @@ public class ActivitySignInQueryController {
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup(); SqlExpressionGroup group = new SqlExpressionGroup();
group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"); group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.unitName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"); group.or("au.phone", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group); cnd.and(group);
} }
cnd.andEX("au.unitId","=",pageForm.getUnitId());
cnd.andEX("au.isStay","=",pageForm.getIsStay());
cnd.andEX("au.isGrant","=",pageForm.getIsGrant());
cnd.and("au.activityId", "=", pageForm.getActivityId()); cnd.and("au.activityId", "=", pageForm.getActivityId());
cnd.and("au.isSignIn", "=", 1); cnd.and("au.isSignIn", "=", 1);
cnd.desc("au.signInTime"); cnd.desc("au.signInTime");
@@ -109,7 +112,15 @@ public class ActivitySignInQueryController {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
au.*, au.*,
DATE_FORMAT(signInTime, '%Y-%m-%d %H:%i:%s') signInTime DATE_FORMAT(signInTime, '%Y-%m-%d %H:%i:%s') signInTime,
CASE au.isStay
WHEN 1 THEN '住宿'
WHEN 0 THEN '不住宿'
END AS isStayDesc,
CASE au.isGrant
WHEN 1 THEN '已发放'
WHEN 0 THEN '未发放'
END AS isGrantDesc
FROM FROM
`act_user` au `act_user` au
$condition $condition
@@ -117,9 +128,12 @@ public class ActivitySignInQueryController {
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup(); SqlExpressionGroup group = new SqlExpressionGroup();
group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"); group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.unitName", "LIKE", "%" + pageForm.getSearchKeyword() + "%"); group.or("au.phone", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group); cnd.and(group);
} }
cnd.andEX("au.isStay","=",pageForm.getIsStay());
cnd.andEX("au.isGrant","=",pageForm.getIsGrant());
cnd.andEX("au.unitId","=",pageForm.getUnitId());
cnd.and("au.activityId", "=", pageForm.getActivityId()); cnd.and("au.activityId", "=", pageForm.getActivityId());
cnd.and("au.isSignIn", "=", 1); cnd.and("au.isSignIn", "=", 1);
cnd.desc("au.signInTime"); cnd.desc("au.signInTime");
@@ -132,7 +146,9 @@ public class ActivitySignInQueryController {
add(new ExcelExportEntity("身份证号码", "idCard", 20)); add(new ExcelExportEntity("身份证号码", "idCard", 20));
add(new ExcelExportEntity("联系方式", "mobile", 20)); add(new ExcelExportEntity("联系方式", "mobile", 20));
add(new ExcelExportEntity("参加单位名称", "unitName", 20)); add(new ExcelExportEntity("参加单位名称", "unitName", 20));
add(new ExcelExportEntity("签到时间", "signUpTime2", 20)); add(new ExcelExportEntity("签到时间", "signInTime", 20));
add(new ExcelExportEntity("是否住宿", "isStayDesc", 20));
add(new ExcelExportEntity("物资发放", "isGrantDesc", 20));
}}; }};
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java
+7 -8
View File
@@ -38,7 +38,11 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> implements ActU
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
u.*, u.*,
DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime2, DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime,
CASE u.isSignIn
WHEN 1 THEN '已签到'
WHEN 0 THEN '未签到'
END AS isSignInDesc,
act.`title` AS activityName act.`title` AS activityName
FROM FROM
act_user u act_user u
@@ -53,13 +57,8 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> implements ActU
seg.orLike("u.phone", pageForm.getSearchKeyword()); seg.orLike("u.phone", pageForm.getSearchKeyword());
cnd.and(seg); cnd.and(seg);
} }
if (pageForm.getIsSignIn() != 1) { cnd.andEX("u.isSignIn", "=", pageForm.getIsSignIn());
cnd.andEX("u.isSignIn", "=", pageForm.getIsSignIn() == 2 ? 1 : 0); cnd.andEX("u.unitId", "=", pageForm.getUnitId());
}
// cnd.andEX("u.phone", "like", "%" + pageForm.getPhone() + "%");
if (StrUtil.isNotBlank(pageForm.getUnitName())) {
cnd.and("u.unitName", "like", "%" + pageForm.getUnitName() + "%");
}
sql.setCondition(cnd); sql.setCondition(cnd);
return sql; return sql;
} }
backend/src/main/java/com/budwk/app/module/activity/vo/page/ActSignInUserPageForm.java
+6
View File
@@ -23,5 +23,11 @@ public class ActSignInUserPageForm extends PageForm {
// 所属单位 // 所属单位
private String unitName; private String unitName;
// 发放状态
private Integer isGrant;
// 单位
private Integer unitId;
// 是否住宿
private Integer isStay;
} }
backend/src/main/java/com/budwk/app/module/activity/vo/page/ActUserPageForm.java
+3 -1
View File
@@ -23,6 +23,8 @@ public class ActUserPageForm extends PageForm {
// 所属单位 // 所属单位
private String unitName; private String unitName;
// 是否签到1.全部2.已签到3.未签到 // 所属单位
private String unitId;
// 是否签到
private Integer isSignIn; private Integer isSignIn;
} }
backend/src/main/resources/views/platform/activity/itemApplyQuery/index.html
+26 -4
View File
@@ -46,9 +46,23 @@ layout("/layouts/platform_1.html"){
</div> </div>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="search-item-label">姓名/单位</div> <div class="search-item-label">姓名/电话</div>
<div class="search-item-option"> <div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/单位"></el-input> <el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/电话"></el-input>
</div>
</div>
<div class="search-item">
<div class="search-item-label">所属单位</div>
<div class="search-item-option">
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
filterable
@change="setModifyFormUnit"
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
</div> </div>
</div> </div>
@@ -72,7 +86,7 @@ layout("/layouts/platform_1.html"){
<el-table-column label="性别" prop="sex"width="150"></el-table-column> <el-table-column label="性别" prop="sex"width="150"></el-table-column>
<el-table-column label="职务" prop="position"></el-table-column> <el-table-column label="职务" prop="position"></el-table-column>
<el-table-column label="身份证号码" prop="idCard"></el-table-column> <el-table-column label="身份证号码" prop="idCard"></el-table-column>
<el-table-column label="联系方式" prop="mobile"></el-table-column> <el-table-column label="联系方式" prop="phone"></el-table-column>
<el-table-column label="参加单位名称" prop="unitName"></el-table-column> <el-table-column label="参加单位名称" prop="unitName"></el-table-column>
<el-table-column label="参加项目" prop="itemName"></el-table-column> <el-table-column label="参加项目" prop="itemName"></el-table-column>
</el-table> </el-table>
@@ -92,7 +106,8 @@ layout("/layouts/platform_1.html"){
year: new Date().getFullYear() + "" year: new Date().getFullYear() + ""
}, },
activityOptions: [], activityOptions: [],
activityItemOptions: [] activityItemOptions: [],
units: [],
} }
}, },
methods: { methods: {
@@ -126,9 +141,16 @@ layout("/layouts/platform_1.html"){
}) })
}, },
async getUnits(){
const resp = await $.post('/open/common/units')
if (resp.code === 0) {
this.units = resp.data
}
}
}, },
created() { created() {
this.getActivityOptions() this.getActivityOptions()
this.getUnits()
} }
}) })
</script> </script>
backend/src/main/resources/views/platform/activity/signInUserQuery/index.html
+74 -29
View File
@@ -33,9 +33,39 @@ layout("/layouts/platform_1.html"){
</div> </div>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="search-item-label">姓名/单位</div> <div class="search-item-label">发放状态</div>
<div class="search-item-option"> <div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/单位"></el-input> <el-select v-model="pageForm.isGrant" placeholder="请选择发放状态" clearable>
<el-option label="已发放" :value="1"></el-option>
<el-option label="未发放" :value="0"></el-option>
</el-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">住宿状态</div>
<div class="search-item-option">
<el-select v-model="pageForm.isStay" placeholder="请选择住宿状态" clearable>
<el-option label="住宿" :value="1"></el-option>
<el-option label="不住宿" :value="0"></el-option>
</el-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">姓名/电话</div>
<div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/电话"></el-input>
</div>
</div>
<div class="search-item">
<div class="search-item-label">所属单位</div>
<div class="search-item-option">
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
filterable
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
</div> </div>
</div> </div>
@@ -59,21 +89,28 @@ layout("/layouts/platform_1.html"){
<el-table-column label="性别" prop="sex"></el-table-column> <el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="职务" prop="position"></el-table-column> <el-table-column label="职务" prop="position"></el-table-column>
<el-table-column label="身份证号码" prop="idCard"></el-table-column> <el-table-column label="身份证号码" prop="idCard"></el-table-column>
<el-table-column label="联系方式" prop="mobile"></el-table-column> <el-table-column label="联系方式" prop="phone"></el-table-column>
<el-table-column label="参加单位名称" prop="unitName"></el-table-column> <el-table-column label="参加单位名称" prop="unitName"></el-table-column>
<el-table-column label="签到时间" prop="signInTime"></el-table-column> <el-table-column label="签到时间" prop="signInTime"></el-table-column>
<el-table-column label="是否住宿" prop="isStay">
<template slot-scope="{row}">
{{row.isStay?'住宿':'不住宿'}}
</template>
</el-table-column>
<el-table-column label="物资发放" prop="isGrant"> <el-table-column label="物资发放" prop="isGrant">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.isGrant" type="success">已发放</el-tag> <el-tag v-if="scope.row.isGrant" type="success">已发放</el-tag>
<el-tag v-else type="danger">未发放</el-tag> <el-tag v-else type="danger">未发放</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="200"> <el-table-column label="操作" fixed="right" width="200">
<template #default="{row}"> <template #default="{row}">
<el-button v-if="!row.isGrant || row.isGrant === 0" type="primary" size="mini" @click="doGrant(row, true)">设为已发放物资</el-button> <el-button v-if="!row.isGrant || row.isGrant === 0" type="primary" size="mini"
<el-button v-else type="danger" size="mini" @click="doGrant(row, false)">设为未发放物资</el-button> @click="doGrant(row, true)">设为已发放物资
</template> </el-button>
</el-table-column> <el-button v-else type="danger" size="mini" @click="doGrant(row, false)">设为未发放物资</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<!--#include("/layouts/pagination.html"){}#--> <!--#include("/layouts/pagination.html"){}#-->
</el-card> </el-card>
@@ -90,28 +127,29 @@ layout("/layouts/platform_1.html"){
pageForm: { pageForm: {
year: new Date().getFullYear() + "" year: new Date().getFullYear() + ""
}, },
activityOptions: [] activityOptions: [],
units: [],
} }
}, },
methods: { methods: {
async doGrant(row, isGrant) { async doGrant(row, isGrant) {
this.$confirm('您确定要设置成' + (isGrant ? '已发放' : '未发放') + '状态吗？', '提示', { this.$confirm('您确定要设置成' + (isGrant ? '已发放' : '未发放') + '状态吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(async () => { }).then(async () => {
const resp = await $.post("/platform/activity/signInUserQuery/doGrant", { const resp = await $.post("/platform/activity/signInUserQuery/doGrant", {
id: row.id, id: row.id,
isGrant: isGrant isGrant: isGrant
}) })
if (resp.code === 0) { if (resp.code === 0) {
this.doSearch() this.doSearch()
this.$message.success(resp.msg) this.$message.success(resp.msg)
} else { } else {
this.$message.error(resp.msg) this.$message.error(resp.msg)
} }
}) })
}, },
doExport() { doExport() {
window.open("/platform/activity/signInUserQuery/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword) window.open("/platform/activity/signInUserQuery/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword)
}, },
@@ -131,9 +169,16 @@ layout("/layouts/platform_1.html"){
}) })
}, },
async getUnits() {
const resp = await $.post('/open/common/units')
if (resp.code === 0) {
this.units = resp.data
}
}
}, },
created() { created() {
this.getActivityOptions() this.getActivityOptions()
this.getUnits()
} }
}) })
</script> </script>
backend/src/main/resources/views/platform/activity/user/index.html
+461 -391
View File
@@ -2,411 +2,481 @@
layout("/layouts/platform_1.html"){ layout("/layouts/platform_1.html"){
#--> #-->
<div id="app"> <div id="app">
<el-card shadow="never"> <el-card shadow="never">
<div class="search"> <div class="search">
<div class="search-item"> <div class="search-item">
<div class="search-item-label">年度</div> <div class="search-item-label">年度</div>
<div class="search-item-option"> <div class="search-item-option">
<el-date-picker <el-date-picker
:clearable="false" :clearable="false"
placeholder="选择年" placeholder="选择年"
style="width: 100%" style="width: 100%"
type="year" type="year"
@change="getActivityList" @change="getActivityList"
v-model="pageForm.year" v-model="pageForm.year"
value-format="yyyy" value-format="yyyy"
></el-date-picker> ></el-date-picker>
</div> </div>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="search-item-label">所属活动</div> <div class="search-item-label">所属活动</div>
<div class="search-item-option"> <div class="search-item-option">
<el-select @change="doSearch" <el-select @change="doSearch"
placeholder="请选择活动查询" placeholder="请选择活动查询"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.activityId"> v-model="pageForm.activityId">
<el-option :label="item.title" :value="item.id" <el-option :label="item.title" :value="item.id"
v-for="item in activityList"></el-option> v-for="item in activityList"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="search-item-label">姓名/电话</div> <div class="search-item-label">姓名/电话</div>
<div class="search-item-option"> <div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名" <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名"
clearable @keyup.enter.native="doSearch"></el-input> clearable @keyup.enter.native="doSearch"></el-input>
</div> </div>
</div> </div>
<div class="search-item">
<div class="search-query"> <div class="search-item-label">签到状态</div>
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button> <div class="search-item-option">
</div> <el-select v-model="pageForm.isSignIn" placeholder="请选择发放状态" clearable>
</div> <el-option label="已签到" :value="1"></el-option>
</el-card> <el-option label="未签到" :value="0"></el-option>
</el-select>
<el-card shadow="never" class="mt-3"> </div>
<el-row type="flex" style="justify-content: flex-end" class="mb-3"> </div>
<el-button icon="el-icon-plus" type="primary" size="small" @click="openAddUser">添加报名人员</el-button>
<el-button icon="el-icon-plus" type="primary" size="small" @click="doExport">导出</el-button> <div class="search-item">
<el-radio-group v-model="pageForm.isSignIn" type="primary" class="ml-3"@change="doSearch"> <div class="search-item-label">所属单位</div>
<el-radio-button :label="1">全部</el-radio-button> <div class="search-item-option">
<el-radio-button :label="2">已签到</el-radio-button> <el-select placeholder="请选择所属单位"
<el-radio-button :label="3">未签到</el-radio-button> style="width: 100%;" clearable
</el-radio-group> filterable
@change="setModifyFormUnit"
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
</div>
</div>
<div class="search-query">
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
</div>
</div>
</el-card>
<el-card shadow="never" class="mt-3">
<el-row type="flex" style="justify-content: flex-end" class="mb-3">
<el-button icon="el-icon-plus" type="primary" size="small" @click="openAddUser">添加报名人员</el-button>
<el-button icon="el-icon-plus" type="primary" size="small" @click="doExport">导出</el-button>
</el-row> </el-row>
<el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData"> <el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData">
<el-table-column label="序号" type="index" header-align="center" align="center" <el-table-column label="序号" type="index" header-align="center" align="center"
width="50"></el-table-column> width="50"></el-table-column>
<el-table-column label="姓名" prop="userName"></el-table-column> <el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column> <el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="联系方式" prop="phone"></el-table-column> <el-table-column label="联系方式" prop="phone"></el-table-column>
<el-table-column label="身份证件号" prop="idCard"></el-table-column> <el-table-column label="身份证件号" prop="idCard"></el-table-column>
<el-table-column label="职务" prop="position"></el-table-column> <el-table-column label="职务" prop="position"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column> <el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="报名时间" prop="signUpTime"></el-table-column> <el-table-column label="报名时间" prop="signUpTime"></el-table-column>
<el-table-column label="是否签到" prop="isSignIn"> <el-table-column label="是否签到" prop="isSignIn">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.isSignIn?'已签到':'未签到'}} {{row.isSignIn?'已签到':'未签到'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="250"> <el-table-column label="操作" fixed="right" width="250">
<template #default="scope"> <template #default="scope">
<el-button type="text" @click="openModify">修改</el-button> <el-button type="primary" size="mini" @click="openModify(scope.row)">修改</el-button>
<el-button type="text" class="text-danger" @click="onTableRowDelete(scope.row.id)">删除</el-button> <el-button type="danger" size="mini" @click="doRemove(scope.row.id)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--#include("/layouts/pagination.html"){}#--> <!--#include("/layouts/pagination.html"){}#-->
</el-card> </el-card>
<el-dialog title="添加报名人员" :visible.sync="addDialog" width="60%"> <el-dialog title="添加报名人员" :visible.sync="addDialog" width="60%">
<el-form :model="formData" :rules="formRules" ref="formRef" label-width="100px"> <el-form :model="formData" :rules="formRules" ref="formRef" label-width="100px">
<el-form-item label="活动名称" prop="activityName"> <el-form-item label="活动名称" prop="activityName">
<el-input v-model="formData.activityName" readonly></el-input> <el-input v-model="formData.activityName" readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item label="参加单位" prop="unitName"> <el-form-item label="参加单位" prop="unitName">
<el-input v-model="formData.unitName" placeholder="请输入参加单位"></el-input> <el-select placeholder="请选择所属单位"
</el-form-item> style="width: 100%;" clearable
<el-form-item label="联系人" prop="contactName"> @change="setFormDataUnit"
<el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input> v-model="formData.unitId">
</el-form-item> <el-option :label="item.name" :value="item.id"
<el-form-item label="联系方式" prop="contactPhone"> v-for="item in units"></el-option>
<el-input v-model="formData.contactPhone" placeholder="请输入联系方式" maxlength="11" type="text" show-word-limit></el-input> </el-select>
</el-form-item> <!-- <el-input v-model="formData.unitName" placeholder="请输入参加单位"></el-input>-->
<el-form-item label="报名人员" prop="userList"> </el-form-item>
<el-table :data="formData.userList" border size="small" width="100%"> <el-form-item label="联系人" prop="contactName">
<el-table-column label="姓名" prop="userName" fixed width="200"> <el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input>
<template slot-scope="{row}"> </el-form-item>
<el-autocomplete style="width: 100%" <el-form-item label="联系方式" prop="contactPhone">
v-model="row.userName" <el-input v-model="formData.contactPhone" placeholder="请输入联系方式" maxlength="11" type="text" show-word-limit></el-input>
:fetch-suggestions="queryUserAsync" </el-form-item>
placeholder="请输入内容" <el-form-item label="报名人员" prop="userList">
@select="handleSelect($event, row)" <el-table :data="formData.userList" border size="small" width="100%">
></el-autocomplete> <el-table-column label="姓名" prop="userName" fixed width="200">
<!-- <el-input v-model="row.userName" maxlength="50"--> <template slot-scope="{row}">
<!-- placeholder="请输入姓名"></el-input>--> <el-autocomplete style="width: 100%"
</template> v-model="row.userName"
</el-table-column> :fetch-suggestions="queryUserAsync"
<el-table-column label="性别" prop="sex" width="200"> placeholder="请输入内容"
<template slot-scope="{row}"> @select="handleSelect($event, row)"
<el-radio-group v-model="row.sex"> ></el-autocomplete>
<el-radio label="男"></el-radio> <!-- <el-input v-model="row.userName" maxlength="50"-->
<el-radio label="女"></el-radio> <!-- placeholder="请输入姓名"></el-input>-->
</el-radio-group> </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="性别" prop="sex" width="200">
<el-table-column label="联系方式" prop="phone" width="200"> <template slot-scope="{row}">
<template slot-scope="{row}"> <el-radio-group v-model="row.sex">
<el-input v-model="row.phone" maxlength="11" type="text" <el-radio label="男"></el-radio>
show-word-limit placeholder="请输入联系方式"></el-input> <el-radio label="女"></el-radio>
</template> </el-radio-group>
</el-table-column> </template>
<el-table-column label="身份证件号" prop="idCard" width="250"> </el-table-column>
<template slot-scope="{row}"> <el-table-column label="联系方式" prop="phone" width="200">
<el-input v-model="row.idCard" maxlength="18" type="text" <template slot-scope="{row}">
show-word-limit placeholder="请输入身份证件号"></el-input> <el-input v-model="row.phone" maxlength="11" type="text"
</template> show-word-limit placeholder="请输入联系方式"></el-input>
</el-table-column> </template>
<el-table-column label="职务" prop="position" width="200"> </el-table-column>
<template slot-scope="{row}"> <el-table-column label="身份证件号" prop="idCard" width="250">
<el-input v-model="row.position" maxlength="100" <template slot-scope="{row}">
placeholder="请输入职务"></el-input> <el-input v-model="row.idCard" maxlength="18" type="text"
</template> show-word-limit placeholder="请输入身份证件号"></el-input>
</el-table-column> </template>
<!--<el-table-column label="所属单位" prop="unitName" width="250"> </el-table-column>
<template slot-scope="{row}"> <el-table-column label="职务" prop="position" width="200">
<el-input v-model="row.unitName" maxlength="100" placeholder="请输所属单位"></el-input> <template slot-scope="{row}">
</template> <el-input v-model="row.position" maxlength="100"
</el-table-column>--> placeholder="请输入职务"></el-input>
<el-table-column width="100px" fixed="right"> </template>
<template slot="header" slot-scope="scope"> </el-table-column>
<el-button type="primary" size="mini" <!--<el-table-column label="所属单位" prop="unitName" width="250">
@click="formData.userList.push({})">添加 <template slot-scope="{row}">
</el-button> <el-input v-model="row.unitName" maxlength="100" placeholder="请输所属单位"></el-input>
</template> </template>
<template slot-scope="scope"> </el-table-column>-->
<el-button <el-table-column width="100px" fixed="right">
type="danger" <template slot="header" slot-scope="scope">
icon="el-icon-delete" <el-button type="primary" size="mini"
size="mini" @click="formData.userList.push({})">添加
:disabled="formData.userList.length===0" </el-button>
@click="formData.userList.splice(scope.$index,1)" </template>
></el-button> <template slot-scope="scope">
</template> <el-button
</el-table-column> type="danger"
</el-table> icon="el-icon-delete"
</el-form-item> size="mini"
</el-form> :disabled="formData.userList.length===0"
<div slot="footer" class="dialog-footer"> @click="formData.userList.splice(scope.$index,1)"
<el-button @click="addDialog = false">取 消</el-button> ></el-button>
<el-button type="primary" @click="onAddUserSubmit">确 定</el-button> </template>
</div> </el-table-column>
</el-dialog> </el-table>
</el-form-item>
<el-dialog title="修改报名信息" :visible.sync="modifyDialog" width="40%"> </el-form>
<el-form :model="modifyForm" :rules="modifyRules" ref="modifyFormRef" label-width="100px"> <div slot="footer" class="dialog-footer">
<el-form-item label="姓名" prop="userName"> <el-button @click="addDialog = false">取 消</el-button>
<el-input v-model="modifyForm.userName"></el-input> <el-button type="primary" @click="onAddUserSubmit">确 定</el-button>
</el-form-item> </div>
<el-form-item label="性别" prop="sex"> </el-dialog>
<el-radio-group v-model="modifyForm.sex">
<el-radio label="男"></el-radio> <el-dialog title="修改报名信息" :visible.sync="modifyDialog" width="40%">
<el-radio label="女"></el-radio> <el-form :model="modifyForm" :rules="modifyRules" ref="modifyFormRef" label-width="100px">
</el-radio-group> <el-form-item label="姓名" prop="userName">
</el-form-item> <el-input v-model="modifyForm.userName"></el-input>
<el-form-item label="联系方式" prop="phone"> </el-form-item>
<el-input v-model="modifyForm.phone"></el-input> <el-form-item label="性别" prop="sex">
</el-form-item> <el-radio-group v-model="modifyForm.sex">
<el-form-item label="身份证件号" prop="idCard"> <el-radio label="男"></el-radio>
<el-input v-model="modifyForm.idCard"></el-input> <el-radio label="女"></el-radio>
</el-form-item> </el-radio-group>
<el-form-item label="职务" prop="position"> </el-form-item>
<el-input v-model="modifyForm.position"></el-input> <el-form-item label="联系方式" prop="phone">
</el-form-item> <el-input v-model="modifyForm.phone"></el-input>
<el-form-item label="所属单位" prop="unitName"> </el-form-item>
<el-input v-model="modifyForm.unitName"></el-input> <el-form-item label="身份证件号" prop="idCard">
</el-form-item> <el-input v-model="modifyForm.idCard"></el-input>
</el-form> </el-form-item>
<span slot="footer" class="dialog-footer"> <el-form-item label="职务" prop="position">
<el-input v-model="modifyForm.position"></el-input>
</el-form-item>
<el-form-item label="所属单位" prop="unitName">
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
@change="setModifyFormUnit"
v-model="modifyForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
<!-- <el-input v-model="modifyForm.unitName"></el-input>-->
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="modifyDialog = false">取消</el-button> <el-button @click="modifyDialog = false">取消</el-button>
<el-button type="primary" @click="onModifySubmit">提交</el-button> <el-button type="primary" @click="onModifySubmit">提交</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
<script> <script>
const vue = new Vue({ const vue = new Vue({
el: "#app", el: "#app",
mixins: [initTableMixins], mixins: [initTableMixins],
data() { data() {
return { return {
pageForm: { pageForm: {
isSignIn: 1, year: new Date().getFullYear() + '',
year: new Date().getFullYear() + '', },
}, activityList: [],
activityList: [], // 修改表单
// 修改表单 modifyDialog: false,
modifyDialog: false, modifyForm: {},
modifyForm: {}, modifyRules: {
modifyRules: { userName: [{required: true, message: '请输入姓名', trigger: ['blur', 'change']}],
userName: [{required: true, message: '请输入姓名', trigger: ['blur', 'change']}], sex: [{required: true, message: '请选择性别', trigger: ['blur', 'change']}],
sex: [{required: true, message: '请选择性别', trigger: ['blur', 'change']}], phone: [{
phone: [{ required: true,
required: true, validator: (rule, value, callback) => {
validator: (rule, value, callback) => { if (!value) {
if (!value) { // 如果值为空，直接通过校验
// 如果值为空，直接通过校验 callback();
callback(); } else if (/^[1][345789][0-9]{9}$/.test(value)) {
} else if (/^[1][345789][0-9]{9}$/.test(value)) { // 手机号格式正确
// 手机号格式正确 callback();
callback(); } else if (/^\d+-\d+$/.test(value) && value.length <= 16) {
} else if (/^\d+-\d+$/.test(value) && value.length <= 16) { // 座机号格式正确
// 座机号格式正确 callback();
callback(); } else {
} else { // 格式错误，返回错误信息
// 格式错误，返回错误信息 callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误'));
callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误')); }
} },
}, trigger: ["change", "blur"]
trigger: ["change", "blur"] }],
}], idCard: [
idCard: [ {
{ required: true,
required: true, validator: (rule, value, callback) => {
validator: (rule, value, callback) => { if (!value) {
if (!value) { // 如果值为空，直接通过校验
// 如果值为空，直接通过校验 callback();
callback(); } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) {
} else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) { // 18位身份证号码格式正确
// 18位身份证号码格式正确 callback();
callback(); } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { // 15位身份证号码格式正确
// 15位身份证号码格式正确 callback();
callback(); } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
} else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { // 外国人身份证号码格式正确（18位）
// 外国人身份证号码格式正确（18位） callback();
callback(); } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) {
} else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { // 外国人身份证号码格式正确（15位）
// 外国人身份证号码格式正确（15位） callback();
callback(); } else {
} else { // 格式错误，返回错误信息
// 格式错误，返回错误信息 callback(new Error("身份证号码格式错误"));
callback(new Error("身份证号码格式错误")); }
} },
}, trigger: ["change", "blur"]
trigger: ["change", "blur"] }
} ],
], position: [{required: true, message: '请输入职务', trigger: ['blur', 'change']}],
position: [{required: true, message: '请输入职务', trigger: ['blur', 'change']}], unitName: [{required: true, message: '请输入所属单位', trigger: ['blur', 'change']}],
unitName: [{required: true, message: '请输入所属单位', trigger: ['blur', 'change']}], },
},
// 添加报名人员相关
// 添加报名人员相关 addDialog: false,
addDialog: false, formData: {
formData: { activityId: '',
activityId: '', userList: []
userList: [] },
}, formRules: {
formRules: { activityId: [{required: true, message: '请选择活动', trigger: ['blur', 'change']}],
activityId: [{required: true, message: '请选择活动', trigger: ['blur', 'change']}], unitName: [{required: true, message: '请填写参加单位', trigger: ['blur', 'change']}],
unitName: [{required: true, message: '请填写参加单位', trigger: ['blur', 'change']}], contactName: [{required: true, message: '请填写联系人', trigger: ['blur', 'change']}],
contactName: [{required: true, message: '请填写联系人', trigger: ['blur', 'change']}], contactPhone: [{required: true, message: '请填写联系电话', trigger: ['blur', 'change']}],
contactPhone: [{required: true, message: '请填写联系电话', trigger: ['blur', 'change']}], userList: [{required: true, message: '请添加报名人员', trigger: ['blur', 'change']}]
userList: [{required: true, message: '请添加报名人员', trigger: ['blur', 'change']}] },
},
} units: [],
}, }
methods: { },
doExport() { methods: {
window.open("/platform/activity/user/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword) setFormDataUnit(val) {
}, if (!val) {
openAddUser(){ this.formData.unitName = ''
if (!this.pageForm.activityId) { return
this.$message.warning('请先选择活动') }
return this.formData.unitName = this.units.find(item => item.id === this.formData.unitId).name
} },
this.formData.userList = [] setModifyFormUnit(val) {
this.addDialog = true if (!val) {
this.formData.activityId = this.pageForm.activityId this.modifyForm.unitName = ''
this.formData.activityName = this.activityList.find(item => item.id === this.formData.activityId).title return
}, }
async queryUserAsync(query, cb){ this.modifyForm.unitName = this.units.find(item => item.id === this.modifyForm.unitId).name
const resp = await $.post('/platform/activity/user/queryUser', { },
query, doRemove(id) {
activityId: this.formData.activityId this.$confirm('您确定要删除吗？', '提示', {
}) confirmButtonText: '确定',
if (resp.code === 0) { cancelButtonText: '取消',
if (resp.data.list && resp.data.list.length > 0) { type: 'warning'
cb(resp.data.list.map(v => { }).then(async () => {
return {value: v.username + '(' + (v.phone ? v.phone : '未填写联系方式') + ')', ...v} const resp = await $.post('/platform/activity/user/doDeleteActUser', {id})
})) if (resp.code === 0) {
} else { this.doSearch()
cb([]) this.$message.success(resp.msg)
} } else {
} else { this.$message.warning('操作失败')
cb([]) }
} })
}, },
handleSelect(item, row){ doExport() {
this.$set(row, 'userId', item.id) window.open("/platform/activity/user/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword)
this.$set(row, 'userName', item.username) },
this.$set(row, 'sex', item.sex) openAddUser(){
this.$set(row, 'phone', item.phone ? item.phone : '') if (!this.pageForm.activityId) {
}, this.$message.warning('请先选择活动')
async onAddUserSubmit(){ return
const userList = this.formData.userList; }
if (!userList || userList === []) { this.formData.userList = []
this.$message.warning("请添加报名人员") this.addDialog = true
return this.formData.activityId = this.pageForm.activityId
} this.formData.activityName = this.activityList.find(item => item.id === this.formData.activityId).title
},
let errorMessages = []; async queryUserAsync(query, cb){
const requiredFields = [ const resp = await $.post('/platform/activity/user/queryUser', {
{ key: 'userName', message: '姓名不能为空' }, query,
{ key: 'sex', message: '性别不能为空' }, activityId: this.formData.activityId
{ key: 'phone', message: '联系方式不能为空' }, })
{ key: 'idCard', message: '身份证件号不能为空' }, if (resp.code === 0) {
{ key: 'position', message: '职务不能为空' } if (resp.data.list && resp.data.list.length > 0) {
]; cb(resp.data.list.map(v => {
return {value: v.username + '(' + (v.phone ? v.phone : '未填写联系方式') + ')', ...v}
userList.forEach((user, index) => { }))
requiredFields.forEach(field => { } else {
if (user[field.key] == null || user[field.key] === "") { cb([])
errorMessages.push('第' + (index + 1) + '行：' + field.message); }
} } else {
}); cb([])
}); }
},
if (errorMessages.length > 0) { handleSelect(item, row){
// 将错误信息转换为 HTML 格式，使用 <br> 实现换行 this.$set(row, 'userId', item.id)
const errorSummary = errorMessages.join("<br>"); this.$set(row, 'userName', item.username)
this.$message.warning({ this.$set(row, 'sex', item.sex)
message: errorSummary, this.$set(row, 'phone', item.phone ? item.phone : '')
dangerouslyUseHTMLString: true },
}); async onAddUserSubmit(){
return const userList = this.formData.userList;
} if (!userList || userList === []) {
const formData = JSON.parse(JSON.stringify(this.formData)); this.$message.warning("请添加报名人员")
formData.userList = JSON.stringify(this.formData.userList) return
const resp = await $.post('/platform/activity/user/doAddActUser', formData) }
if (resp.code === 0) {
this.$message.success(resp.msg) let errorMessages = [];
this.addDialog = false const requiredFields = [
this.formData = { { key: 'userName', message: '姓名不能为空' },
activityId: '', { key: 'sex', message: '性别不能为空' },
userList: [] { key: 'phone', message: '联系方式不能为空' },
} { key: 'idCard', message: '身份证件号不能为空' },
this.doSearch() { key: 'position', message: '职务不能为空' }
} else { ];
this.$message.warning('操作失败')
console.log(resp.msg) userList.forEach((user, index) => {
} requiredFields.forEach(field => {
}, if (user[field.key] == null || user[field.key] === "") {
async openModify(row) { errorMessages.push('第' + (index + 1) + '行：' + field.message);
const resp = await $.post('/platform/activity/user/findSignUserInfo', {id: row.id}) }
if (resp.code === 0) { });
this.modifyForm = resp.data });
this.modifyDialog = true
} else { if (errorMessages.length > 0) {
this.$message.warning('查询异常') // 将错误信息转换为 HTML 格式，使用 <br> 实现换行
console.log(resp.msg) const errorSummary = errorMessages.join("<br>");
} this.$message.warning({
}, message: errorSummary,
onModifySubmit() { dangerouslyUseHTMLString: true
this.$refs.modifyFormRef.validate(async valid => { });
if (valid) { return
const resp = await $.post('/platform/activity/user/doModifyActUser', this.modifyForm) }
if (resp.code === 0) { const formData = JSON.parse(JSON.stringify(this.formData));
this.$message.success(resp.msg) formData.userList = JSON.stringify(this.formData.userList)
this.modifyDialog = false const resp = await $.post('/platform/activity/user/doAddActUser', formData)
this.$refs.modifyFormRef.resetFields() if (resp.code === 0) {
this.doSearch() this.$message.success(resp.msg)
} else { this.addDialog = false
this.$message.warning('操作失败') this.formData = {
console.log(resp.msg) activityId: '',
} userList: []
} }
}) this.doSearch()
}, } else {
async getActivityList(){ this.$message.warning('操作失败')
const resp = await $.post('/platform/activity/user/getActivityList', { console.log(resp.msg)
year: this.pageForm.year }
}) },
if (resp.code === 0 && resp.data && resp.data.length > 0) { async openModify(row) {
this.activityList = resp.data const resp = await $.post('/platform/activity/user/findSignUserInfo', {id: row.id})
this.$set(this.pageForm, 'activityId', this.activityList[0].id) if (resp.code === 0) {
} else { this.modifyForm = resp.data
this.$set(this.pageForm, 'activityId', '') this.modifyDialog = true
} } else {
this.pageData() this.$message.warning('查询异常')
} console.log(resp.msg)
}, }
created() { },
this.getActivityList() onModifySubmit() {
} this.$refs.modifyFormRef.validate(async valid => {
}) if (valid) {
const resp = await $.post('/platform/activity/user/doModifyActUser', this.modifyForm)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.modifyDialog = false
this.$refs.modifyFormRef.resetFields()
this.doSearch()
} else {
this.$message.warning('操作失败')
console.log(resp.msg)
}
}
})
},
async getActivityList(){
const resp = await $.post('/platform/activity/user/getActivityList', {
year: this.pageForm.year
})
if (resp.code === 0 && resp.data && resp.data.length > 0) {
this.activityList = resp.data
this.$set(this.pageForm, 'activityId', this.activityList[0].id)
} else {
this.$set(this.pageForm, 'activityId', '')
}
this.pageData()
},
async getUnits(){
const resp = await $.post('/open/common/units')
if (resp.code === 0) {
this.units = resp.data
}
}
},
created() {
this.getActivityList()
this.getUnits()
}
})
</script> </script>
<!--# <!--#
} }