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

- 20240530

    - 隐藏成绩申报“详情”和“表单填写”团队获奖奖项;
    - 师生奖励,团队成员金额为null 才通过比例自动计算成员奖金;
    - 赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量;
上级 4bd0f243
流水线 #26414 已失败 ,包含阶段
in 9 second
...@@ -23,3 +23,7 @@ ...@@ -23,3 +23,7 @@
- 师生奖励审批状态为“审批通过”才显示成员奖金; - 师生奖励审批状态为“审批通过”才显示成员奖金;
- 师生奖励填写团队“可分配奖金”自动基于成员比例计算成员奖励金额; - 师生奖励填写团队“可分配奖金”自动基于成员比例计算成员奖励金额;
- 师生奖励团队成员奖励金额保留两位小数点; - 师生奖励团队成员奖励金额保留两位小数点;
- 20240530
- 隐藏成绩申报“详情”和“表单填写”团队获奖奖项;
- 师生奖励,团队成员金额为null 才通过比例自动计算成员奖金;
- 赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量;
.carClass[data-v-04ab3c11]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-04ab3c11] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-04ab3c11] .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-04ab3c11]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-04ab3c11]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-04ab3c11]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-04ab3c11]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-04ab3c11]:hover{transform:scale(1.2)}.container[data-v-04ab3c11]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-04ab3c11],.tableList[data-v-047c10e4]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-047c10e4]{border-collapse:collapse}.tableList .container1 .row[data-v-047c10e4]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-047c10e4]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-047c10e4]{width:500px;height:50px;text-align:center}.Atext[data-v-047c10e4]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-047c10e4]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff} .carClass[data-v-4dd61861]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-4dd61861] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-4dd61861] .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-4dd61861]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-4dd61861]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-4dd61861]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-4dd61861]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-4dd61861]:hover{transform:scale(1.2)}.container[data-v-4dd61861]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-4dd61861],.tableList[data-v-2748ecda]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2748ecda]{border-collapse:collapse}.tableList .container1 .row[data-v-2748ecda]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2748ecda]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2748ecda]{width:500px;height:50px;text-align:center}.Atext[data-v-2748ecda]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-2748ecda]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file \ No newline at end of file
.carClass[data-v-8c48577a]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-8c48577a] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-8c48577a] .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-8c48577a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-8c48577a]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-8c48577a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-8c48577a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-8c48577a]:hover{transform:scale(1.2)}.container[data-v-8c48577a]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-8c48577a],.tableList[data-v-784d685d]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-784d685d]{border-collapse:collapse}.tableList .container1 .row[data-v-784d685d]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-784d685d]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-784d685d]{width:500px;height:50px;text-align:center}.Atext[data-v-784d685d]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-784d685d]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff} .carClass[data-v-5dcee804]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-5dcee804] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-5dcee804] .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-5dcee804]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5dcee804]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-5dcee804]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-5dcee804]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-5dcee804]:hover{transform:scale(1.2)}.container[data-v-5dcee804]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-5dcee804],.tableList[data-v-784d685d]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-784d685d]{border-collapse:collapse}.tableList .container1 .row[data-v-784d685d]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-784d685d]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-784d685d]{width:500px;height:50px;text-align:center}.Atext[data-v-784d685d]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-784d685d]{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.341d7a69.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.8b929078.js></script><script src=js/app.25f1d9e8.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.ff4613ed.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.09317091.js></script><script src=js/app.2d970b3d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
<template> <template>
<div id="app"> <div id="app">
<router-view /> <router-view/>
</div> </div>
</template> </template>
<script> <script>
import { on, off } from 'view-design/src/utils/dom'; import {on, off} from 'view-design/src/utils/dom';
import { setMatchMedia } from 'view-design/src/utils/assist'; import {setMatchMedia} from 'view-design/src/utils/assist';
import { mapMutations } from 'vuex'; import {mapMutations} from 'vuex';
import * as api from "@api/controller/index.d.ts";
setMatchMedia(); setMatchMedia();
export default { export default {
name: 'app', name: 'app',
methods: { methods: {
...mapMutations('admin/layout', [
'setDevice'
]),
handleWindowResize () {
this.handleMatchMedia();
},
handleMatchMedia () {
const matchMedia = window.matchMedia;
if (matchMedia('(max-width: 600px)').matches) { ...mapMutations('admin/layout', [
this.setDevice('Mobile'); 'setDevice'
} else if (matchMedia('(max-width: 992px)').matches) { ]),
this.setDevice('Tablet'); handleWindowResize() {
} else { this.handleMatchMedia();
this.setDevice('Desktop'); },
} handleMatchMedia() {
} const matchMedia = window.matchMedia;
},
mounted () { if (matchMedia('(max-width: 600px)').matches) {
on(window, 'resize', this.handleWindowResize); this.setDevice('Mobile');
this.handleMatchMedia(); } else if (matchMedia('(max-width: 992px)').matches) {
}, this.setDevice('Tablet');
beforeDestroy () { } else {
off(window, 'resize', this.handleWindowResize); this.setDevice('Desktop');
} }
}
},
mounted() {
on(window, 'resize', this.handleWindowResize);
this.handleMatchMedia();
},
beforeDestroy() {
off(window, 'resize', this.handleWindowResize);
} }
}
</script> </script>
...@@ -20,14 +20,15 @@ ...@@ -20,14 +20,15 @@
:open-names="openNames" :open-names="openNames"
width="auto"> width="auto">
<template v-if="!menuCollapse" v-for="(item, index) in filterSider"> <template v-if="!menuCollapse" v-for="(item, index) in filterSider">
<i-menu-side-item :count="{a:1}" v-if="item.children === undefined || !item.children.length" :menu="item" <i-menu-side-item v-if="item.children === undefined || !item.children.length"
:menu="item"
:key="index"/> :key="index"/>
<i-menu-side-submenu v-else :menu="item" :key="index"/> <i-menu-side-submenu v-else ref="submenu" :menu="item" :count="count"/>
</template> </template>
<template v-else> <template v-else>
<Tooltip :content="tTitle(item.title)" placement="right" <Tooltip :content="tTitle(item.title)" placement="right"
v-if="item.children === undefined || !item.children.length" :key="index"> v-if="item.children === undefined || !item.children.length" :key="index">
<i-menu-side-item :count="{a:1}" :menu="item" hide-title/> <i-menu-side-item :menu="item" hide-title/>
</Tooltip> </Tooltip>
<i-menu-side-collapse v-else :menu="item" :key="index" top-level/> <i-menu-side-collapse v-else :menu="item" :key="index" top-level/>
</template> </template>
...@@ -62,6 +63,7 @@ ...@@ -62,6 +63,7 @@
data() { data() {
return { return {
count: {}, count: {},
asc: 92387,
} }
}, },
computed: { computed: {
...@@ -91,13 +93,22 @@ ...@@ -91,13 +93,22 @@
} }
}, },
mounted() { mounted() {
this.getMenuCount() this.getMenuCount()
// this.$nextTick(() =>this.getMenuCount() )
}, },
methods: { methods: {
getMenuCount() { getMenuCount() {
//获取审批三项数量 //获取审批三项数量
api.getApiFlowViewApiFlowViewGetFlowListCount().then(res => { api.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
this.count = res.response this.count = res.response
window.sessionStorage.setItem('aaa', JSON.stringify(res.response));
// this.asc++
setTimeout(() => {
this.$refs.submenu.key = new Date();
console.log("🚀🚀🚀,", this.$refs.submenu)
}, 1000)
}) })
}, },
handleUpdateMenuState() { handleUpdateMenuState() {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<MenuItem :to="menu.path" :replace="menu.replace" :target="menu.target" :name="menu.path" <MenuItem :to="menu.path" :replace="menu.replace" :target="menu.target" :name="menu.path"
@click.native="handleClick(menu.path)"> @click.native="handleClick(menu.path)">
<i-menu-side-title :menu="menu" :hide-title="hideTitle"/> <i-menu-side-title :menu="menu" :hide-title="hideTitle"/>
<!-- <div v-if="isAuth(menu.path)" class="aaa">{{ strategy(menu.path) }}</div>--> <slot name="slot"></slot>
<Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData"/> <Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData"/>
</MenuItem> </MenuItem>
</div> </div>
...@@ -19,12 +19,7 @@ ...@@ -19,12 +19,7 @@
components: {iMenuSideTitle}, components: {iMenuSideTitle},
mixins: [clickItem, menuBadge], mixins: [clickItem, menuBadge],
props: { props: {
count: {
type: Object,
default: () => {
return {}
}
},
menu: { menu: {
type: Object, type: Object,
default() { default() {
...@@ -41,21 +36,10 @@ ...@@ -41,21 +36,10 @@
timer: "", timer: "",
} }
}, },
methods: {
strategy(path) {
//基于路径获取值
},
isAuth(path) {
return path === '/flow-myFlowList' || path === '/flow-awaitDoneList' || path === '/flow-processedList' ||
path === '/flow-awaitDoneList-Certificate' || path === '/flow-processedList-Certificate' || path === '/flow-myFlowList-Certificate' ||
path === '/flow-awaitDoneList-rewardForTeachersAndStudents' || path === '/flow-processedList-rewardForTeachersAndStudents' || path === '/flow-myFlowList-rewardForTeachersAndStudents'
},
},
mounted() { mounted() {
} }
} }
</script> </script>
......
<template> <template>
<Submenu :name="menu.path"> <Submenu :name="menu.path" :key="key">
<template slot="title"> <template slot="title">
<i-menu-side-title :menu="menu" /> <i-menu-side-title :menu="menu"/>
<Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData" /> <Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData"/>
</template>
<template v-for="(item, index) in menu.children">
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index">
<template slot="slot">
<div v-if="isAuth(item.path)" class="aaa">{{ strategy(item.path) }}</div>
</template> </template>
<template v-for="(item, index) in menu.children"> </i-menu-side-item>
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index" /> <i-menu-side-submenu v-else :menu="item" :key="index"/>
<i-menu-side-submenu v-else :menu="item" :key="index" /> </template>
</template> </Submenu>
</Submenu>
</template> </template>
<script> <script>
import iMenuSideItem from './menu-item'; import iMenuSideItem from './menu-item';
import iMenuSideTitle from './menu-title'; import iMenuSideTitle from './menu-title';
import menuBadge from '../mixins/menu-badge'; import menuBadge from '../mixins/menu-badge';
import _ from "lodash";
export default { import * as api from "@api/controller/index.d.ts";
name: 'iMenuSideSubmenu',
components: { iMenuSideItem, iMenuSideTitle }, export default {
mixins: [ menuBadge ], name: 'iMenuSideSubmenu',
props: { components: {iMenuSideItem, iMenuSideTitle},
menu: { mixins: [menuBadge],
type: Object, props: {
default () { menu: {
return {} type: Object,
} default() {
} return {}
}
},
count: {
type: Object,
default() {
return {}
}
}
},
data() {
return {
data: {},
key: 123,
}
},
mounted() {
},
methods: {
returnApprovalCount(key) {
//基于key返回三项统计
return JSON.parse(window.sessionStorage.getItem('aaa')) ? JSON.parse(window.sessionStorage.getItem('aaa'))[key] : 0;
},
getMenuCount() {
//获取审批三项数量
api.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
this.data = res.response
})
},
strategy(path) {
//基于路径获取值
let strategy = {
'/flow-myFlowList': () => {
return this.count.sign_me_count
},
'/flow-awaitDoneList': () => {
return this.count.sign_wait_count
},
'/flow-processedList': () => {
return this.count.sign_already_count
},
'/flow-awaitDoneList-Certificate': () => {
return this.returnApprovalCount('certificate_wait_count')
},
'/flow-processedList-Certificate': () => {
return this.returnApprovalCount('certificate_already_count')
},
'/flow-myFlowList-Certificate': () => {
return this.returnApprovalCount('certificate_me_count')
},
'/flow-awaitDoneList-rewardForTeachersAndStudents': () => {
return this.returnApprovalCount('bonus_wait_count')
},
'/flow-processedList-rewardForTeachersAndStudents': () => {
return this.returnApprovalCount('bonus_already_count')
},
'/flow-myFlowList-rewardForTeachersAndStudents': () => {
return this.returnApprovalCount('bonus_me_count')
},
} }
}
return strategy[String(path)]()
},
isAuth(path) {
return path === '/flow-myFlowList' || path === '/flow-awaitDoneList' || path === '/flow-processedList' ||
path === '/flow-awaitDoneList-Certificate' || path === '/flow-processedList-Certificate' || path === '/flow-myFlowList-Certificate' ||
path === '/flow-awaitDoneList-rewardForTeachersAndStudents' || path === '/flow-processedList-rewardForTeachersAndStudents' || path === '/flow-myFlowList-rewardForTeachersAndStudents'
},
},
}
</script> </script>
<style>
.aaa {
float: right;
width: 50px;
height: 30px;
color: #1890ff;
background: #e6f7ff;
display: flex;
justify-content: center;
align-items: center;
border-radius: 20px;
border: 1px solid #91d5ff;
}
</style>
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
</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>-->
</template> </template>
<Table style="cursor: pointer" v-if="!!item.guide_teacher_list.length" :columns="columnsStudent2" <Table style="cursor: pointer" v-if="!!item.guide_teacher_list.length" :columns="columnsStudent2"
:data="item.guide_teacher_list"> :data="item.guide_teacher_list">
...@@ -357,9 +357,9 @@ ...@@ -357,9 +357,9 @@
位) 位)
</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>-->
</template> <!-- </template>-->
<Table style="cursor: pointer" :columns="columnsStudent3" <Table style="cursor: pointer" :columns="columnsStudent3"
:data="item.student_list"> :data="item.student_list">
......
...@@ -527,6 +527,10 @@ ...@@ -527,6 +527,10 @@
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
teamRefreshFlagBit: {
proportion: false,
money: false,
},
teamFormValidate: { teamFormValidate: {
"competitionsign_id": "", //赛事报名id "competitionsign_id": "", //赛事报名id
"bonusdeclareid": "", //奖金申请id "bonusdeclareid": "", //奖金申请id
...@@ -881,9 +885,8 @@ ...@@ -881,9 +885,8 @@
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
if (this.distributionForm === 0) { if (this.distributionForm === 0) {
cu.allot_money_teacher = cur.allot_money_teacher cu.allot_money_teacher = cur.allot_money_teacher
cu.bonus = Number(value / 100) * Number(cu.allot_money) cu.bonus = Number(Number(value / 100) * Number(cu.allot_money)).toFixed(2)
cu.bonus_ratio = Number(value) cu.bonus_ratio = Number(value)
} }
} }
return cu return cu
...@@ -891,7 +894,7 @@ ...@@ -891,7 +894,7 @@
cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => { cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => {
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
cu.allot_money_teacher = cur.allot_money_teacher cu.allot_money_teacher = cur.allot_money_teacher
cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher) cu.bonus = Number(Number(value / 100) * Number(cu.allot_money_teacher)).toFixed(2)
cu.bonus_ratio = Number(value) cu.bonus_ratio = Number(value)
} }
return cu return cu
...@@ -899,7 +902,7 @@ ...@@ -899,7 +902,7 @@
cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => { cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => {
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
cu.allot_money_teacher = cur.allot_money_teacher cu.allot_money_teacher = cur.allot_money_teacher
cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher) cu.bonus = Number(Number(value / 100) * Number(cu.allot_money_teacher)).toFixed(2)
cu.bonus_ratio = Number(value) cu.bonus_ratio = Number(value)
} }
return cu return cu
...@@ -943,6 +946,7 @@ ...@@ -943,6 +946,7 @@
}) })
}, },
'jj': () => { 'jj': () => {
if (value === 0) this.teamRefreshFlagBit.money = true
this.teamObjectData.forEach((cur, index) => { this.teamObjectData.forEach((cur, index) => {
cur.student_list.forEach((cu, inde) => { cur.student_list.forEach((cu, inde) => {
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
...@@ -959,40 +963,6 @@ ...@@ -959,40 +963,6 @@
}) })
// if (this.distributionForm === 0) {
// this.teamObjectData.forEach((cur, index) => {
// cur.student_list.forEach((cu, inde) => {
// if (cu.teammembersid === row.teammembersid) {
// if (this.distributionForm === 0)
// cu.bonus = Number(value / 100) * Number(cu.allot_money)
// }
// })
// cur.guide_teacher_list.forEach((cu, inde) => {
// if (cu.teammembersid === row.teammembersid) cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher)
//
// })
// cur.contestant_teacher_list.forEach((cu, inde) => {
// if (cu.teammembersid === row.teammembersid) cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher)
// })
// })
//
// } else {
//
// this.teamObjectData.forEach((cur, index) => {
// cur.student_list.forEach((cu, inde) => {
// if (cu.teammembersid === row.teammembersid) {
// if (this.distributionForm === 0)
// cu.bonus = value
// }
// })
// cur.guide_teacher_list.forEach((cu, inde) => {
// if (cu.teammembersid === row.teammembersid) cu.bonus = value
// })
// cur.contestant_teacher_list.forEach((cu, inde) => {
// if (cu.teammembersid === row.teammembersid) cu.bonus = value
// })
// })
// }
}, },
'ze': () => { 'ze': () => {
this.formValidate.bonus_total = value this.formValidate.bonus_total = value
...@@ -1056,7 +1026,6 @@ ...@@ -1056,7 +1026,6 @@
return res return res
}) })
}) })
}, },
teamStudentRewardsSaved(row) { teamStudentRewardsSaved(row) {
//团队 学生奖金保存 失焦保存 //团队 学生奖金保存 失焦保存
...@@ -1117,7 +1086,6 @@ ...@@ -1117,7 +1086,6 @@
}, },
TeamAndMemberSel() { TeamAndMemberSel() {
sa
this.hooks.getInitListRequest(async () => { this.hooks.getInitListRequest(async () => {
const res = await this.api.TeamAndMemberSel({signid: this.formValidate.competitionsign_id,}) const res = await this.api.TeamAndMemberSel({signid: this.formValidate.competitionsign_id,})
this.teamObjectData = res.response this.teamObjectData = res.response
...@@ -1208,7 +1176,7 @@ ...@@ -1208,7 +1176,7 @@
res.response.begin_time ? res.response.begin_time.split(' 00:00')[0] : undefined, res.response.begin_time ? res.response.begin_time.split(' 00:00')[0] : undefined,
res.response.end_time ? res.response.end_time.split(' 00:00')[0] : undefined] res.response.end_time ? res.response.end_time.split(' 00:00')[0] : undefined]
this.asc.getApiTeamApiTeamTeamAndMemberSel({ if (!this.teamRefreshFlagBit.money) this.asc.getApiTeamApiTeamTeamAndMemberSel({
signid: res.response.competitionsign_id, signid: res.response.competitionsign_id,
}).then(res => { }).then(res => {
this.teamObjectData = res.response.map((cur, index) => { this.teamObjectData = res.response.map((cur, index) => {
...@@ -1220,7 +1188,7 @@ ...@@ -1220,7 +1188,7 @@
hierarchy_name: cur.hierarchy_name, hierarchy_name: cur.hierarchy_name,
teamFlag: true, teamFlag: true,
"allot_money": cur.allot_money, "allot_money": cur.allot_money,
bonus: Number(cu.bonus) !== 0 ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2) bonus: cu.bonus !== null ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2)
} }
}) })
cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => { cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => {
...@@ -1230,7 +1198,7 @@ ...@@ -1230,7 +1198,7 @@
hierarchy_name: cur.hierarchy_name, hierarchy_name: cur.hierarchy_name,
teamFlag: true, teamFlag: true,
"allot_money_teacher": cur.allot_money_teacher, "allot_money_teacher": cur.allot_money_teacher,
bonus: Number(cu.bonus) !== 0 ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2) bonus: cu.bonus !== null ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2)
} }
}) })
cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => { cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => {
...@@ -1240,7 +1208,7 @@ ...@@ -1240,7 +1208,7 @@
hierarchy_name: cur.hierarchy_name, hierarchy_name: cur.hierarchy_name,
teamFlag: true, teamFlag: true,
"allot_money_teacher": cur.allot_money_teacher, "allot_money_teacher": cur.allot_money_teacher,
bonus: Number(cu.bonus) !== 0 ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2) bonus: cu.bonus !== null ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2)
} }
}) })
return cur return cur
...@@ -1253,7 +1221,7 @@ ...@@ -1253,7 +1221,7 @@
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
}) })
this.loading = false
return res return res
}) })
......
...@@ -270,35 +270,34 @@ ...@@ -270,35 +270,34 @@
<span style="color: #1e93ff">{{ item.student_list.length }}</span> <span style="color: #1e93ff">{{ item.student_list.length }}</span>
位)</h3> 位)</h3>
</template> </template>
<template #extra> <!-- <template #extra>-->
<div class="teamCardExtraText">{{ item.hierarchy_name }}</div> <!-- <div class="teamCardExtraText">{{ item.hierarchy_name }}</div>-->
<!-- <a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>-->
<!-- <a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>--> <!-- </template>-->
</template>
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher" <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list"> :data="item.guide_teacher_list">
<template #instructionalscore="{row}"> <template #instructionalscore="{row}">
<span v-text-color>{{ row.instructionalscore }}分</span> <span v-if="row.instructionalscore" v-text-color>{{ row.instructionalscore }}分</span>
</template> </template>
</Table> </Table>
<Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher" <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list"> :data="item.contestant_teacher_list">
<template #instructionalscore="{row}"> <template #instructionalscore="{row}">
<span v-text-color>{{ row.instructionalscore }}分</span> <span v-if="row.instructionalscore" v-text-color>{{ row.instructionalscore }}分</span>
</template> </template>
</Table> </Table>
<Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<template #subsidytype_name="{row}"> <template #subsidytype_name="{row}">
<span v-text-color>{{ row.subsidytype_name }}</span> <span v-if="row.subsidytype_name" v-text-color>{{ row.subsidytype_name }}</span>
</template> </template>
<template #subsidy_day="{row}"> <template #subsidy_day="{row}">
<span v-text-color>{{ row.subsidy_day }}天</span> <span v-if="row.subsidy_day" v-text-color>{{ row.subsidy_day }}天</span>
</template> </template>
<template #subsidy_num="{row}"> <template #subsidy_num="{row}">
<span v-text-color>{{ row.subsidy_num }}元</span> <span v-if="row.subsidy_num" v-text-color>{{ row.subsidy_num }}元</span>
</template> </template>
</Table> </Table>
</Card> </Card>
......
...@@ -10,6 +10,7 @@ import {AccountLogin, AccountRegister} from '@api/account'; ...@@ -10,6 +10,7 @@ import {AccountLogin, AccountRegister} from '@api/account';
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import {Modal} from 'view-design'; import {Modal} from 'view-design';
import {isAdmin, setAdminCompetitionRoleId} from "@/hook"; import {isAdmin, setAdminCompetitionRoleId} from "@/hook";
import * as asc from '@/api/controller/index'
export default { export default {
namespaced: true, namespaced: true,
...@@ -45,6 +46,13 @@ export default { ...@@ -45,6 +46,13 @@ export default {
Cookies.remove('admin-competition-roleId') Cookies.remove('admin-competition-roleId')
// console.log("dsadass"+res.response.access_token.token_content); // console.log("dsadass"+res.response.access_token.token_content);
// util.cookies.set('token', res.token); // util.cookies.set('token', res.token);
asc.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
window.sessionStorage.setItem('aaa', JSON.stringify(res.response));
// this.asc++
})
await api.GetTokenInfo().then(async res => { // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置 await api.GetTokenInfo().then(async res => { // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
// console.log("GetTokenInfo方法获取用户信息",res.response); // console.log("GetTokenInfo方法获取用户信息",res.response);
hooks.setAdminCompetitionRoleId(res.response.role) hooks.setAdminCompetitionRoleId(res.response.role)
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或