提交 3e35ac6c 编写于 作者: 刘英杰's avatar 刘英杰

团队非空才能报名

上级 558e2c2c
流水线 #23771 已通过 ,包含阶段
in 36 second
[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)} [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-abaf4d0c]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-abaf4d0c]{border-collapse:collapse}.tableList .container1 .row[data-v-abaf4d0c]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-abaf4d0c]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-abaf4d0c]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-abaf4d0c]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-abaf4d0c]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-abaf4d0c]:hover{transform:scale(1.2)}
\ No newline at end of file \ No newline at end of file
[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} [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-22369d68]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-22369d68]{border-collapse:collapse}.tableList .container1 .row[data-v-22369d68]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-22369d68]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-22369d68]{width:500px;height:50px;text-align:center}.Atext[data-v-22369d68]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-22369d68]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file \ 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.71fa687f.js></script><script src=js/app.60299939.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.deb832fb.js></script><script src=js/app.049ace83.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -1395,3 +1395,12 @@ export function TeamHierarchySave(data) { ...@@ -1395,3 +1395,12 @@ export function TeamHierarchySave(data) {
data, data,
}); });
} }
export function GetHierarchyNameSelect(data) {
//获奖名称下拉框
return request({
url: `/api/Common/GetHierarchyNameSelect`,
method: 'get',
data,
});
}
...@@ -3,20 +3,22 @@ ...@@ -3,20 +3,22 @@
<Card ref="card"> <Card ref="card">
<template #title> <template #title>
<div style="height: 80px"> <div style="height:auto">
<h3>证书列表</h3> <!-- <h3>证书列表</h3>-->
<Row style="margin-top:30px"> <Row>
<Col span="6"> <Col span="6">
参与方式:
<Select :disabled="true" v-model="search.way" style="width: 10vw;"> <Select :disabled="true" v-model="search.way" style="width: 15vw;">
<template #prefix>参与方式</template>
<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="6"> <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: 15vw;">
<template #prefix>赛事级别</template>
<Option v-for="(item,index) in search.levelArray" :value="item.id" :key="index"> {{ item.name }} <Option v-for="(item,index) in search.levelArray" :value="item.id" :key="index"> {{ item.name }}
</Option> </Option>
</Select> </Select>
...@@ -24,8 +26,9 @@ ...@@ -24,8 +26,9 @@
</Col> </Col>
<Col span="6"> <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.h_id" style="width: 10vw;"> <Select v-model="search.h_id" style="width: 15vw;">
<template #prefix>奖项</template>
<Option v-for="(item,index) in search.awards" :value="item.id" :key="index"> <Option v-for="(item,index) in search.awards" :value="item.id" :key="index">
{{ item.name }} {{ item.name }}
</Option> </Option>
...@@ -34,8 +37,8 @@ ...@@ -34,8 +37,8 @@
</Col> </Col>
<Col span="6"> <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: 15vw;">
<Select v-model="search.approval_state" style="width: 10vw;"> <template #prefix>审批状态</template>
<Option v-for="(item,index) in search.approval_stateArray" :value="item.value" :key="index"> <Option v-for="(item,index) in search.approval_stateArray" :value="item.value" :key="index">
{{ item.label }} {{ item.label }}
</Option> </Option>
...@@ -43,15 +46,32 @@ ...@@ -43,15 +46,32 @@
</div> </div>
</Col> </Col>
</Row> </Row>
<Row style="margin-top: 1vh;">
<Col span="6">
<Input v-model="search.name" placeholder="请输入竞赛名称..." style="width: 15vw;">
<template #prepend>
竞赛名称
</template>
</Input>
</Col>
</Row>
<Row style="margin-top: 1vh;">
<Col span="6">
<Button type="primary" :disabled="searchButton" @click="searchFun">查找</Button>
<Button type="primary" @click="batchApproval" style="margin-left: 10px">一键审批
</Button>
<Button type="primary" @click="importData" style="margin-left: 10px">证书数据导出</Button>
</Col>
</Row>
</div> </div>
<!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>--> <!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>-->
</template> </template>
<template #extra> <template #extra>
<Input v-model="search.name" placeholder="请输入竞赛名称..." style="width: 15vw;"></Input> <!-- <Input v-model="search.name" placeholder="请输入竞赛名称..." style="width: 15vw;"></Input>-->
<Button type="primary" :disabled="searchButton" @click="searchFun" style="margin-left: 10px">查找</Button> <!-- <Button type="primary" :disabled="searchButton" @click="searchFun" style="margin-left: 10px">查找</Button>-->
<Button type="primary" @click="batchApproval" style="margin-left: 10px">一键审批 <!-- <Button type="primary" @click="batchApproval" style="margin-left: 10px">一键审批-->
</Button> <!-- </Button>-->
<Button type="primary" @click="importData" style="margin-left: 10px">证书数据导出</Button> <!-- <Button type="primary" @click="importData" style="margin-left: 10px">证书数据导出</Button>-->
</template> </template>
<Table <Table
...@@ -320,6 +340,7 @@ import _ from "lodash"; ...@@ -320,6 +340,7 @@ import _ from "lodash";
import util from '@/libs/util'; import util from '@/libs/util';
import utilCookies from "@/libs/util.cookies"; import utilCookies from "@/libs/util.cookies";
import updateCertificateModal from "@/pages/Certificate/components/updateCertificateModal.vue"; import updateCertificateModal from "@/pages/Certificate/components/updateCertificateModal.vue";
import {GetHierarchyNameSelect} from "../../api/requestUtils";
export default { export default {
name: 'list', name: 'list',
...@@ -658,6 +679,7 @@ export default { ...@@ -658,6 +679,7 @@ export default {
nameCurrentValue: '', nameCurrentValue: '',
approval_stateCurrentValue: '', approval_stateCurrentValue: '',
levelCurrentValue: '', levelCurrentValue: '',
awards: [],
approval_stateArray: [ approval_stateArray: [
{value: 0, label: '未审批'}, {value: 0, label: '未审批'},
{value: 1, label: '审批中'}, {value: 1, label: '审批中'},
...@@ -688,19 +710,24 @@ export default { ...@@ -688,19 +710,24 @@ export default {
}, },
computed: { computed: {
searchButton() { searchButton() {
return this.search.way === '' && this.search.level === '' && this.search.name === '' && this.search.approval_state === '' return this.search.way === '' && this.search.level === '' && this.search.name === '' && this.search.approval_state === '' && this.search.h_id === ''
}, },
getRole() { getRole() {
let info = JSON.parse(util.cookies.get('competition-userinfo')) let info = JSON.parse(util.cookies.get('competition-userinfo'))
return info.role.indexOf('["管理员"]') !== -1 return info.role.indexOf('["管理员"]') !== -1
} }
}, },
mounted() { mounted() {
this.GetHierarchyNameSelect()
this.GetLevelBySelect() this.GetLevelBySelect()
this.getGetCertificateList() this.getGetCertificateList()
}, },
methods: { methods: {
async GetHierarchyNameSelect() {
const res = await api.GetHierarchyNameSelect()
this.search.awards = res.response
},
async GetLevelBySelect() { async GetLevelBySelect() {
const res = await api.GetLevelBySelect() const res = await api.GetLevelBySelect()
this.search.levelArray = res.response this.search.levelArray = res.response
...@@ -747,8 +774,11 @@ export default { ...@@ -747,8 +774,11 @@ export default {
}) })
}, },
batchApproval() { batchApproval() {
hook.myEncapsulationFunction(async () => { //一键审批
return await api.CertificateSetState() this.hooks.publicConfirm(() => {
hook.myEncapsulationFunction(async () => {
return await api.CertificateSetState()
})
}) })
}, },
async teamInfo(e) { async teamInfo(e) {
...@@ -792,6 +822,8 @@ export default { ...@@ -792,6 +822,8 @@ export default {
this.search.levelCurrentValue = this.search.level this.search.levelCurrentValue = this.search.level
this.search.wayCurrentValue = this.search.way this.search.wayCurrentValue = this.search.way
this.search.approval_stateCurrentValue = this.search.approval_state this.search.approval_stateCurrentValue = this.search.approval_state
this.search.currentH_id = this.search.h_id
this.pageKey++ this.pageKey++
this.init.page_index = 1 this.init.page_index = 1
...@@ -802,7 +834,7 @@ export default { ...@@ -802,7 +834,7 @@ export default {
async getGetCertificateList() { async getGetCertificateList() {
this.loading = true this.loading = true
let data = { let data = {
"h_id": this.search.h_id, "h_id": this.search.currentH_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,
......
...@@ -4,45 +4,61 @@ ...@@ -4,45 +4,61 @@
<template #title> <template #title>
<div style="height: 80px"> <div style="height: auto">
<h3>报名列表</h3> <!-- <h3>报名列表</h3>-->
<Row>
<Row style="margin-top:30px"> <Col span="6">
<Col span="8"> <Select v-model="search.way" style="width: 15vw;">
参与方式: <template #prefix>
<Select v-model="search.way" style="width: 10vw;"> 参与方式
</template>
<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: 15vw;">
<template #prefix>
竞赛等级
</template>
<Option v-for="(item,index) in search.levelArray" :value="item.id" :key="index"> {{ item.name }} <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;"> <div style="display: flex;align-items: center;justify-content: flex-end;">
审批状态: <Select v-model="search.approval_state" style="width: 15vw;">
<Select v-model="search.approval_state" style="width: 10vw;"> <template #prefix>
审批状态
</template>
<Option v-for="(item,index) in search.approval_stateArray" :value="item.value" :key="index"> <Option v-for="(item,index) in search.approval_stateArray" :value="item.value" :key="index">
{{ item.label }} {{ item.label }}
</Option> </Option>
</Select> </Select>
</div> </div>
</Col> </Col>
<Col span="6">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<Input v-model="search.name" placeholder="请输入竞赛名称..." style="width: 15vw;">
<template #prepend>竞赛名称</template>
</Input>
</div>
</Col>
</Row>
<Row style="margin-top: 1vh;">
<Col span="6">
<Button type="primary" :disabled="searchButton" @click="searchFun">查找</Button>
</Col>
</Row> </Row>
</div> </div>
<!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>--> <!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>-->
</template> </template>
<template #extra>
<Input v-model="search.name" placeholder="请输入竞赛名称..." style="width: 15vw;"></Input>
<Button type="primary" :disabled="searchButton" @click="searchFun" style="margin-left: 10px">查找</Button>
</template>
<Table <Table
:columns="columns" :columns="columns"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或