提交 558e2c2c 编写于 作者: 刘英杰's avatar 刘英杰

团队非空才能报名

上级 27164e57
流水线 #23765 已通过 ,包含阶段
in 43 second
[data-v-ebfbe842] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-ebfbe842]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-ebfbe842]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-ebfbe842]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-ebfbe842]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-ebfbe842]:hover{transform:scale(1.2)}.container[data-v-ebfbe842]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-ebfbe842],.tableList[data-v-4c33dcb1]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-4c33dcb1]{border-collapse:collapse}.tableList .container1 .row[data-v-4c33dcb1]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-4c33dcb1]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-4c33dcb1]{width:500px;height:50px;text-align:center}.Atext[data-v-4c33dcb1]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-4c33dcb1]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-7d02896f] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-7d02896f] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-7d02896f]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-7d02896f]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px} [data-v-5d489080] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-5d489080] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-5d489080]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5d489080]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file \ No newline at end of file
[data-v-59af190a] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-59af190a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-59af190a]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-59af190a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-59af190a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-59af190a]:hover{transform:scale(1.2)}.container[data-v-59af190a]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-59af190a],.tableList[data-v-76aefa75]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-76aefa75]{border-collapse:collapse}.tableList .container1 .row[data-v-76aefa75]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-76aefa75]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-76aefa75]{width:500px;height:50px;text-align:center}.Atext[data-v-76aefa75]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-76aefa75]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.container[data-v-01b77cf3]{height:100vh;width:100vw}.container .header[data-v-01b77cf3]{display:flex;justify-content:center;align-items:center;position:relative;width:100%;height:8%;border-top:5px solid #2d8cf0}.container .header .h_left[data-v-01b77cf3],.container .header .h_right[data-v-01b77cf3]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-01b77cf3]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-01b77cf3]{width:100%;height:92%;align-content:flex-start;overflow-y:auto}.container .content .tableList[data-v-01b77cf3],.container .content[data-v-01b77cf3]{display:flex;flex-wrap:wrap;justify-content:center}.container .content .tableList .container1[data-v-01b77cf3]{border-collapse:collapse;box-sizing:border-box;width:100%}.container .content .tableList .container1 .row[data-v-01b77cf3]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-01b77cf3]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-01b77cf3]{height:50px;text-align:center}.container .content .card[data-v-01b77cf3]{padding:5px 5px}.container .content .teamInfo[data-v-01b77cf3]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-01b77cf3]:hover{transform:scale(1.3)}.container .content .aText[data-v-01b77cf3]:hover{transform:scale(1.2)}.container .content .Atext[data-v-01b77cf3]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-01b77cf3]:hover{transform:scale(1.2)}
\ No newline at end of file
[data-v-2ed664e1] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-2ed664e1] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-2ed664e1]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-2ed664e1]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.Atext:hover{transform:scale(1.2)}.tableList[data-v-a4dd4494]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-a4dd4494]{border-collapse:collapse}.tableList .container1 .row[data-v-a4dd4494]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-a4dd4494]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-a4dd4494]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-a4dd4494]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-a4dd4494]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-a4dd4494]:hover{transform:scale(1.2)} [data-v-63fdc058] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-63fdc058] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-63fdc058]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-63fdc058]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.Atext:hover{transform:scale(1.2)}.tableList[data-v-8f6f3ec6]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-8f6f3ec6]{border-collapse:collapse}.tableList .container1 .row[data-v-8f6f3ec6]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-8f6f3ec6]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-8f6f3ec6]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-8f6f3ec6]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-8f6f3ec6]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-8f6f3ec6]:hover{transform:scale(1.2)}
\ No newline at end of file \ No newline at end of file
.container[data-v-4615f50c]{height:100vh;width:100vw}.container .header[data-v-4615f50c]{display:flex;justify-content:center;align-items:center;position:relative;width:100%;height:8%;border-top:5px solid #2d8cf0}.container .header .h_left[data-v-4615f50c],.container .header .h_right[data-v-4615f50c]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-4615f50c]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-4615f50c]{width:100%;height:92%;align-content:flex-start;overflow-y:auto}.container .content .tableList[data-v-4615f50c],.container .content[data-v-4615f50c]{display:flex;flex-wrap:wrap;justify-content:center}.container .content .tableList .container1[data-v-4615f50c]{border-collapse:collapse;box-sizing:border-box;width:100%}.container .content .tableList .container1 .row[data-v-4615f50c]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-4615f50c]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-4615f50c]{height:50px;text-align:center}.container .content .card[data-v-4615f50c]{padding:5px 5px}.container .content .teamInfo[data-v-4615f50c]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-4615f50c]:hover{transform:scale(1.3)}.container .content .aText[data-v-4615f50c]:hover{transform:scale(1.2)}.container .content .Atext[data-v-4615f50c]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-4615f50c]:hover{transform:scale(1.2)}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors.064c214c.css rel=stylesheet><link href=css/app.d0d2fa97.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.bbbb19b5.js></script><script src=js/app.68b73eff.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors.064c214c.css rel=stylesheet><link href=css/app.d0d2fa97.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.71fa687f.js></script><script src=js/app.60299939.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -63,6 +63,8 @@ import {publicState} from "@/configState"; ...@@ -63,6 +63,8 @@ import {publicState} from "@/configState";
import * as hook from '@/hook/index' import * as hook from '@/hook/index'
import * as api from "@/api/requestUtils" import * as api from "@/api/requestUtils"
Vue.prototype.hooks = hook
Vue.prototype.api = api
import csButton from "@/pages/CompetitionSign/components/buttonLoad.vue"; import csButton from "@/pages/CompetitionSign/components/buttonLoad.vue";
...@@ -70,11 +72,12 @@ if (window) window.$t = (key, value) => i18n.t(key, value); ...@@ -70,11 +72,12 @@ if (window) window.$t = (key, value) => i18n.t(key, value);
Vue.prototype.protocolHost = 'https://asc.hnasct.cn' Vue.prototype.protocolHost = 'https://asc.hnasct.cn'
Vue.prototype.getUserRole = () => { Vue.prototype.getUserRole = () => {
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo'))) let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
// let info = JSON.parse(Cookies.get('admin-competition-userinfo'))
return info ? info.role[0].split('').includes('员') : false return info ? info.role[0].split('').includes('员') : false
} }
Vue.prototype.$bus = new Vue() Vue.prototype.$bus = new Vue()
Vue.prototype.hooks = hook
Vue.prototype.api = api
Vue.prototype.publicState = publicState Vue.prototype.publicState = publicState
Vue.use(plugins); Vue.use(plugins);
Vue.use(ViewUI, { Vue.use(ViewUI, {
......
...@@ -157,17 +157,19 @@ ...@@ -157,17 +157,19 @@
<!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>--> <!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>-->
<!-- <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>--> <!-- <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>-->
</template> </template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list">
<!-- <template #action="{row}">--> <!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>-->
<!-- </template>--> <!-- </template>-->
</Table> </Table>
<Table :columns="columnsTeacher" :data="item.contestant_teacher_list"> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list">
<!-- <template #action="{row}">--> <!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>-->
<!-- </template>--> <!-- </template>-->
</Table> </Table>
<Table :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<!-- <template #action="{row}">--> <!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>-->
<!-- </template>--> <!-- </template>-->
......
...@@ -6,23 +6,33 @@ ...@@ -6,23 +6,33 @@
<div style="height: 80px"> <div style="height: 80px">
<h3>证书列表</h3> <h3>证书列表</h3>
<Row style="margin-top:30px"> <Row style="margin-top:30px">
<Col span="8"> <Col span="6">
参与方式: 参与方式:
<Select :disabled="true" v-model="search.way" style="width: 10vw;"> <Select :disabled="true" v-model="search.way" style="width: 10vw;">
<Option v-for="(item,index) in search.wayArray" :value="item.value" :key="index"> {{ item.label }} <Option v-for="(item,index) in search.wayArray" :value="item.value" :key="index"> {{ item.label }}
</Option> </Option>
</Select> </Select>
</Col> </Col>
<Col span="8"> <Col span="6">
<div style="display: flex;align-items: center;justify-content: center"> <div style="display: flex;align-items: center;justify-content: center">
赛事级别: 赛事级别:
<Select v-model="search.level" style="width: 10vw;"> <Select v-model="search.level" style="width: 10vw;">
<Option v-for="(item,index) in search.levelArray" :value="item.value" :key="index"> {{ item.label }} <Option v-for="(item,index) in search.levelArray" :value="item.id" :key="index"> {{ item.name }}
</Option> </Option>
</Select> </Select>
</div> </div>
</Col> </Col>
<Col span="8"> <Col span="6">
<div style="display: flex;align-items: center;justify-content: flex-end;">
奖项:
<Select v-model="search.h_id" style="width: 10vw;">
<Option v-for="(item,index) in search.awards" :value="item.id" :key="index">
{{ item.name }}
</Option>
</Select>
</div>
</Col>
<Col span="6">
<div style="display: flex;align-items: center;justify-content: flex-end;"> <div style="display: flex;align-items: center;justify-content: flex-end;">
审批状态: 审批状态:
<Select v-model="search.approval_state" style="width: 10vw;"> <Select v-model="search.approval_state" style="width: 10vw;">
...@@ -72,6 +82,12 @@ ...@@ -72,6 +82,12 @@
<template #approval_state="{row}"> <template #approval_state="{row}">
{{ ['未审批', '审批中', '审批通过', '审批不通过'][row.approval_state] }} {{ ['未审批', '审批中', '审批通过', '审批不通过'][row.approval_state] }}
</template> </template>
<template #team_info>
<p>一等奖</p>
<p>二等奖</p>
<p>三等奖</p>
</template>
<template v-slot:action="{row}"> <template v-slot:action="{row}">
<a @click="compile(row)" style="margin-left: 15px;">填报获奖信息</a> <a @click="compile(row)" style="margin-left: 15px;">填报获奖信息</a>
<a @click="edit(row)" style="margin-left: 15px;">详细</a> <a @click="edit(row)" style="margin-left: 15px;">详细</a>
...@@ -239,17 +255,19 @@ ...@@ -239,17 +255,19 @@
<!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>--> <!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>-->
<!-- <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>--> <!-- <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>-->
</template> </template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list">
<!-- <template #action="{row}">--> <!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>-->
<!-- </template>--> <!-- </template>-->
</Table> </Table>
<Table :columns="columnsTeacher" :data="item.contestant_teacher_list"> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list">
<!-- <template #action="{row}">--> <!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>-->
<!-- </template>--> <!-- </template>-->
</Table> </Table>
<Table :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<!-- <template #action="{row}">--> <!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>-->
<!-- </template>--> <!-- </template>-->
...@@ -444,7 +462,7 @@ export default { ...@@ -444,7 +462,7 @@ export default {
lg: 12, lg: 12,
md: 24, md: 24,
sm: 24, sm: 24,
xs: 24 xs: 24,
}, },
columns: [ columns: [
{ {
...@@ -546,6 +564,13 @@ export default { ...@@ -546,6 +564,13 @@ export default {
show: true, show: true,
minWidth: 150, minWidth: 150,
}, },
{
title: '奖项',
slot: 'team_info',
align: 'center',
show: true,
minWidth: 150,
},
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
...@@ -624,6 +649,7 @@ export default { ...@@ -624,6 +649,7 @@ export default {
status: '' status: ''
}, },
search: { search: {
h_id: '',
way: '', way: '',
name: '', name: '',
approval_state: '', approval_state: '',
...@@ -639,9 +665,9 @@ export default { ...@@ -639,9 +665,9 @@ export default {
{value: 3, label: '审批不通过'}, {value: 3, label: '审批不通过'},
], ],
levelArray: [ levelArray: [
{value: 1, label: '国家级'}, // {value: 1, label: '国家级'},
{value: 2, label: '省一级'}, // {value: 2, label: '省一级'},
{value: 3, label: '省二级'}, // {value: 3, label: '省二级'},
], ],
wayArray: [ wayArray: [
{value: 0, label: '团队'}, {value: 0, label: '团队'},
...@@ -671,9 +697,14 @@ export default { ...@@ -671,9 +697,14 @@ export default {
} }
}, },
mounted() { mounted() {
this.GetLevelBySelect()
this.getGetCertificateList() this.getGetCertificateList()
}, },
methods: { methods: {
async GetLevelBySelect() {
const res = await api.GetLevelBySelect()
this.search.levelArray = res.response
},
viewFile(item) { viewFile(item) {
this.$refs.drawerOnlineViewFiel.viewFile(item) this.$refs.drawerOnlineViewFiel.viewFile(item)
}, },
...@@ -771,6 +802,7 @@ export default { ...@@ -771,6 +802,7 @@ export default {
async getGetCertificateList() { async getGetCertificateList() {
this.loading = true this.loading = true
let data = { let data = {
"h_id": this.search.h_id,
"name": this.search.wayCurrentValuethis, "name": this.search.wayCurrentValuethis,
"level": this.search.levelCurrentValue, "level": this.search.levelCurrentValue,
"way": this.search.wayCurrentValue, "way": this.search.wayCurrentValue,
......
...@@ -149,17 +149,19 @@ ...@@ -149,17 +149,19 @@
<a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a> <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a> <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>
</template> </template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list">
<template #action="{row}"> <template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a> <a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template> </template>
</Table> </Table>
<Table :columns="columnsTeacher" :data="item.contestant_teacher_list"> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list">
<template #action="{row}"> <template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a> <a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template> </template>
</Table> </Table>
<Table :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<template #action="{row}"> <template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a> <a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template> </template>
......
...@@ -163,9 +163,12 @@ ...@@ -163,9 +163,12 @@
位)</h3> 位)</h3>
</template> </template>
<template #extra></template> <template #extra></template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"></Table> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
<Table :columns="columnsTeacher" :data="item.contestant_teacher_list"></Table> :data="item.guide_teacher_list"></Table>
<Table :columns="columnsStudent" :data="item.student_list"></Table> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list"></Table>
<Table v-if="!!item.student_list.length" :columns="columnsStudent"
:data="item.student_list"></Table>
</Card> </Card>
<!-- 展开卡片--> <!-- 展开卡片-->
......
...@@ -124,9 +124,12 @@ ...@@ -124,9 +124,12 @@
位)</h3> 位)</h3>
</template> </template>
<template #extra></template> <template #extra></template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"></Table> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
<Table :columns="columnsTeacher" :data="item.contestant_teacher_list"></Table> :data="item.guide_teacher_list"></Table>
<Table :columns="columnsStudent" :data="item.student_list"></Table> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list"></Table>
<Table v-if="!!item.student_list.length" :columns="columnsStudent"
:data="item.student_list"></Table>
</Card> </Card>
<!-- 展开卡片--> <!-- 展开卡片-->
......
...@@ -182,17 +182,19 @@ ...@@ -182,17 +182,19 @@
<a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a> <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a> <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>
</template> </template>
<Table :columns="guidecolumnsTeacher" :data="item.guide_teacher_list"> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list">
<template #action="{row}"> <template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a> <a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template> </template>
</Table> </Table>
<Table :columns="columnsTeacher" :data="item.contestant_teacher_list"> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list">
<template #action="{row}"> <template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a> <a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template> </template>
</Table> </Table>
<Table :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<template #action="{row}"> <template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a> <a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template> </template>
...@@ -722,7 +724,6 @@ ...@@ -722,7 +724,6 @@
@on-change="currentPage4" @on-change="currentPage4"
@on-page-size-change="currentPageCount4" @on-page-size-change="currentPageCount4"
/> />
</div> </div>
<div style="float: right"> <div style="float: right">
<Button @click="addTeamMembers3.Drawer = false" style="margin-right: 20px;">取消</Button> <Button @click="addTeamMembers3.Drawer = false" style="margin-right: 20px;">取消</Button>
...@@ -2208,13 +2209,18 @@ export default { ...@@ -2208,13 +2209,18 @@ export default {
this.fileKey++ this.fileKey++
return false return false
}, },
getTeamIsNull() {
//获取团队 是否不存在人员 用于阻止提交流程
return this.teamObjectData.some((cur, index) => {
return !!cur.guide_teacher_list.length || !!cur.contestant_teacher_list.length || !!cur.student_list.length
})
},
handleSubmit() { handleSubmit() {
this.$refs['formValidate'].validate(async (cur) => { this.$refs['formValidate'].validate(async (cur) => {
if (cur) { if (cur) {
// this.formValidate.competitionname = this.competitionnameValue
// this.$Spin.show()
if (!!this.preparationPlan.length) { if (!!this.preparationPlan.length) {
this.timeState ? ((() => { if (this.timeState) {
if (this.getTeamIsNull()) {
this.$refs.handleSubmit.load = true this.$refs.handleSubmit.load = true
clearTimeout(this.timer) clearTimeout(this.timer)
this.timer = setTimeout(async () => { this.timer = setTimeout(async () => {
...@@ -2228,9 +2234,12 @@ export default { ...@@ -2228,9 +2234,12 @@ export default {
// window.open("about:blank", "_top").close() // window.open("about:blank", "_top").close()
}, 1500) }, 1500)
}, 1000) }, 1000)
})()) : ((() => { } else {
this.$Message.error('团队成员为空,请添加团队成员')
}
} else {
this.$Message.error('未选择比赛时间,请完善比赛时间') this.$Message.error('未选择比赛时间,请完善比赛时间')
})()) }
} else { } else {
this.$Message.error('未上传培训方案,请上传培训方案') this.$Message.error('未上传培训方案,请上传培训方案')
} }
......
...@@ -201,6 +201,7 @@ export default { ...@@ -201,6 +201,7 @@ export default {
}, },
mounted() { mounted() {
this.getData() this.getData()
console.log("🚀我是this🚀🚀,", this)
}, },
methods: { methods: {
addTeamAwards() { addTeamAwards() {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或