commit
This commit is contained in:
@@ -289,6 +289,7 @@ public class ActivityCommonController {
|
|||||||
app.activityUnionName unionname,
|
app.activityUnionName unionname,
|
||||||
app.sex,
|
app.sex,
|
||||||
app.mobile,
|
app.mobile,
|
||||||
|
app.position,
|
||||||
app.unitname,
|
app.unitname,
|
||||||
u.idCard,
|
u.idCard,
|
||||||
u.userState,
|
u.userState,
|
||||||
@@ -333,6 +334,7 @@ public class ActivityCommonController {
|
|||||||
exportEntities.add(new ExcelExportEntity("姓名", "username", 20));
|
exportEntities.add(new ExcelExportEntity("姓名", "username", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
|
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
|
exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
|
||||||
|
exportEntities.add(new ExcelExportEntity("职称职务", "position", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
|
exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("身份", "sf", 20));
|
exportEntities.add(new ExcelExportEntity("身份", "sf", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20));
|
exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20));
|
||||||
|
|||||||
@@ -195,6 +195,12 @@ public class ActivitySchoolApply implements Serializable {
|
|||||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||||
private String sex;
|
private String sex;
|
||||||
|
|
||||||
|
@Column
|
||||||
|
@Comment("职务")
|
||||||
|
@Excel(name = "职务", width = 20)
|
||||||
|
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||||
|
private String position;
|
||||||
|
|
||||||
@Excel(name = "在职状态", width = 20)
|
@Excel(name = "在职状态", width = 20)
|
||||||
private String userState;
|
private String userState;
|
||||||
|
|
||||||
|
|||||||
@@ -675,19 +675,22 @@ layout("/layouts/platform.html"){
|
|||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center" header-align="center" label="所属队"
|
align="center" header-align="center" label="所属队"
|
||||||
prop="team">
|
prop="team" width="100">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center" header-align="center" label="姓名"
|
align="center" header-align="center" label="姓名"
|
||||||
prop="username">
|
prop="username" width="100">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center" header-align="center" label="教工号"
|
align="center" header-align="center" label="教工号"
|
||||||
prop="loginname">
|
prop="loginname" width="150">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
align="center" header-align="center" label="性别"
|
||||||
|
prop="sex" width="100px">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center" header-align="center" label="单位"
|
align="center" header-align="center" label="单位"
|
||||||
prop="unitname"
|
prop="unitname"
|
||||||
@@ -695,19 +698,27 @@ layout("/layouts/platform.html"){
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center" header-align="center" label="电话"
|
align="center" header-align="center" label="电话(手机)"
|
||||||
prop="mobile">
|
prop="mobile">
|
||||||
|
<template slot-scope="{row}">
|
||||||
|
<el-input placeholder="请输入电话"
|
||||||
|
v-model="row.mobile"></el-input>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column
|
|
||||||
align="center" header-align="center" label="性别"
|
|
||||||
prop="sex">
|
|
||||||
</el-table-column>
|
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
align="center" header-align="center" label="职务"
|
||||||
|
prop="position">
|
||||||
|
<template slot-scope="{row}">
|
||||||
|
<el-input v-model="row.position" placeholder="请填写填写职称职务"></el-input>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<!-- <el-table-column
|
||||||
align="center" header-align="center" label="年龄"
|
align="center" header-align="center" label="年龄"
|
||||||
prop="age">
|
prop="age">
|
||||||
</el-table-column>
|
</el-table-column>-->
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center" header-align="center" label="身份"
|
align="center" header-align="center" label="身份"
|
||||||
@@ -983,6 +994,10 @@ layout("/layouts/platform.html"){
|
|||||||
<el-input maxlength="50" placeholder="请填写电话" type="text"
|
<el-input maxlength="50" placeholder="请填写电话" type="text"
|
||||||
v-model="LeaderData.mobile"></el-input>
|
v-model="LeaderData.mobile"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="职称职务" prop="position">
|
||||||
|
<el-input maxlength="50" placeholder="请填写职称职务" type="text"
|
||||||
|
v-model="LeaderData.position"></el-input>
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<vi-title title="填写教练信息"></vi-title>
|
<vi-title title="填写教练信息"></vi-title>
|
||||||
@@ -1022,6 +1037,10 @@ layout("/layouts/platform.html"){
|
|||||||
<el-input maxlength="50" placeholder="请填写电话" type="text"
|
<el-input maxlength="50" placeholder="请填写电话" type="text"
|
||||||
v-model="CoachData.mobile"></el-input>
|
v-model="CoachData.mobile"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="职称职务" prop="position">
|
||||||
|
<el-input maxlength="50" placeholder="请填写职称职务" type="text"
|
||||||
|
v-model="CoachData.position"></el-input>
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="12">
|
<!-- <el-col :span="12">
|
||||||
<vi-title title="填写工作人员信息"></vi-title>
|
<vi-title title="填写工作人员信息"></vi-title>
|
||||||
@@ -1302,7 +1321,8 @@ layout("/layouts/platform.html"){
|
|||||||
],
|
],
|
||||||
formRules: {
|
formRules: {
|
||||||
name: [{required: true, message: "必填", trigger: ["blur", "change"]}],
|
name: [{required: true, message: "必填", trigger: ["blur", "change"]}],
|
||||||
teamId: [{required: true, message: "必填", trigger: ["blur", "change"]}]
|
teamId: [{required: true, message: "必填", trigger: ["blur", "change"]}],
|
||||||
|
position: [{required: true, message: "必填", trigger: ["blur", "change"]}]
|
||||||
// userId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
// userId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -2034,8 +2054,6 @@ layout("/layouts/platform.html"){
|
|||||||
|
|
||||||
let flag = true
|
let flag = true
|
||||||
let msg = null
|
let msg = null
|
||||||
await this.apply()
|
|
||||||
|
|
||||||
|
|
||||||
if (flag1) {
|
if (flag1) {
|
||||||
const {
|
const {
|
||||||
@@ -2054,6 +2072,23 @@ layout("/layouts/platform.html"){
|
|||||||
const teamAppliedData = groupBy(appliedData, (v) => {
|
const teamAppliedData = groupBy(appliedData, (v) => {
|
||||||
return v.teamId
|
return v.teamId
|
||||||
})
|
})
|
||||||
|
//判断每一个选手填写的是否正确
|
||||||
|
for (let i = 0; i < appliedData.length; i++) {
|
||||||
|
if (!appliedData[i].position) {
|
||||||
|
this.$message.warning("请填写填写职称职务!")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!appliedData[i].mobile) {
|
||||||
|
this.$message.warning("请填写手机号!")
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
const phoneRegex = /^1[3-9]\d{9}$/;
|
||||||
|
if (!phoneRegex.test(appliedData[i].mobile)) {
|
||||||
|
this.$message.warning("手机号填写不正确!")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (this.appliedData3.length == 0 && this.appliedData.length == 0) {
|
if (this.appliedData3.length == 0 && this.appliedData.length == 0) {
|
||||||
this.$notify.warning({
|
this.$notify.warning({
|
||||||
@@ -2065,49 +2100,61 @@ layout("/layouts/platform.html"){
|
|||||||
|
|
||||||
for (let i = 0; i < teamAppliedData.length; i++) {
|
for (let i = 0; i < teamAppliedData.length; i++) {
|
||||||
const teamName = teamAppliedData[i][0].team
|
const teamName = teamAppliedData[i][0].team
|
||||||
if (deputyDirectorNum > 0 && teamAppliedData[i].filter(v => v.divisionLevelLeadership).length > deputyDirectorNum) {
|
//教练
|
||||||
|
const identity2 = teamAppliedData[i].filter(v => v.identity.includes('2')).length
|
||||||
|
//领队
|
||||||
|
const identity3 = teamAppliedData[i].filter(v => v.identity.includes('3')).length
|
||||||
|
//处级领导
|
||||||
|
const identity4 = teamAppliedData[i].filter(v => v.identity.includes('4')).length
|
||||||
|
//候补
|
||||||
|
const identity5 = teamAppliedData[i].filter(v => v.identity.includes('5')).length
|
||||||
|
|
||||||
|
if (deputyDirectorNum > 0 && identity4 > deputyDirectorNum) {
|
||||||
flag = false
|
flag = false
|
||||||
msg = teamName + "处级领导应设置" + deputyDirectorNum + "人"
|
msg = teamName + '处级领导应设置' + deputyDirectorNum + '人'
|
||||||
break
|
break;
|
||||||
|
}
|
||||||
|
if (leanderNum > 0 && (identity3 === 0 || identity3 > leanderNum)) {
|
||||||
|
flag = false
|
||||||
|
msg = teamName + '领队应设置' + leanderNum + '人'
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leanderNum > 0 && teamAppliedData[i].filter(v => v.identity.includes("3")).length > leanderNum) {
|
if (coachNum > 0 && (identity2 === 0 || identity2 > coachNum)) {
|
||||||
flag = false
|
flag = false
|
||||||
msg = teamName + "领队应设置" + leanderNum + "人"
|
msg = teamName + '教练应设置' + coachNum + '人'
|
||||||
break
|
break;
|
||||||
|
}
|
||||||
|
if (substituteNum > 0 && identity5 > substituteNum) {
|
||||||
|
flag = false
|
||||||
|
msg = teamName + '候补最多设置' + substituteNum + '人'
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (restrictGirlNum > 0 && teamAppliedData[i].filter(v => v.sex === '女' && v.identity.includes('1')).length < restrictGirlNum) {
|
||||||
|
flag = false
|
||||||
|
msg = teamName + '女运动员至少设置' + restrictGirlNum + '人'
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (restrictBoyNum > 0 && teamAppliedData[i].filter(v => v.sex === '男' && v.identity.includes('1')).length < restrictBoyNum) {
|
||||||
|
flag = false
|
||||||
|
msg = teamName + '男运动员至少设置' + restrictBoyNum + '人'
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
//团体才做的判断
|
||||||
|
if (projectType === '2') {
|
||||||
|
if ((athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)) > 0 && (teamAppliedData[i].filter(v => v.identity.includes('1')).length < (athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)) || teamAppliedData[i].filter(v => v.identity.includes('1')).length > (athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)))) {
|
||||||
|
flag = false
|
||||||
|
msg = teamName + '运动员应设置' + (athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)) + '人'
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (coachNum > 0 && teamAppliedData[i].filter(v => v.identity.includes("2")).length > coachNum) {
|
|
||||||
flag = false
|
|
||||||
msg = teamName + "教练应设置" + coachNum + "人"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if (projectType !== "1") {
|
|
||||||
if ((athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)) > 0 && (teamAppliedData[i].filter(v => v.identity.includes("1")).length < (athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)) || teamAppliedData[i].filter(v => v.identity.includes("1")).length > (athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)))) {
|
|
||||||
flag = false
|
|
||||||
msg = teamName + "运动员应设置" + (athletesMaxNum ? athletesMaxNum : (restrictGirlNum + restrictBoyNum)) + "人"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (teamAppliedData[i].filter(v => v.identity.includes("5")).length > substituteNum) {
|
|
||||||
flag = false
|
|
||||||
msg = teamName + "替补最多设置" + substituteNum + "人"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if (restrictGirlNum > 0 && teamAppliedData[i].filter(v => v.sex === "女" && v.identity.includes("1")).length < restrictGirlNum) {
|
|
||||||
flag = false
|
|
||||||
msg = teamName + "女运动员至少设置" + restrictGirlNum + "人"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if (restrictBoyNum > 0 && teamAppliedData[i].filter(v => v.sex === "男" && v.identity.includes("1")).length < restrictBoyNum) {
|
|
||||||
flag = false
|
|
||||||
msg = teamName + "男运动员至少设置" + restrictBoyNum + "人"
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (!flag && this.isLeader == false) {
|
if (!flag && this.isLeader == false) {
|
||||||
this.$notify.warning({title: "警告", message: msg})
|
this.$notify.warning({title: '警告', message: msg});
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!flag1) {
|
if (!flag1) {
|
||||||
|
|||||||
@@ -55,7 +55,8 @@ layout("/layouts/platform.html"){
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@change="changeLevel"
|
@change="changeLevel"
|
||||||
>
|
>
|
||||||
<el-option v-for="item in activityTypeList" :key="item.code" :label="item.name" :value="item.code"></el-option>
|
<el-option v-for="item in activityTypeList" :key="item.code" :label="item.name"
|
||||||
|
:value="item.code"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -85,7 +86,8 @@ layout("/layouts/platform.html"){
|
|||||||
@change="changeVVV"
|
@change="changeVVV"
|
||||||
@clear="changeVVV"
|
@clear="changeVVV"
|
||||||
>
|
>
|
||||||
<el-option v-for="item in unions" :key="item.id" :label="item.unionname" :value="item.id"></el-option>
|
<el-option v-for="item in unions" :key="item.id" :label="item.unionname"
|
||||||
|
:value="item.id"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -143,11 +145,15 @@ layout("/layouts/platform.html"){
|
|||||||
<el-col :span="6">{{isDisPlayCode?'('+app.unioncode+')':null}}{{app.unionname}}</el-col>
|
<el-col :span="6">{{isDisPlayCode?'('+app.unioncode+')':null}}{{app.unionname}}</el-col>
|
||||||
<el-col :span="6">{{pageForm.activityName || '暂无'}}</el-col>
|
<el-col :span="6">{{pageForm.activityName || '暂无'}}</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
{{app.num |money}} 人({{(app.promiseBookFiles&&app.promiseBookFiles.length>0)?'已上传风险告知书':'未上传'}})
|
{{app.num |money}}
|
||||||
|
人({{(app.promiseBookFiles&&app.promiseBookFiles.length>0)?'已上传风险告知书':'未上传'}})
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-button @click="openPromiseBook(app)" style="float: right; padding: 3px 5px" type="text">查看风险告知书</el-button>
|
<el-button @click="openPromiseBook(app)" style="float: right; padding: 3px 5px"
|
||||||
<el-button style="float: right; padding: 3px 5px" @click="$set(app,'show',!app.show)" type="text">
|
type="text">查看风险告知书
|
||||||
|
</el-button>
|
||||||
|
<el-button style="float: right; padding: 3px 5px" @click="$set(app,'show',!app.show)"
|
||||||
|
type="text">
|
||||||
{{app.show?'折叠':'展开'}}
|
{{app.show?'折叠':'展开'}}
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -251,7 +257,8 @@ layout("/layouts/platform.html"){
|
|||||||
<span v-if="row.team">{{ row.team }}</span>
|
<span v-if="row.team">{{ row.team }}</span>
|
||||||
<span v-if="!row.team">暂无</span>
|
<span v-if="!row.team">暂无</span>
|
||||||
</template>
|
</template>
|
||||||
<template scope="{row:{projectType}}" v-else-if="column.prop=='projectType'">
|
<template scope="{row:{projectType}}"
|
||||||
|
v-else-if="column.prop=='projectType'">
|
||||||
{{projectType==1?'单项':'团体'}}
|
{{projectType==1?'单项':'团体'}}
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -263,10 +270,18 @@ layout("/layouts/platform.html"){
|
|||||||
|
|
||||||
<template scope="{row}" v-else-if="column.prop=='identity'">
|
<template scope="{row}" v-else-if="column.prop=='identity'">
|
||||||
<el-tag v-if="row.identity.includes(1)" effect="light">运动员</el-tag>
|
<el-tag v-if="row.identity.includes(1)" effect="light">运动员</el-tag>
|
||||||
<el-tag v-if="row.identity.includes(2)" type="success" effect="light">教练</el-tag>
|
<el-tag v-if="row.identity.includes(2)" type="success" effect="light">
|
||||||
<el-tag v-if="row.identity.includes(3)" type="warning" effect="light">领队</el-tag>
|
教练
|
||||||
<el-tag v-if="row.identity.includes(4)" type="warning" effect="light">处级领导</el-tag>
|
</el-tag>
|
||||||
<el-tag v-if="row.identity.includes(5)" type="warning" effect="light">替补</el-tag>
|
<el-tag v-if="row.identity.includes(3)" type="warning" effect="light">
|
||||||
|
领队
|
||||||
|
</el-tag>
|
||||||
|
<el-tag v-if="row.identity.includes(4)" type="warning" effect="light">
|
||||||
|
处级领导
|
||||||
|
</el-tag>
|
||||||
|
<el-tag v-if="row.identity.includes(5)" type="warning" effect="light">
|
||||||
|
替补
|
||||||
|
</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -276,22 +291,31 @@ layout("/layouts/platform.html"){
|
|||||||
<el-timeline v-else-if="pageForm.applyType===2">
|
<el-timeline v-else-if="pageForm.applyType===2">
|
||||||
<el-timeline-item timestamp="领队信息" placement="top" v-if="app.leader.username!=null">
|
<el-timeline-item timestamp="领队信息" placement="top" v-if="app.leader.username!=null">
|
||||||
<el-card shadow="never">
|
<el-card shadow="never">
|
||||||
<el-form label-suffix=":" label-position="right" label-width="80px" style="margin-top: 30px">
|
<el-form label-suffix=":" label-position="right" label-width="100px"
|
||||||
|
style="margin-top: 30px">
|
||||||
<el-row gutter="20">
|
<el-row gutter="20">
|
||||||
<el-col :span="4">
|
<el-col :span="3">
|
||||||
<el-form-item label="姓名">{{ app.leader.username | str }}</el-form-item>
|
<el-form-item label="姓名">{{ app.leader.username | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="3">
|
||||||
<el-form-item label="性别">{{ app.leader.sex | str }}</el-form-item>
|
<el-form-item label="性别">{{ app.leader.sex | str }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="2">
|
||||||
<el-form-item label="工号">{{ app.leader.loginname | str }}</el-form-item>
|
<el-form-item label="工号">{{ app.leader.loginname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="电话">{{ app.leader.mobile | str }}</el-form-item>
|
<el-form-item label="电话">{{ app.leader.mobile | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="单位">{{ app.leader.unitname | str }}</el-form-item>
|
<el-form-item label="职称职务">{{ app.leader.position | str }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="单位">{{ app.leader.unitname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -299,22 +323,31 @@ layout("/layouts/platform.html"){
|
|||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
<el-timeline-item timestamp="教练信息" placement="top" v-if="app.coach.username!=null">
|
<el-timeline-item timestamp="教练信息" placement="top" v-if="app.coach.username!=null">
|
||||||
<el-card shadow="never">
|
<el-card shadow="never">
|
||||||
<el-form label-suffix=":" label-position="right" label-width="80px" style="margin-top: 30px">
|
<el-form label-suffix=":" label-position="right" label-width="100px"
|
||||||
|
style="margin-top: 30px">
|
||||||
<el-row gutter="20">
|
<el-row gutter="20">
|
||||||
<el-col :span="4">
|
<el-col :span="3">
|
||||||
<el-form-item label="姓名">{{ app.coach.username | str }}</el-form-item>
|
<el-form-item label="姓名">{{ app.coach.username | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="3">
|
||||||
<el-form-item label="性别">{{ app.coach.sex | str }}</el-form-item>
|
<el-form-item label="性别">{{ app.coach.sex | str }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="2">
|
||||||
<el-form-item label="工号">{{ app.coach.loginname | str }}</el-form-item>
|
<el-form-item label="工号">{{ app.coach.loginname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="电话">{{ app.coach.mobile | str }}</el-form-item>
|
<el-form-item label="电话">{{ app.coach.mobile | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="单位">{{ app.coach.unitname | str }}</el-form-item>
|
<el-form-item label="职称职务">{{ app.coach.position | str }}
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="单位">{{ app.coach.unitname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -322,45 +355,56 @@ layout("/layouts/platform.html"){
|
|||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
<el-timeline-item timestamp="团长信息" placement="top" v-if="app.head.username!=null">
|
<el-timeline-item timestamp="团长信息" placement="top" v-if="app.head.username!=null">
|
||||||
<el-card shadow="never">
|
<el-card shadow="never">
|
||||||
<el-form label-suffix=":" label-position="right" label-width="80px" style="margin-top: 30px">
|
<el-form label-suffix=":" label-position="right" label-width="80px"
|
||||||
|
style="margin-top: 30px">
|
||||||
<el-row gutter="20">
|
<el-row gutter="20">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="姓名">{{ app.head.username | str }}</el-form-item>
|
<el-form-item label="姓名">{{ app.head.username | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="性别">{{ app.head.sex | str }}</el-form-item>
|
<el-form-item label="性别">{{ app.head.sex | str }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="工号">{{ app.head.loginname | str }}</el-form-item>
|
<el-form-item label="工号">{{ app.head.loginname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="电话">{{ app.head.mobile | str }}</el-form-item>
|
<el-form-item label="电话">{{ app.head.mobile | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="单位">{{ app.head.unitname | str }}</el-form-item>
|
<el-form-item label="单位">{{ app.head.unitname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
<el-timeline-item timestamp="工作人员信息" placement="top" v-if="app.staff.username!=null">
|
<el-timeline-item timestamp="工作人员信息" placement="top"
|
||||||
|
v-if="app.staff.username!=null">
|
||||||
<el-card shadow="never">
|
<el-card shadow="never">
|
||||||
<el-form label-suffix=":" label-position="right" label-width="80px" style="margin-top: 30px">
|
<el-form label-suffix=":" label-position="right" label-width="80px"
|
||||||
|
style="margin-top: 30px">
|
||||||
<el-row gutter="20">
|
<el-row gutter="20">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="姓名">{{ app.staff.username | str }}</el-form-item>
|
<el-form-item label="姓名">{{ app.staff.username | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="性别">{{ app.staff.sex | str }}</el-form-item>
|
<el-form-item label="性别">{{ app.staff.sex | str }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="工号">{{ app.staff.loginname | str }}</el-form-item>
|
<el-form-item label="工号">{{ app.staff.loginname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="电话">{{ app.staff.mobile | str }}</el-form-item>
|
<el-form-item label="电话">{{ app.staff.mobile | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="单位">{{ app.staff.unitname | str }}</el-form-item>
|
<el-form-item label="单位">{{ app.staff.unitname | str }}
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -445,16 +489,25 @@ layout("/layouts/platform.html"){
|
|||||||
<span v-else class="text-danger">否</span>
|
<span v-else class="text-danger">否</span>
|
||||||
</template>-->
|
</template>-->
|
||||||
|
|
||||||
<template scope="{row:{projectType}}" v-else-if="column.prop=='projectType'">
|
<template scope="{row:{projectType}}"
|
||||||
|
v-else-if="column.prop=='projectType'">
|
||||||
{{projectType==1?'单项':'团体'}}
|
{{projectType==1?'单项':'团体'}}
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template scope="{row}" v-else-if="column.prop=='identity'">
|
<template scope="{row}" v-else-if="column.prop=='identity'">
|
||||||
<el-tag v-if="row.identity.includes(1)" effect="light">运动员</el-tag>
|
<el-tag v-if="row.identity.includes(1)" effect="light">运动员</el-tag>
|
||||||
<el-tag v-if="row.identity.includes(2)" type="success" effect="light">教练</el-tag>
|
<el-tag v-if="row.identity.includes(2)" type="success" effect="light">
|
||||||
<el-tag v-if="row.identity.includes(3)" type="warning" effect="light">领队</el-tag>
|
教练
|
||||||
<el-tag v-if="row.identity.includes(4)" type="warning" effect="light">处级领导</el-tag>
|
</el-tag>
|
||||||
<el-tag v-if="row.identity.includes(5)" type="warning" effect="light">替补</el-tag>
|
<el-tag v-if="row.identity.includes(3)" type="warning" effect="light">
|
||||||
|
领队
|
||||||
|
</el-tag>
|
||||||
|
<el-tag v-if="row.identity.includes(4)" type="warning" effect="light">
|
||||||
|
处级领导
|
||||||
|
</el-tag>
|
||||||
|
<el-tag v-if="row.identity.includes(5)" type="warning" effect="light">
|
||||||
|
替补
|
||||||
|
</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -509,8 +562,10 @@ layout("/layouts/platform.html"){
|
|||||||
</span>
|
</span>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :append-to-body="false" :close-on-click-modal="false" :visible.sync="promiseBookDialogVisible" title="参赛风险告知书" width="30%">
|
<el-dialog :append-to-body="false" :close-on-click-modal="false" :visible.sync="promiseBookDialogVisible"
|
||||||
<file-upload :files="promiseBookFileList" view v-if="promiseBookFileList&&promiseBookFileList.length>0"></file-upload>
|
title="参赛风险告知书" width="30%">
|
||||||
|
<file-upload :files="promiseBookFileList" view
|
||||||
|
v-if="promiseBookFileList&&promiseBookFileList.length>0"></file-upload>
|
||||||
<span v-if="promiseBookFileList&&promiseBookFileList.length===0">暂无风险告知书</span>
|
<span v-if="promiseBookFileList&&promiseBookFileList.length===0">暂无风险告知书</span>
|
||||||
<span class="dialog-footer" slot="footer">
|
<span class="dialog-footer" slot="footer">
|
||||||
<el-button @click="promiseBookDialogVisible = false" type="primary">关 闭</el-button>
|
<el-button @click="promiseBookDialogVisible = false" type="primary">关 闭</el-button>
|
||||||
@@ -556,7 +611,7 @@ layout("/layouts/platform.html"){
|
|||||||
/* {prop: 'divisionLevelLeadership', label: '是否处级领导', sortable: true},*/
|
/* {prop: 'divisionLevelLeadership', label: '是否处级领导', sortable: true},*/
|
||||||
{prop: "unitname", label: "单位", sortable: true},
|
{prop: "unitname", label: "单位", sortable: true},
|
||||||
{prop: "mobile", label: "电话"},
|
{prop: "mobile", label: "电话"},
|
||||||
{ prop: "projectType", label: "项目类型", sortable: true },
|
{prop: "position", label: "职称职务"},
|
||||||
{prop: "identity", label: "身份", sortable: true, width: "300px"},
|
{prop: "identity", label: "身份", sortable: true, width: "300px"},
|
||||||
{prop: "applyUserName", label: "报名人"}
|
{prop: "applyUserName", label: "报名人"}
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user