commit
This commit is contained in:
+4
-1
@@ -90,11 +90,14 @@ public class ClientGroupController {
|
|||||||
SELECT
|
SELECT
|
||||||
t1.*,
|
t1.*,
|
||||||
t2.userName,
|
t2.userName,
|
||||||
|
t2.position,
|
||||||
t2.unitName,
|
t2.unitName,
|
||||||
t2.sex
|
t2.sex,
|
||||||
|
t3.phone
|
||||||
FROM
|
FROM
|
||||||
`act_group_user` t1
|
`act_group_user` t1
|
||||||
LEFT JOIN act_user t2 ON t1.userId = t2.userId
|
LEFT JOIN act_user t2 ON t1.userId = t2.userId
|
||||||
|
LEFT JOIN client_user t3 ON t1.userId = t3.id
|
||||||
WHERE t1.groupId=@groupId
|
WHERE t1.groupId=@groupId
|
||||||
ORDER BY
|
ORDER BY
|
||||||
t1.isLeader DESC
|
t1.isLeader DESC
|
||||||
|
|||||||
+4
@@ -29,6 +29,7 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> implements ActU
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取报名人员列表sql
|
* 获取报名人员列表sql
|
||||||
|
*
|
||||||
* @param pageForm
|
* @param pageForm
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -52,6 +53,9 @@ 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() == 2 ? 1 : 0);
|
||||||
|
}
|
||||||
// cnd.andEX("u.phone", "like", "%" + pageForm.getPhone() + "%");
|
// cnd.andEX("u.phone", "like", "%" + pageForm.getPhone() + "%");
|
||||||
if (StrUtil.isNotBlank(pageForm.getUnitName())) {
|
if (StrUtil.isNotBlank(pageForm.getUnitName())) {
|
||||||
cnd.and("u.unitName", "like", "%" + pageForm.getUnitName() + "%");
|
cnd.and("u.unitName", "like", "%" + pageForm.getUnitName() + "%");
|
||||||
|
|||||||
@@ -23,4 +23,6 @@ public class ActUserPageForm extends PageForm {
|
|||||||
|
|
||||||
// 所属单位
|
// 所属单位
|
||||||
private String unitName;
|
private String unitName;
|
||||||
|
// 是否签到1.全部2.已签到3.未签到
|
||||||
|
private Integer isSignIn;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,400 +2,412 @@
|
|||||||
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-query">
|
<div class="search-query">
|
||||||
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-card shadow="never" class="mt-3">
|
<el-card shadow="never" class="mt-3">
|
||||||
<el-row type="flex" style="justify-content: flex-end" class="mb-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="openAddUser">添加报名人员</el-button>
|
||||||
<el-button icon="el-icon-plus" type="primary" size="small" @click="doExport">导出</el-button>
|
<el-button icon="el-icon-plus" type="primary" size="small" @click="doExport">导出</el-button>
|
||||||
</el-row>
|
<el-radio-group v-model="pageForm.isSignIn" type="primary" class="ml-3"@change="doSearch">
|
||||||
<el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData">
|
<el-radio-button :label="1">全部</el-radio-button>
|
||||||
<el-table-column label="序号" type="index" header-align="center" align="center"
|
<el-radio-button :label="2">已签到</el-radio-button>
|
||||||
width="50"></el-table-column>
|
<el-radio-button :label="3">未签到</el-radio-button>
|
||||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
</el-radio-group>
|
||||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
</el-row>
|
||||||
<el-table-column label="联系方式" prop="phone"></el-table-column>
|
<el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData">
|
||||||
<el-table-column label="身份证件号" prop="idCard"></el-table-column>
|
<el-table-column label="序号" type="index" header-align="center" align="center"
|
||||||
<el-table-column label="职务" prop="position"></el-table-column>
|
width="50"></el-table-column>
|
||||||
<el-table-column label="所属单位" prop="unitName"></el-table-column>
|
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||||
<el-table-column label="报名时间" prop="signUpTime"></el-table-column>
|
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||||
<el-table-column label="操作" fixed="right" width="250">
|
<el-table-column label="联系方式" prop="phone"></el-table-column>
|
||||||
<template #default="scope">
|
<el-table-column label="身份证件号" prop="idCard"></el-table-column>
|
||||||
<el-button type="text" @click="openModify">修改</el-button>
|
<el-table-column label="职务" prop="position"></el-table-column>
|
||||||
<el-button type="text" class="text-danger" @click="onTableRowDelete(scope.row.id)">删除</el-button>
|
<el-table-column label="所属单位" prop="unitName"></el-table-column>
|
||||||
</template>
|
<el-table-column label="报名时间" prop="signUpTime"></el-table-column>
|
||||||
</el-table-column>
|
<el-table-column label="是否签到" prop="isSignIn">
|
||||||
</el-table>
|
<template slot-scope="{row}">
|
||||||
<!--#include("/layouts/pagination.html"){}#-->
|
{{row.isSignIn?'已签到':'未签到'}}
|
||||||
</el-card>
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="操作" fixed="right" width="250">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button type="text" @click="openModify">修改</el-button>
|
||||||
|
<el-button type="text" class="text-danger" @click="onTableRowDelete(scope.row.id)">删除</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!--#include("/layouts/pagination.html"){}#-->
|
||||||
|
</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-input v-model="formData.unitName" placeholder="请输入参加单位"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系人" prop="contactName">
|
<el-form-item label="联系人" prop="contactName">
|
||||||
<el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input>
|
<el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系方式" prop="contactPhone">
|
<el-form-item label="联系方式" prop="contactPhone">
|
||||||
<el-input v-model="formData.contactPhone" placeholder="请输入联系方式" maxlength="11" type="text" show-word-limit></el-input>
|
<el-input v-model="formData.contactPhone" placeholder="请输入联系方式" maxlength="11" type="text"
|
||||||
</el-form-item>
|
show-word-limit></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="userList">
|
||||||
<el-table-column label="姓名" prop="userName" fixed width="200">
|
<el-table :data="formData.userList" border size="small" width="100%">
|
||||||
<template slot-scope="{row}">
|
<el-table-column label="姓名" prop="userName" fixed width="200">
|
||||||
<el-autocomplete style="width: 100%"
|
<template slot-scope="{row}">
|
||||||
v-model="row.userName"
|
<el-autocomplete style="width: 100%"
|
||||||
:fetch-suggestions="queryUserAsync"
|
v-model="row.userName"
|
||||||
placeholder="请输入内容"
|
:fetch-suggestions="queryUserAsync"
|
||||||
@select="handleSelect($event, row)"
|
placeholder="请输入内容"
|
||||||
></el-autocomplete>
|
@select="handleSelect($event, row)"
|
||||||
<!-- <el-input v-model="row.userName" maxlength="50"-->
|
></el-autocomplete>
|
||||||
<!-- placeholder="请输入姓名"></el-input>-->
|
<!-- <el-input v-model="row.userName" maxlength="50"-->
|
||||||
</template>
|
<!-- placeholder="请输入姓名"></el-input>-->
|
||||||
</el-table-column>
|
</template>
|
||||||
<el-table-column label="性别" prop="sex" width="200">
|
</el-table-column>
|
||||||
<template slot-scope="{row}">
|
<el-table-column label="性别" prop="sex" width="200">
|
||||||
<el-radio-group v-model="row.sex">
|
<template slot-scope="{row}">
|
||||||
<el-radio label="男"></el-radio>
|
<el-radio-group v-model="row.sex">
|
||||||
<el-radio label="女"></el-radio>
|
<el-radio label="男"></el-radio>
|
||||||
</el-radio-group>
|
<el-radio label="女"></el-radio>
|
||||||
</template>
|
</el-radio-group>
|
||||||
</el-table-column>
|
</template>
|
||||||
<el-table-column label="联系方式" prop="phone" width="200">
|
</el-table-column>
|
||||||
<template slot-scope="{row}">
|
<el-table-column label="联系方式" prop="phone" width="200">
|
||||||
<el-input v-model="row.phone" maxlength="11" 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="idCard" width="250">
|
</el-table-column>
|
||||||
<template slot-scope="{row}">
|
<el-table-column label="身份证件号" prop="idCard" width="250">
|
||||||
<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.idCard" maxlength="18" 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="position" width="200">
|
||||||
<el-input v-model="row.position" maxlength="100"
|
<template slot-scope="{row}">
|
||||||
placeholder="请输入职务"></el-input>
|
<el-input v-model="row.position" maxlength="100"
|
||||||
</template>
|
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="unitName" width="250">
|
||||||
<el-input v-model="row.unitName" maxlength="100" placeholder="请输所属单位"></el-input>
|
<template slot-scope="{row}">
|
||||||
</template>
|
<el-input v-model="row.unitName" maxlength="100" placeholder="请输所属单位"></el-input>
|
||||||
</el-table-column>-->
|
</template>
|
||||||
<el-table-column width="100px" fixed="right">
|
</el-table-column>-->
|
||||||
<template slot="header" slot-scope="scope">
|
<el-table-column width="100px" fixed="right">
|
||||||
<el-button type="primary" size="mini"
|
<template slot="header" slot-scope="scope">
|
||||||
@click="formData.userList.push({})">添加
|
<el-button type="primary" size="mini"
|
||||||
</el-button>
|
@click="formData.userList.push({})">添加
|
||||||
</template>
|
</el-button>
|
||||||
<template slot-scope="scope">
|
</template>
|
||||||
<el-button
|
<template slot-scope="scope">
|
||||||
type="danger"
|
<el-button
|
||||||
icon="el-icon-delete"
|
type="danger"
|
||||||
size="mini"
|
icon="el-icon-delete"
|
||||||
:disabled="formData.userList.length===0"
|
size="mini"
|
||||||
@click="formData.userList.splice(scope.$index,1)"
|
:disabled="formData.userList.length===0"
|
||||||
></el-button>
|
@click="formData.userList.splice(scope.$index,1)"
|
||||||
</template>
|
></el-button>
|
||||||
</el-table-column>
|
</template>
|
||||||
</el-table>
|
</el-table-column>
|
||||||
</el-form-item>
|
</el-table>
|
||||||
</el-form>
|
</el-form-item>
|
||||||
<div slot="footer" class="dialog-footer">
|
</el-form>
|
||||||
<el-button @click="addDialog = false">取 消</el-button>
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button type="primary" @click="onAddUserSubmit">确 定</el-button>
|
<el-button @click="addDialog = false">取 消</el-button>
|
||||||
</div>
|
<el-button type="primary" @click="onAddUserSubmit">确 定</el-button>
|
||||||
</el-dialog>
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog title="修改报名信息" :visible.sync="modifyDialog" width="40%">
|
<el-dialog title="修改报名信息" :visible.sync="modifyDialog" width="40%">
|
||||||
<el-form :model="modifyForm" :rules="modifyRules" ref="modifyFormRef" label-width="100px">
|
<el-form :model="modifyForm" :rules="modifyRules" ref="modifyFormRef" label-width="100px">
|
||||||
<el-form-item label="姓名" prop="userName">
|
<el-form-item label="姓名" prop="userName">
|
||||||
<el-input v-model="modifyForm.userName"></el-input>
|
<el-input v-model="modifyForm.userName"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="性别" prop="sex">
|
<el-form-item label="性别" prop="sex">
|
||||||
<el-radio-group v-model="modifyForm.sex">
|
<el-radio-group v-model="modifyForm.sex">
|
||||||
<el-radio label="男"></el-radio>
|
<el-radio label="男"></el-radio>
|
||||||
<el-radio label="女"></el-radio>
|
<el-radio label="女"></el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系方式" prop="phone">
|
<el-form-item label="联系方式" prop="phone">
|
||||||
<el-input v-model="modifyForm.phone"></el-input>
|
<el-input v-model="modifyForm.phone"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="身份证件号" prop="idCard">
|
<el-form-item label="身份证件号" prop="idCard">
|
||||||
<el-input v-model="modifyForm.idCard"></el-input>
|
<el-input v-model="modifyForm.idCard"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="职务" prop="position">
|
<el-form-item label="职务" prop="position">
|
||||||
<el-input v-model="modifyForm.position"></el-input>
|
<el-input v-model="modifyForm.position"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="所属单位" prop="unitName">
|
<el-form-item label="所属单位" prop="unitName">
|
||||||
<el-input v-model="modifyForm.unitName"></el-input>
|
<el-input v-model="modifyForm.unitName"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span slot="footer" class="dialog-footer">
|
<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: {
|
||||||
year: new Date().getFullYear() + '',
|
isSignIn: 1,
|
||||||
},
|
year: new Date().getFullYear() + '',
|
||||||
activityList: [],
|
},
|
||||||
// 修改表单
|
activityList: [],
|
||||||
modifyDialog: false,
|
// 修改表单
|
||||||
modifyForm: {},
|
modifyDialog: false,
|
||||||
modifyRules: {
|
modifyForm: {},
|
||||||
userName: [{required: true, message: '请输入姓名', trigger: ['blur', 'change']}],
|
modifyRules: {
|
||||||
sex: [{required: true, message: '请选择性别', trigger: ['blur', 'change']}],
|
userName: [{required: true, message: '请输入姓名', trigger: ['blur', 'change']}],
|
||||||
phone: [{
|
sex: [{required: true, message: '请选择性别', trigger: ['blur', 'change']}],
|
||||||
required: true,
|
phone: [{
|
||||||
validator: (rule, value, callback) => {
|
required: true,
|
||||||
if (!value) {
|
validator: (rule, value, callback) => {
|
||||||
// 如果值为空，直接通过校验
|
if (!value) {
|
||||||
callback();
|
// 如果值为空，直接通过校验
|
||||||
} else if (/^[1][345789][0-9]{9}$/.test(value)) {
|
callback();
|
||||||
// 手机号格式正确
|
} else if (/^[1][345789][0-9]{9}$/.test(value)) {
|
||||||
callback();
|
// 手机号格式正确
|
||||||
} else if (/^\d+-\d+$/.test(value) && value.length <= 16) {
|
callback();
|
||||||
// 座机号格式正确
|
} else if (/^\d+-\d+$/.test(value) && value.length <= 16) {
|
||||||
callback();
|
// 座机号格式正确
|
||||||
} else {
|
callback();
|
||||||
// 格式错误，返回错误信息
|
} else {
|
||||||
callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误'));
|
// 格式错误，返回错误信息
|
||||||
}
|
callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误'));
|
||||||
},
|
}
|
||||||
trigger: ["change", "blur"]
|
},
|
||||||
}],
|
trigger: ["change", "blur"]
|
||||||
idCard: [
|
}],
|
||||||
{
|
idCard: [
|
||||||
required: true,
|
{
|
||||||
validator: (rule, value, callback) => {
|
required: true,
|
||||||
if (!value) {
|
validator: (rule, value, callback) => {
|
||||||
// 如果值为空，直接通过校验
|
if (!value) {
|
||||||
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)) {
|
callback();
|
||||||
// 18位身份证号码格式正确
|
} 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)) {
|
||||||
callback();
|
// 18位身份证号码格式正确
|
||||||
} 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)) {
|
callback();
|
||||||
// 15位身份证号码格式正确
|
} 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)) {
|
||||||
callback();
|
// 15位身份证号码格式正确
|
||||||
} 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)) {
|
callback();
|
||||||
// 外国人身份证号码格式正确（18位）
|
} 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)) {
|
||||||
callback();
|
// 外国人身份证号码格式正确（18位）
|
||||||
} 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)) {
|
callback();
|
||||||
// 外国人身份证号码格式正确（15位）
|
} 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)) {
|
||||||
callback();
|
// 外国人身份证号码格式正确（15位）
|
||||||
} else {
|
callback();
|
||||||
// 格式错误，返回错误信息
|
} else {
|
||||||
callback(new Error("身份证号码格式错误"));
|
// 格式错误，返回错误信息
|
||||||
}
|
callback(new Error("身份证号码格式错误"));
|
||||||
},
|
}
|
||||||
trigger: ["change", "blur"]
|
},
|
||||||
}
|
trigger: ["change", "blur"]
|
||||||
],
|
}
|
||||||
position: [{required: true, message: '请输入职务', trigger: ['blur', 'change']}],
|
],
|
||||||
unitName: [{required: true, message: '请输入所属单位', trigger: ['blur', 'change']}],
|
position: [{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']}]
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
doExport() {
|
doExport() {
|
||||||
window.open("/platform/activity/user/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword)
|
window.open("/platform/activity/user/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword)
|
||||||
},
|
},
|
||||||
openAddUser(){
|
openAddUser() {
|
||||||
if (!this.pageForm.activityId) {
|
if (!this.pageForm.activityId) {
|
||||||
this.$message.warning('请先选择活动')
|
this.$message.warning('请先选择活动')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.formData.userList = []
|
this.formData.userList = []
|
||||||
this.addDialog = true
|
this.addDialog = true
|
||||||
this.formData.activityId = this.pageForm.activityId
|
this.formData.activityId = this.pageForm.activityId
|
||||||
this.formData.activityName = this.activityList.find(item => item.id === this.formData.activityId).title
|
this.formData.activityName = this.activityList.find(item => item.id === this.formData.activityId).title
|
||||||
},
|
},
|
||||||
async queryUserAsync(query, cb){
|
async queryUserAsync(query, cb) {
|
||||||
const resp = await $.post('/platform/activity/user/queryUser', {
|
const resp = await $.post('/platform/activity/user/queryUser', {
|
||||||
query,
|
query,
|
||||||
activityId: this.formData.activityId
|
activityId: this.formData.activityId
|
||||||
})
|
})
|
||||||
if (resp.code === 0) {
|
if (resp.code === 0) {
|
||||||
if (resp.data.list && resp.data.list.length > 0) {
|
if (resp.data.list && resp.data.list.length > 0) {
|
||||||
cb(resp.data.list.map(v => {
|
cb(resp.data.list.map(v => {
|
||||||
return {value: v.username + '(' + (v.phone ? v.phone : '未填写联系方式') + ')', ...v}
|
return {value: v.username + '(' + (v.phone ? v.phone : '未填写联系方式') + ')', ...v}
|
||||||
}))
|
}))
|
||||||
} else {
|
} else {
|
||||||
cb([])
|
cb([])
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
cb([])
|
cb([])
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleSelect(item, row){
|
handleSelect(item, row) {
|
||||||
this.$set(row, 'userId', item.id)
|
this.$set(row, 'userId', item.id)
|
||||||
this.$set(row, 'userName', item.username)
|
this.$set(row, 'userName', item.username)
|
||||||
this.$set(row, 'sex', item.sex)
|
this.$set(row, 'sex', item.sex)
|
||||||
this.$set(row, 'phone', item.phone ? item.phone : '')
|
this.$set(row, 'phone', item.phone ? item.phone : '')
|
||||||
},
|
},
|
||||||
async onAddUserSubmit(){
|
async onAddUserSubmit() {
|
||||||
const userList = this.formData.userList;
|
const userList = this.formData.userList;
|
||||||
if (!userList || userList === []) {
|
if (!userList || userList === []) {
|
||||||
this.$message.warning("请添加报名人员")
|
this.$message.warning("请添加报名人员")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let errorMessages = [];
|
let errorMessages = [];
|
||||||
const requiredFields = [
|
const requiredFields = [
|
||||||
{ key: 'userName', message: '姓名不能为空' },
|
{key: 'userName', message: '姓名不能为空'},
|
||||||
{ key: 'sex', message: '性别不能为空' },
|
{key: 'sex', message: '性别不能为空'},
|
||||||
{ key: 'phone', message: '联系方式不能为空' },
|
{key: 'phone', message: '联系方式不能为空'},
|
||||||
{ key: 'idCard', message: '身份证件号不能为空' },
|
{key: 'idCard', message: '身份证件号不能为空'},
|
||||||
{ key: 'position', message: '职务不能为空' }
|
{key: 'position', message: '职务不能为空'}
|
||||||
];
|
];
|
||||||
|
|
||||||
userList.forEach((user, index) => {
|
userList.forEach((user, index) => {
|
||||||
requiredFields.forEach(field => {
|
requiredFields.forEach(field => {
|
||||||
if (user[field.key] == null || user[field.key] === "") {
|
if (user[field.key] == null || user[field.key] === "") {
|
||||||
errorMessages.push('第' + (index + 1) + '行：' + field.message);
|
errorMessages.push('第' + (index + 1) + '行：' + field.message);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
if (errorMessages.length > 0) {
|
if (errorMessages.length > 0) {
|
||||||
// 将错误信息转换为 HTML 格式，使用 <br> 实现换行
|
// 将错误信息转换为 HTML 格式，使用 <br> 实现换行
|
||||||
const errorSummary = errorMessages.join("<br>");
|
const errorSummary = errorMessages.join("<br>");
|
||||||
this.$message.warning({
|
this.$message.warning({
|
||||||
message: errorSummary,
|
message: errorSummary,
|
||||||
dangerouslyUseHTMLString: true
|
dangerouslyUseHTMLString: true
|
||||||
});
|
});
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const formData = JSON.parse(JSON.stringify(this.formData));
|
const formData = JSON.parse(JSON.stringify(this.formData));
|
||||||
formData.userList = JSON.stringify(this.formData.userList)
|
formData.userList = JSON.stringify(this.formData.userList)
|
||||||
const resp = await $.post('/platform/activity/user/doAddActUser', formData)
|
const resp = await $.post('/platform/activity/user/doAddActUser', formData)
|
||||||
if (resp.code === 0) {
|
if (resp.code === 0) {
|
||||||
this.$message.success(resp.msg)
|
this.$message.success(resp.msg)
|
||||||
this.addDialog = false
|
this.addDialog = false
|
||||||
this.formData = {
|
this.formData = {
|
||||||
activityId: '',
|
activityId: '',
|
||||||
userList: []
|
userList: []
|
||||||
}
|
}
|
||||||
this.doSearch()
|
this.doSearch()
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning('操作失败')
|
this.$message.warning('操作失败')
|
||||||
console.log(resp.msg)
|
console.log(resp.msg)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async openModify(row) {
|
async openModify(row) {
|
||||||
const resp = await $.post('/platform/activity/user/findSignUserInfo', {id: row.id})
|
const resp = await $.post('/platform/activity/user/findSignUserInfo', {id: row.id})
|
||||||
if (resp.code === 0) {
|
if (resp.code === 0) {
|
||||||
this.modifyForm = resp.data
|
this.modifyForm = resp.data
|
||||||
this.modifyDialog = true
|
this.modifyDialog = true
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning('查询异常')
|
this.$message.warning('查询异常')
|
||||||
console.log(resp.msg)
|
console.log(resp.msg)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onModifySubmit() {
|
onModifySubmit() {
|
||||||
this.$refs.modifyFormRef.validate(async valid => {
|
this.$refs.modifyFormRef.validate(async valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
const resp = await $.post('/platform/activity/user/doModifyActUser', this.modifyForm)
|
const resp = await $.post('/platform/activity/user/doModifyActUser', this.modifyForm)
|
||||||
if (resp.code === 0) {
|
if (resp.code === 0) {
|
||||||
this.$message.success(resp.msg)
|
this.$message.success(resp.msg)
|
||||||
this.modifyDialog = false
|
this.modifyDialog = false
|
||||||
this.$refs.modifyFormRef.resetFields()
|
this.$refs.modifyFormRef.resetFields()
|
||||||
this.doSearch()
|
this.doSearch()
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning('操作失败')
|
this.$message.warning('操作失败')
|
||||||
console.log(resp.msg)
|
console.log(resp.msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async getActivityList(){
|
async getActivityList() {
|
||||||
const resp = await $.post('/platform/activity/user/getActivityList', {
|
const resp = await $.post('/platform/activity/user/getActivityList', {
|
||||||
year: this.pageForm.year
|
year: this.pageForm.year
|
||||||
})
|
})
|
||||||
if (resp.code === 0 && resp.data && resp.data.length > 0) {
|
if (resp.code === 0 && resp.data && resp.data.length > 0) {
|
||||||
this.activityList = resp.data
|
this.activityList = resp.data
|
||||||
this.$set(this.pageForm, 'activityId', this.activityList[0].id)
|
this.$set(this.pageForm, 'activityId', this.activityList[0].id)
|
||||||
} else {
|
} else {
|
||||||
this.$set(this.pageForm, 'activityId', '')
|
this.$set(this.pageForm, 'activityId', '')
|
||||||
}
|
}
|
||||||
this.pageData()
|
this.pageData()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getActivityList()
|
this.getActivityList()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
<!--#
|
<!--#
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<div class="stat-icon"><i class="bi bi-people"></i></div>
|
<div class="stat-icon"><i class="bi bi-people"></i></div>
|
||||||
<div class="stat-content">
|
<div class="stat-content">
|
||||||
<div class="stat-value">成员：{{ team.groupUsers?.length }}</div>
|
<div class="stat-value">成员：{{ team.groupUsers?.length }}</div>
|
||||||
<!-- <div class="stat-label">成员</div>-->
|
<!-- <div class="stat-label">成员</div>-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="stat-divider"></div>
|
<div class="stat-divider"></div>
|
||||||
@@ -59,7 +59,8 @@
|
|||||||
<div class="section-badge">{{ team.groupUsers.length }}</div>
|
<div class="section-badge">{{ team.groupUsers.length }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="member-grid">
|
<div class="member-grid">
|
||||||
<div class="member-grid-item" v-for="member in team.groupUsers" :key="member.id" @click="openUserDetail(member)">
|
<div class="member-grid-item" v-for="member in team.groupUsers" :key="member.id"
|
||||||
|
@click="openUserDetail(member)">
|
||||||
<div class="member-name">
|
<div class="member-name">
|
||||||
{{ member.userName }}
|
{{ member.userName }}
|
||||||
<t-tag theme="danger" size="small" v-if="member.isLeader">队长</t-tag>
|
<t-tag theme="danger" size="small" v-if="member.isLeader">队长</t-tag>
|
||||||
@@ -151,6 +152,16 @@
|
|||||||
<text class="picker-title">成员信息</text>
|
<text class="picker-title">成员信息</text>
|
||||||
<t-icon name="close" @click="showUserDetailPicker = false"/>
|
<t-icon name="close" @click="showUserDetailPicker = false"/>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<view class="member-list">
|
||||||
|
<t-cell-group bordered>
|
||||||
|
<t-cell title="姓名" hover>{{ userInfo.userName }}</t-cell>
|
||||||
|
<t-cell title="性别" hover>{{userInfo.sex}}</t-cell>
|
||||||
|
<t-cell title="联系方式" hover>{{userInfo.phone}}</t-cell>
|
||||||
|
<t-cell title="职务" hover>{{userInfo.position}}</t-cell>
|
||||||
|
<t-cell title="所属单位" hover>{{userInfo.unitName}}</t-cell>
|
||||||
|
</t-cell-group>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</t-popup>
|
</t-popup>
|
||||||
</template>
|
</template>
|
||||||
@@ -185,10 +196,12 @@ let team = ref(null);
|
|||||||
const leaderConfirmVisible = ref(false)
|
const leaderConfirmVisible = ref(false)
|
||||||
|
|
||||||
// 用户详情弹框
|
// 用户详情弹框
|
||||||
const showUserDetailPicker=ref(false)
|
const showUserDetailPicker = ref(false)
|
||||||
|
const userInfo = ref({})
|
||||||
// 打开用户详情
|
// 打开用户详情
|
||||||
const openUserDetail = (val) => {
|
const openUserDetail = (val) => {
|
||||||
showUserDetailPicker.value = true
|
showUserDetailPicker.value = true
|
||||||
|
userInfo.value = val
|
||||||
console.log(val)
|
console.log(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -251,7 +264,7 @@ const getListAct = async () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// 点击查看成绩排名
|
// 点击查看成绩排名
|
||||||
const queryRank=()=>{
|
const queryRank = () => {
|
||||||
uni.navigateTo({url: '/pages/activity/rank/index?id=' + pageForm.actId})
|
uni.navigateTo({url: '/pages/activity/rank/index?id=' + pageForm.actId})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,6 +285,7 @@ onLoad(() => {
|
|||||||
.content-area {
|
.content-area {
|
||||||
padding: 0 16px 24px;
|
padding: 0 16px 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*用户弹框*/
|
/*用户弹框*/
|
||||||
.member-picker {
|
.member-picker {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|||||||
Reference in New Issue
Block a user