提交 447ea173 编写于 作者: 刘英杰's avatar 刘英杰

- 20240520

    - 放开师生奖励提交表单按钮;
    - 成绩申报和师生奖励详情更新团队数据字段;
    - 师生奖励恢复”审批通过“状态才能编辑;
上级 eda24111
流水线 #26195 已失败 ,包含阶段
in 11 second
...@@ -7,4 +7,7 @@ ...@@ -7,4 +7,7 @@
- 学生补助和教师工作量和成绩申报合并成 “成绩申报“ - 学生补助和教师工作量和成绩申报合并成 “成绩申报“
- ”师生奖励“和“成绩申报“ 表单界面优化 - ”师生奖励“和“成绩申报“ 表单界面优化
- 20240520
- 放开师生奖励提交表单按钮;
- 成绩申报和师生奖励详情更新团队数据字段;
- 师生奖励恢复”审批通过“状态才能编辑;
.carClass[data-v-138b81d2]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-138b81d2] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-138b81d2] .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-138b81d2]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-138b81d2]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-138b81d2]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-138b81d2]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-138b81d2]:hover{transform:scale(1.2)}.container[data-v-138b81d2]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-138b81d2],.tableList[data-v-14e41c83]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-14e41c83]{border-collapse:collapse}.tableList .container1 .row[data-v-14e41c83]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-14e41c83]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-14e41c83]{width:500px;height:50px;text-align:center}.Atext[data-v-14e41c83]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-14e41c83]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.carClass[data-v-a26b3b2a]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-a26b3b2a] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-a26b3b2a] .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-a26b3b2a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-a26b3b2a]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-a26b3b2a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-a26b3b2a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-a26b3b2a]:hover{transform:scale(1.2)}.container[data-v-a26b3b2a]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-a26b3b2a],.tableList[data-v-0e7d38f4]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-0e7d38f4]{border-collapse:collapse}.tableList .container1 .row[data-v-0e7d38f4]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-0e7d38f4]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-0e7d38f4]{width:500px;height:50px;text-align:center}.Atext[data-v-0e7d38f4]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-0e7d38f4]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.carClass[data-v-17df25da]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-17df25da] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-17df25da] .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-17df25da]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-17df25da]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-17df25da]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-17df25da]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-17df25da]:hover{transform:scale(1.2)}.container[data-v-17df25da]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-17df25da],.tableList[data-v-03d0f3be]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-03d0f3be]{border-collapse:collapse}.tableList .container1 .row[data-v-03d0f3be]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-03d0f3be]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-03d0f3be]{width:500px;height:50px;text-align:center}.Atext[data-v-03d0f3be]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-03d0f3be]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff} .carClass[data-v-17df25da]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-17df25da] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-17df25da] .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-17df25da]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-17df25da]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-17df25da]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-17df25da]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-17df25da]:hover{transform:scale(1.2)}.container[data-v-17df25da]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-17df25da],.tableList[data-v-34f51df7]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-34f51df7]{border-collapse:collapse}.tableList .container1 .row[data-v-34f51df7]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-34f51df7]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-34f51df7]{width:500px;height:50px;text-align:center}.Atext[data-v-34f51df7]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-34f51df7]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file \ No newline at end of file
[data-v-42cb7f86] .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-42cb7f86]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-42cb7f86]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-42cb7f86]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-42cb7f86]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-42cb7f86]:hover{transform:scale(1.2)}.container[data-v-42cb7f86]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-42cb7f86],.tableList[data-v-3954a578]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-3954a578]{border-collapse:collapse}.tableList .container1 .row[data-v-3954a578]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-3954a578]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-3954a578]{width:500px;height:50px;text-align:center}.Atext[data-v-3954a578]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-3954a578]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff} [data-v-42cb7f86] .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-42cb7f86]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-42cb7f86]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-42cb7f86]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-42cb7f86]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-42cb7f86]:hover{transform:scale(1.2)}.container[data-v-42cb7f86]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-42cb7f86],.tableList[data-v-622c2ede]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-622c2ede]{border-collapse:collapse}.tableList .container1 .row[data-v-622c2ede]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-622c2ede]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-622c2ede]{width:500px;height:50px;text-align:center}.Atext[data-v-622c2ede]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-622c2ede]{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.8edd3c9e.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.c20cfa4e.js></script><script src=js/app.a3a9521a.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.8edd3c9e.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.fa3c8e56.js></script><script src=js/app.ec49173a.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -29,11 +29,12 @@ ...@@ -29,11 +29,12 @@
<a @click="details(row)">详情</a> <a @click="details(row)">详情</a>
<!-- <Button type="info" size="small" @click="edit(row)" style="margin-left: 8px">编辑</Button>--> <!-- <Button type="info" size="small" @click="edit(row)" style="margin-left: 8px">编辑</Button>-->
<span v-if="row.hasOwnProperty('createby') && buttonAuzhorization "> <span v-if="row.hasOwnProperty('createby') && buttonAuzhorization ">
<!-- <a v-if="hooks.fourtableButtonAuthentication(row.createby)" @click="edit(row)"--> <a v-if="hooks.fourtableButtonAuthentication(row.createby)" @click="edit(row)"
<!-- style="margin-left: 8px">编辑</a>--> style="margin-left: 8px">编辑</a>
<!-- <a v-else style="margin-left: 8px;color: #7a7e83;">编辑</a>--> <a v-else style="margin-left: 8px;color: #7a7e83;">编辑</a>
<a @click="edit(row)"
style="margin-left: 8px">编辑</a> <!-- <a @click="edit(row)"-->
<!-- style="margin-left: 8px">编辑</a>-->
</span> </span>
<span v-else> <span v-else>
...@@ -68,57 +69,57 @@ ...@@ -68,57 +69,57 @@
</template> </template>
<script> <script>
import {fourtableButtonAuthentication} from "@/hook"; import {fourtableButtonAuthentication} from "@/hook";
export default { export default {
props: { props: {
buttonAuzhorization: {type: Boolean, require: true, default: false},//按钮级别的鉴权 后加 buttonAuzhorization: {type: Boolean, require: true, default: false},//按钮级别的鉴权 后加
showPage: {type: Boolean, require: true, default: true}, showPage: {type: Boolean, require: true, default: true},
tableColumns: {type: Array, require: true}, tableColumns: {type: Array, require: true},
tableData: {type: Array, require: true}, tableData: {type: Array, require: true},
tableLoading: {type: Boolean, default: false}, tableLoading: {type: Boolean, default: false},
tableSize: {type: String, default: 'default'}, tableSize: {type: String, default: 'default'},
dataCount: {type: Number, require: true}, dataCount: {type: Number, require: true},
pageIndex: {type: Number, require: true}, pageIndex: {type: Number, require: true},
pageSize: {type: Number, require: true}, pageSize: {type: Number, require: true},
pageSizeOpts: {type: Array, default: () => [10, 20, 50, 100]}, pageSizeOpts: {type: Array, default: () => [10, 20, 50, 100]},
},
data() {
return {}
},
computed: {},
created() {
},
mounted() {
},
methods: {
fourtableButtonAuthentication,
// 改变开关
switchChange(val, row, index) {
this.$emit('switchChange', val, row, index)
}, },
// 详情 data() {
details(row) { return {}
this.$emit('rowDetails', row)
}, },
// 编辑行 computed: {},
edit(row) { created() {
this.$emit('rowEdit', row)
}, },
// 删除行 mounted() {
del(row) {
this.$emit('rowDelete', row)
}, },
// 翻页 methods: {
handleChangePage(val) { fourtableButtonAuthentication,
this.$emit('onPageChange', val) // 改变开关
switchChange(val, row, index) {
this.$emit('switchChange', val, row, index)
},
// 详情
details(row) {
this.$emit('rowDetails', row)
},
// 编辑行
edit(row) {
this.$emit('rowEdit', row)
},
// 删除行
del(row) {
this.$emit('rowDelete', row)
},
// 翻页
handleChangePage(val) {
this.$emit('onPageChange', val)
},
// 更改每页长度
handleChangePageSize(val) {
this.$emit('onPageSizeChange', val)
},
}, },
// 更改每页长度 }
handleChangePageSize(val) {
this.$emit('onPageSizeChange', val)
},
},
}
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
......
...@@ -112,13 +112,12 @@ Vue.prototype.buttonAuthorization = function (approvalValue, key) { ...@@ -112,13 +112,12 @@ Vue.prototype.buttonAuthorization = function (approvalValue, key) {
let strategy = { let strategy = {
'studentOrTeacherAward': () => { 'studentOrTeacherAward': () => {
//学生奖励或教师奖励 通过审批才能编辑 //学生奖励或教师奖励 通过审批才能编辑
// return approvalValue === 2 return approvalValue === 2
return true
}, },
'studentGrandsOrTeacherWorkLoad': () => { 'studentGrandsOrTeacherWorkLoad': () => {
//学生补助或教师工作量 审批中或审批通过不能编辑 //学生补助或教师工作量 审批中或审批通过不能编辑
// return approvalValue !== 1 && approvalValue !== 2 return approvalValue !== 1 && approvalValue !== 2
return true
}, },
} }
return strategy[key]() return strategy[key]()
......
...@@ -178,8 +178,6 @@ ...@@ -178,8 +178,6 @@
@click="teamStudentSaveBonusPool(item)" type="md-create" @click="teamStudentSaveBonusPool(item)" type="md-create"
style="cursor: pointer;font-size: 20px;"/> style="cursor: pointer;font-size: 20px;"/>
</span> </span>
</template> </template>
<template #extra> <template #extra>
<div v-text-family class="teamCardExtraText">{{ item.hierarchy_name }}</div> <div v-text-family class="teamCardExtraText">{{ item.hierarchy_name }}</div>
...@@ -560,7 +558,7 @@ ...@@ -560,7 +558,7 @@
addTeamAwardsModal: false, addTeamAwardsModal: false,
columnsStudent: [ columnsStudent: [
{ {
title: '指导教师', title: '参赛学生',
minWidth: 100, minWidth: 100,
key: 'name' key: 'name'
}, },
...@@ -1312,7 +1310,11 @@ ...@@ -1312,7 +1310,11 @@
let data = _.cloneDeep(this.formValidate) let data = _.cloneDeep(this.formValidate)
data.flowid = 107 data.flowid = 107
return this.asc.postApiFlowApiFlowFlowBonusDeclareSubmit(data).then(res => { return this.asc.postApiFlowApiFlowFlowBonusDeclareSubmit(data).then(res => {
if (res.code === 1) this.$emit('getData') if (res.code === 1) {
this.$emit('getData')
this.$emit('closeModal')
}
return res return res
}) })
}) })
......
...@@ -69,13 +69,14 @@ ...@@ -69,13 +69,14 @@
> >
<!-- <Spin fix v-if="importLoading"></Spin>--> <!-- <Spin fix v-if="importLoading"></Spin>-->
<div style=" display: flex;justify-content: space-around;"> <div style=" display: flex;justify-content: space-around;">
<updateCertificateModal @getData="getData" ref="updateCertificateModal" v-if="CertificateModal" <updateCertificateModal @closeModal="closeModal" @getData="getData" ref="updateCertificateModal"
v-if="CertificateModal"
:winningMaterialId="Id" :winningMaterialId="Id"
></updateCertificateModal> ></updateCertificateModal>
</div> </div>
<template #footer> <template #footer>
<div style="display: flex;justify-content: center"> <div style="display: flex;justify-content: center">
<cs-button :disabled="true" ref="load" type="primary" cs-style="width: 12vw;margin-right:10px;" <cs-button ref="load" type="primary" cs-style="width: 12vw;margin-right:10px;"
cs-text="提交流程" cs-text="提交流程"
:cs-click="handleSubmit" :cs-click="handleSubmit"
></cs-button> ></cs-button>
...@@ -87,7 +88,9 @@ ...@@ -87,7 +88,9 @@
</template> </template>
</Modal> </Modal>
<Drawer :width="800" title="详细" :closable="true" v-model="drawer"> <Drawer :width="800" title="详细" :closable="true" v-model="drawer">
<div class="tableList">
<div class="tableList" style="position: relative">
<Spin fix v-if="dLoading"></Spin>
<h1 style="display: flex;justify-content: center">教师奖励</h1> <h1 style="display: flex;justify-content: center">教师奖励</h1>
<table border="1" class="container1"> <table border="1" class="container1">
<tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index"> <tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index">
...@@ -189,6 +192,22 @@ ...@@ -189,6 +192,22 @@
</div> </div>
</template> </template>
</Table> </Table>
<Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher" :data="item.student_list">
<template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;">
<span
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span>
</div>
</template>
</Table>
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher" :data="item.student_list">
<template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;">
<span
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span>
</div>
</template>
</Table>
</Card> </Card>
</div> </div>
<!-- 展开卡片--> <!-- 展开卡片-->
...@@ -224,7 +243,7 @@ ...@@ -224,7 +243,7 @@
flagObject: {}, flagObject: {},
columnsStudent: [ columnsStudent: [
{ {
title: '教师', title: '参赛学生',
minWidth: 100, minWidth: 100,
key: 'name' key: 'name'
}, },
...@@ -254,11 +273,17 @@ ...@@ -254,11 +273,17 @@
key: 'phone' key: 'phone'
}, },
{ {
title: '赛事奖项', title: '奖项',
minWidth: 80, minWidth: 80,
key: 'hierarchy_name', key: 'hierarchy_name',
fixed: 'right' fixed: 'right'
}, },
{
title: '奖励比例',
minWidth: 150,
slot: 'bonus_ratio',
fixed: 'right',
},
{ {
title: '奖励金额', title: '奖励金额',
minWidth: 150, minWidth: 150,
...@@ -273,7 +298,106 @@ ...@@ -273,7 +298,106 @@
// fixed: 'right' // fixed: 'right'
// }, // },
], ],
guidecolumnsTeacher: [
{
title: '指导教师',
minWidth: 100,
key: 'name'
},
{
title: '工号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
{
title: '奖项',
minWidth: 80,
key: 'hierarchy_name',
fixed: 'right'
},
{
title: '奖励比例',
minWidth: 150,
slot: 'bonus_ratio',
fixed: 'right',
},
{
title: '奖励金额',
minWidth: 150,
slot: 'bonus',
fixed: 'right',
},
],
columnsTeacher: [
{
title: '参赛教师',
minWidth: 100,
key: 'name'
},
{
title: '工号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
{
title: '奖项',
minWidth: 80,
key: 'hierarchy_name',
fixed: 'right'
},
{
title: '奖励比例',
minWidth: 150,
slot: 'bonus_ratio',
fixed: 'right',
},
{
title: '奖励金额',
minWidth: 150,
slot: 'bonus',
fixed: 'right',
},
],
unfold: { unfold: {
State: 0, State: 0,
height: '400', height: '400',
...@@ -282,7 +406,7 @@ ...@@ -282,7 +406,7 @@
drawer: false, drawer: false,
drawerKeyValueArray: [], drawerKeyValueArray: [],
teamObjectData: {}, teamObjectData: {},
dLoading: false,
Id: '', Id: '',
importModal: false, importModal: false,
importLoading: false, importLoading: false,
...@@ -505,6 +629,10 @@ ...@@ -505,6 +629,10 @@
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
closeModal() {
//关闭生成获奖材料modal
this.CertificateModal = false
},
viewFile(item) { viewFile(item) {
this.$refs.drawerOnlineViewFiel.viewFile(item) this.$refs.drawerOnlineViewFiel.viewFile(item)
}, },
...@@ -603,7 +731,6 @@ ...@@ -603,7 +731,6 @@
}) })
}, },
TeamAndMemberSel() { TeamAndMemberSel() {
console.log("🚀🚀111111111111111111111🚀,")
//团队信息 /api/Team/api/Team/TeamAndMemberSel //团队信息 /api/Team/api/Team/TeamAndMemberSel
this.asc.getApiTeamApiTeamTeamAndMemberSel({ this.asc.getApiTeamApiTeamTeamAndMemberSel({
signid: this.flagObject.competitionsign_id, signid: this.flagObject.competitionsign_id,
...@@ -622,61 +749,63 @@ ...@@ -622,61 +749,63 @@
// this.teamObjectData = res.response // this.teamObjectData = res.response
// }) // })
}, },
async rowDetails(row) { rowDetails(row) {
//详情 //详情
this.drawer = true this.drawer = true
this.dLoading = true
// TeamAndMemberSelCondition // TeamAndMemberSelCondition
let res = await this.asc.getApiBonusDeclareGetBonusDeclareInfo({id: row.bonusdeclareid}) this.asc.getApiBonusDeclareGetBonusDeclareInfo({id: row.bonusdeclareid}).then(res => {
// let res = await api.GetCertificateInfo({id: row.certificateid}) let array = _.cloneDeep(res.response)
let array = _.cloneDeep(res.response) this.flagObject = _.cloneDeep(res.response)
this.flagObject = _.cloneDeep(res.response) this.TeamAndMemberSel()
this.TeamAndMemberSel() let keyArray = [
let keyArray = [ "competitionname",
"competitionname", "sponsor",
"sponsor", "approval_state",
"approval_state", "begin_time",
"begin_time", "end_time",
"end_time", "competitionsubitem_name",
"competitionsubitem_name", "way",
"way", "competition_type_name",
"competition_type_name", "competition_level_name",
"competition_level_name", "report_code",
"report_code", 'bonus_total'
'bonus_total' ]
] Object.keys(array).forEach((cur, index) => {
if (!keyArray.includes(cur)) delete array[cur]
Object.keys(array).forEach((cur, index) => { })
if (!keyArray.includes(cur)) delete array[cur] this.drawerKeyValueArray = Object.entries(array)
}) this.drawerKeyValueArray.map((cur, index) => {
this.drawerKeyValueArray = Object.entries(array) let data = [
this.drawerKeyValueArray.map((cur, index) => { '赛事名称',
let data = [ '主办单位',
'赛事名称', '赛事编号',
'主办单位', '赛项名称',
'赛事编号', '赛事级别',
'赛项名称', '竞赛类别',
'赛事级别', '竞赛形式',
'竞赛类别', '审批状态',
'竞赛形式', '比赛开始时间',
'审批状态', '比赛结束时间',
'比赛开始时间', "奖金总额",
'比赛结束时间',
"奖金总额",
// '证书名称',
// '证书名称', // '获奖奖金',
// '获奖奖金', // '证书描述',
// '证书描述',
// '教师证书',
// '学生证书',
// '教师证书', // '审批意见'
// '学生证书', ];
// '审批意见' cur.push(data[index])
]; })
cur.push(data[index]) this.dLoading = false
}) }).finally(() => this.dLoading = false)
}, },
rowEdit(row) { rowEdit(row) {
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<!-- 列表--> <!-- 列表-->
<cs-c-table <cs-c-table
:buttonAuzhorization="true" :buttonAuzhorization="true"
:tableColumns="init.tableColumns.filter(a => a.show)" :tableColumns="init.tableColumns.filter(a => a.show)"
:tableData="init.tableData" :tableData="init.tableData"
:tableLoading="init.tableLoading" :tableLoading="init.tableLoading"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或