提交 7f8fb7e3 编写于 作者: 刘英杰's avatar 刘英杰

V20240223 完成学生和教师奖励,奖金添加身份字段

上级 1d4c52ec
流水线 #24262 已通过 ,包含阶段
in 39 second
[data-v-91d0b704] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-91d0b704] .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-91d0b704]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-91d0b704]: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-2eab72dd]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2eab72dd]{border-collapse:collapse}.tableList .container1 .row[data-v-2eab72dd]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2eab72dd]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2eab72dd]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-2eab72dd]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-2eab72dd]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-2eab72dd]:hover{transform:scale(1.2)}
\ No newline at end of file
[data-v-91d0b704] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-91d0b704] .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-91d0b704]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-91d0b704]: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-0dd3f3f0]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-0dd3f3f0]{border-collapse:collapse}.tableList .container1 .row[data-v-0dd3f3f0]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-0dd3f3f0]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-0dd3f3f0]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-0dd3f3f0]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-0dd3f3f0]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-0dd3f3f0]:hover{transform:scale(1.2)}
\ No newline at end of file
.teamCardExtraText[data-v-2c549212]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-2c549212]{height:100vh;width:100vw}.container .header[data-v-2c549212]{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-2c549212],.container .header .h_right[data-v-2c549212]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-2c549212]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-2c549212]{width:100%;height:92%;align-content:flex-start;overflow-y:auto}.container .content .tableList[data-v-2c549212],.container .content[data-v-2c549212]{display:flex;flex-wrap:wrap;justify-content:center}.container .content .tableList .container1[data-v-2c549212]{border-collapse:collapse;box-sizing:border-box;width:100%}.container .content .tableList .container1 .row[data-v-2c549212]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-2c549212]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-2c549212]{height:50px;text-align:center}.container .content .card[data-v-2c549212]{padding:5px 5px}.container .content .teamInfo[data-v-2c549212]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-2c549212]:hover{transform:scale(1.3)}.container .content .aText[data-v-2c549212]:hover{transform:scale(1.2)}.container .content .Atext[data-v-2c549212]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-2c549212]:hover{transform:scale(1.2)}
\ No newline at end of file
.teamCardExtraText[data-v-343bf5b6]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-343bf5b6]{height:100vh;width:100vw}.container .header[data-v-343bf5b6]{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-343bf5b6],.container .header .h_right[data-v-343bf5b6]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-343bf5b6]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-343bf5b6]{width:100%;height:92%;align-content:flex-start;overflow-y:auto}.container .content .tableList[data-v-343bf5b6],.container .content[data-v-343bf5b6]{display:flex;flex-wrap:wrap;justify-content:center}.container .content .tableList .container1[data-v-343bf5b6]{border-collapse:collapse;box-sizing:border-box;width:100%}.container .content .tableList .container1 .row[data-v-343bf5b6]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-343bf5b6]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-343bf5b6]{height:50px;text-align:center}.container .content .card[data-v-343bf5b6]{padding:5px 5px}.container .content .teamInfo[data-v-343bf5b6]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-343bf5b6]:hover{transform:scale(1.3)}.container .content .aText[data-v-343bf5b6]:hover{transform:scale(1.2)}.container .content .Atext[data-v-343bf5b6]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-343bf5b6]:hover{transform:scale(1.2)}
\ No newline at end of file
[data-v-fd537088] .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-fd537088]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-fd537088]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-fd537088]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-fd537088]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-fd537088]:hover{transform:scale(1.2)}.container[data-v-fd537088]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-fd537088],.tableList[data-v-b1f97b1a]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-b1f97b1a]{border-collapse:collapse}.tableList .container1 .row[data-v-b1f97b1a]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-b1f97b1a]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-b1f97b1a]{width:500px;height:50px;text-align:center}.Atext[data-v-b1f97b1a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-b1f97b1a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-fd537088] .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-fd537088]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-fd537088]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-fd537088]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-fd537088]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-fd537088]:hover{transform:scale(1.2)}.container[data-v-fd537088]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-fd537088],.tableList[data-v-0103c1a7]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-0103c1a7]{border-collapse:collapse}.tableList .container1 .row[data-v-0103c1a7]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-0103c1a7]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-0103c1a7]{width:500px;height:50px;text-align:center}.Atext[data-v-0103c1a7]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-0103c1a7]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ 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.2ffa1513.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.3591f8ca.js></script><script src=js/app.a5e0b4b4.js></script></body></html>
\ 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.2ffa1513.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.7dda7c05.js></script><script src=js/app.12cd3658.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -75,6 +75,12 @@
</div>
</Col>
</Row>
<cs-search-cond-form
:searchCondList="searchCondList"
:labelWidth="120"
@onSubmit="cssearch"
@onReset="csreset"
></cs-search-cond-form>
</div>
<!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>-->
</template>
......@@ -383,6 +389,43 @@ export default {
components: {updateCertificateModal},
data() {
return {
// 搜索项
searchCondList: [
{
id: 'name',
name: '赛事名称',
type: 'input',
show: true,
optList: []
},
{
id: 'level',
name: '赛事级别',
type: 'select',
show: true,
optList: []
},
{
id: 'h_id',
name: '奖项',
type: 'select',
show: true,
optList: [],
},
{
id: 'approval_state',
name: '审批状态',
type: 'select',
show: true,
optList: [{value: 0, label: '未审批'},
{value: 1, label: '审批中'},
{value: 2, label: '审批通过'},
{value: 3, label: '审批不通过'},
{value: 4, label: '退回'},]
},
],
teamObjectData: {},
columnsStudent: [
{
......@@ -755,6 +798,44 @@ export default {
},
computed: {
cssearch(val) {
// 搜索
this.search = {...this.search, ...val}
this.searchFun()
},
csreset() {
// 重置
this.search = {
currentH_id: '',
h_id: '',
way: '',
name: '',
approval_state: '',
level: '',
wayCurrentValue: '',
nameCurrentValue: '',
approval_stateCurrentValue: '',
levelCurrentValue: '',
awards: [],
approval_stateArray: [
{value: 0, label: '未审批'},
{value: 1, label: '审批中'},
{value: 2, label: '审批通过'},
{value: 3, label: '审批不通过'},
],
levelArray: [
// {value: 1, label: '国家级'},
// {value: 2, label: '省一级'},
// {value: 3, label: '省二级'},
],
wayArray: [
{value: 0, label: '团队'},
{value: 1, label: '个人'},
],
}
this.searchFun()
},
publicState() {
return publicState
},
......@@ -779,10 +860,28 @@ export default {
async GetHierarchyNameSelect() {
const res = await api.GetHierarchyNameSelect()
this.search.awards = res.response
let array = res.response.map(cur => {
return {
label: cur.name,
value: cur.id,
}
})
this.searchCondList.map((cur) => {
if (cur.id === 'h_id') cur.optList = array
})
},
async GetLevelBySelect() {
const res = await api.GetLevelBySelect()
this.search.levelArray = res.response
let array = res.response.map(cur => {
return {
label: cur.name,
value: cur.id,
}
})
this.searchCondList.map((cur) => {
if (cur.id === 'level') cur.optList = array
})
},
viewFile(item) {
this.$refs.drawerOnlineViewFiel.viewFile(item)
......
......@@ -6,55 +6,55 @@
<div style="height: auto">
<!-- <h3>报名列表</h3>-->
<Row>
<!-- <Row>-->
<!-- &lt;!&ndash; <Col span="6">&ndash;&gt;-->
<!-- &lt;!&ndash; <Select v-model="search.way" style="width: 15vw;">&ndash;&gt;-->
<!-- &lt;!&ndash; <template #prefix>&ndash;&gt;-->
<!-- &lt;!&ndash; 参与方式&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; <Option v-for="(item,index) in search.wayArray" :value="item.value" :key="index"> {{ item.label }}&ndash;&gt;-->
<!-- &lt;!&ndash; </Option>&ndash;&gt;-->
<!-- &lt;!&ndash; </Select>&ndash;&gt;-->
<!-- &lt;!&ndash; </Col>&ndash;&gt;-->
<!-- <Col span="6">-->
<!-- <Select v-model="search.way" style="width: 15vw;">-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start;">-->
<!-- <Input v-model="search.name" placeholder="请输入赛事名称..." style="width: 15vw;">-->
<!-- <template #prepend>-->
<!-- <div style="color: #9C9C9C">赛事名称</div>-->
<!-- </template>-->
<!-- </Input>-->
<!-- </div>-->
<!-- </Col>-->
<!-- <Col span="6">-->
<!-- <div style="display: flex;align-items: center;justify-content: center">-->
<!-- <Select v-model="search.level" style="width: 15vw;" clearable>-->
<!-- <template #prefix>-->
<!-- 参与方式-->
<!-- <div style="width: 5vw;color: #9C9C9C">赛事级别</div>-->
<!-- </template>-->
<!-- <Option v-for="(item,index) in search.wayArray" :value="item.value" :key="index"> {{ item.label }}-->
<!-- <Option v-for="(item,index) in search.levelArray" :value="item.id" :key="index"> {{ item.name }}-->
<!-- </Option>-->
<!-- </Select>-->
<!-- </div>-->
<!-- </Col>-->
<!-- <Col span="6">-->
<!-- <div style="display: flex;align-items: center;justify-content:center;">-->
<!-- <Select v-model="search.approval_state" style="width: 15vw;" clearable>-->
<!-- <template #prefix>-->
<!-- <div style="width: 5vw;color: #9C9C9C">审批状态</div>-->
<!-- </template>-->
<!-- <Option v-for="(item,index) in search.approval_stateArray" :value="item.value" :key="index">-->
<!-- {{ item.label }}-->
<!-- </Option>-->
<!-- </Select>-->
<!-- </div>-->
<!-- </Col>-->
<Col span="6">
<div style="display: flex;align-items: center;justify-content: flex-start;">
<Input v-model="search.name" placeholder="请输入赛事名称..." style="width: 15vw;">
<template #prepend>
<div style="color: #9C9C9C">赛事名称</div>
</template>
</Input>
</div>
</Col>
<Col span="6">
<div style="display: flex;align-items: center;justify-content: center">
<Select v-model="search.level" style="width: 15vw;" clearable>
<template #prefix>
<div style="width: 5vw;color: #9C9C9C">赛事级别</div>
</template>
<Option v-for="(item,index) in search.levelArray" :value="item.id" :key="index"> {{ item.name }}
</Option>
</Select>
</div>
</Col>
<Col span="6">
<div style="display: flex;align-items: center;justify-content:center;">
<Select v-model="search.approval_state" style="width: 15vw;" clearable>
<template #prefix>
<div style="width: 5vw;color: #9C9C9C">审批状态</div>
</template>
<Option v-for="(item,index) in search.approval_stateArray" :value="item.value" :key="index">
{{ item.label }}
</Option>
</Select>
</div>
</Col>
<Col span="6">
<div style="display: flex;align-items: center;justify-content: flex-end;">
<Button type="primary" :disabled="searchButton" @click="searchFun">查找</Button>
</div>
</Col>
</Row>
<!-- <Col span="6">-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-end;">-->
<!-- <Button type="primary" :disabled="searchButton" @click="searchFun">查找</Button>-->
<!-- </div>-->
<!-- </Col>-->
<!-- </Row>-->
<cs-search-cond-form
:searchCondList="searchCondList"
......@@ -289,18 +289,7 @@ export default {
name: '赛事级别',
type: 'select',
show: true,
optList: [{
label: '草稿',
value: 0,
},
{
label: '运行中',
value: 1,
},
{
label: '已结束',
value: 2,
},]
optList: []
},
{
id: 'approval_state',
......@@ -663,23 +652,40 @@ export default {
methods: {
cssearch(val) {
// 搜索
this.init = {...this.init, ...val}
this.search()
this.search = {...this.search, ...val}
this.searchFun()
},
csreset() {
// 重置
this.init = {
action_type: '',
status: "",
key_name: '',
flow_name: '',
page_index: 1,
page_size: 10,
total: 0,
flow_id: '',
this.search = {
way: '',
name: '',
approval_state: '',
level: '',
wayCurrentValue: '',
nameCurrentValue: '',
approval_stateCurrentValue: '',
levelCurrentValue: '',
approval_stateArray: [
{value: 0, label: '未审批'},
{value: 1, label: '审批中'},
{value: 2, label: '审批通过'},
{value: 3, label: '审批不通过'},
{value: 4, label: '退回'},
],
levelArray: [
/*
{value: 1, label: '国家级'},
{value: 2, label: '省一级'},
{value: 3, label: '省二级'},*/
],
wayArray: [
{value: 0, label: '团队'},
{value: 1, label: '个人'},
],
}
this.initData()
this.searchFun()
},
generateStudentOrTeacherRewards(row) {
//生成学生补助或教师工作量
......@@ -751,6 +757,15 @@ export default {
async GetLevelBySelect() {
const res = await api.GetLevelBySelect()
this.search.levelArray = res.response
let array = res.response.map(cur => {
return {
label: cur.name,
value: cur.id,
}
})
this.searchCondList.map((cur) => {
if (cur.id === 'level') cur.optList = array
})
},
importButton(row) {
window.open(row, '_blank')
......
......@@ -245,7 +245,7 @@
</template>
<Table v-if="!!item.student_list.length"
:columns="[columnsStudentAward,columnsTeacherAward][data.Object.bonus.bonus_total]"
:columns="[columnsStudentAward,columnsTeacherAward][data.Object.bonus.is_tea]"
:data="item.student_list">
<template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;">
......@@ -1122,7 +1122,7 @@ export default {
this.asc.getApiTeamApiTeamTeamAndMemberSelCondition({
signid: resx.response.bonus.competitionsign_id,
is_tea: 0
is_tea: resx.response.bonus.is_tea
}).then(res => {
this.competitionsignTeam = res.response.map((cur, index) => {
//遍历团队成员奖项
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或