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

- 20240531

    - 菜单名称,“师生奖励申请”改为“奖励申请”;
    - “师生奖励总金额”改为“奖励总额” ;
    - 更新奖励申请“详情”和“表单填写”的团队信息接口;
上级 4b4830d3
流水线 #26436 已失败 ,包含阶段
in 9 second
...@@ -29,5 +29,6 @@ ...@@ -29,5 +29,6 @@
- 赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量; - 赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量;
- 更新文档多项... - 更新文档多项...
- 20240531 - 20240531
- 菜单名称,“师生奖励申请”改为“奖励申请” - 菜单名称,“师生奖励申请”改为“奖励申请”;
- “师生奖励总金额”改为“奖励总额” - “师生奖励总金额”改为“奖励总额” ;
- 更新奖励申请“详情”和“表单填写”的团队信息接口;
.carClass[data-v-2a44cf92]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-2a44cf92] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-2a44cf92] .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-2a44cf92]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-2a44cf92]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-2a44cf92]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-2a44cf92]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-2a44cf92]:hover{transform:scale(1.2)}.container[data-v-2a44cf92]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-2a44cf92],.tableList[data-v-72322178]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-72322178]{border-collapse:collapse}.tableList .container1 .row[data-v-72322178]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-72322178]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-72322178]{width:500px;height:50px;text-align:center}.Atext[data-v-72322178]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-72322178]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.carClass[data-v-3d3a183c]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3d3a183c] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3d3a183c] .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-3d3a183c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3d3a183c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3d3a183c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3d3a183c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3d3a183c]:hover{transform:scale(1.2)}.container[data-v-3d3a183c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3d3a183c],.tableList[data-v-2f00f10e]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2f00f10e]{border-collapse:collapse}.tableList .container1 .row[data-v-2f00f10e]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2f00f10e]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2f00f10e]{width:500px;height:50px;text-align:center}.Atext[data-v-2f00f10e]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-2f00f10e]{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.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.8d3a72ec.js></script><script src=js/app.dadaf320.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.de3d1bab.js></script><script src=js/app.bd5f9c39.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
import { type AxiosRequestConfig } from "axios";
/**
* 初始化奖励显示团队和成员
* /api/Team/api/Team/BonusTeamAndMemberSel
*/
export declare function getApiTeamApiTeamBonusTeamAndMemberSel(params: GetApiTeamApiTeamBonusTeamAndMemberSelParams, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
teamid: string;
teanname: string;
is_choose: number;
hierarchy_id: string;
hierarchy_name: string;
allot_money: number;
allot_money_teacher: number;
student_list: {
teammembersid: string;
name: string;
is_tea: number;
is_lead: number;
classid: string;
classname: string;
dept: string;
dept_id: string;
createtime: string;
team_id: string;
card_name: string;
gender: string;
sfzh: string;
bonus: number;
subsidytypeid: string;
subsidytype_name: string;
subsidy_day: number;
subsidy_num: number;
instructionalscore: number;
bank: string;
bank_card: string;
bonus_ratio: number;
title_id: string;
title_name: string;
}[];
guide_teacher_list: {
teammembersid: string;
name: string;
is_tea: number;
is_lead: number;
classid: string;
classname: string;
dept: string;
dept_id: string;
createtime: string;
team_id: string;
card_name: string;
gender: string;
sfzh: string;
bonus: number;
subsidytypeid: string;
subsidytype_name: string;
subsidy_day: number;
subsidy_num: number;
instructionalscore: number;
bank: string;
bank_card: string;
bonus_ratio: number;
title_id: string;
title_name: string;
}[];
contestant_teacher_list: {
teammembersid: string;
name: string;
is_tea: number;
is_lead: number;
classid: string;
classname: string;
dept: string;
dept_id: string;
createtime: string;
team_id: string;
card_name: string;
gender: string;
sfzh: string;
bonus: number;
subsidytypeid: string;
subsidytype_name: string;
subsidy_day: number;
subsidy_num: number;
instructionalscore: number;
bank: string;
bank_card: string;
bonus_ratio: number;
title_id: string;
title_name: string;
}[];
}[];
}>;
export interface GetApiTeamApiTeamBonusTeamAndMemberSelParams {
signid?: string;
bonus_id?: string;
}
import request from "@/plugins/request";
/**
* 初始化奖励显示团队和成员
* /api/Team/api/Team/BonusTeamAndMemberSel
*/
export function getApiTeamApiTeamBonusTeamAndMemberSel(params, config) {
const paramsInput = {
signid: params.signid,
bonus_id: params.bonus_id,
};
return request.get(`/api/Team/api/Team/BonusTeamAndMemberSel`, {
params: paramsInput,
...config,
});
}
...@@ -19,3 +19,4 @@ export * from "./postApiTeamApiTeamTeamInstructionalSave"; ...@@ -19,3 +19,4 @@ export * from "./postApiTeamApiTeamTeamInstructionalSave";
export * from "./getApiTeamApiTeamTeamAndMemberSelCondition"; export * from "./getApiTeamApiTeamTeamAndMemberSelCondition";
export * from "./postApiTeamApiTeamMemberSubsidyAndInstructionalSave"; export * from "./postApiTeamApiTeamMemberSubsidyAndInstructionalSave";
export * from "./postApiTeamApiTeamMemberBankCardSave"; export * from "./postApiTeamApiTeamMemberBankCardSave";
export * from "./getApiTeamApiTeamBonusTeamAndMemberSel";
...@@ -19,3 +19,4 @@ export * from "./postApiTeamApiTeamTeamInstructionalSave"; ...@@ -19,3 +19,4 @@ export * from "./postApiTeamApiTeamTeamInstructionalSave";
export * from "./getApiTeamApiTeamTeamAndMemberSelCondition"; export * from "./getApiTeamApiTeamTeamAndMemberSelCondition";
export * from "./postApiTeamApiTeamMemberSubsidyAndInstructionalSave"; export * from "./postApiTeamApiTeamMemberSubsidyAndInstructionalSave";
export * from "./postApiTeamApiTeamMemberBankCardSave"; export * from "./postApiTeamApiTeamMemberBankCardSave";
export * from "./getApiTeamApiTeamBonusTeamAndMemberSel";
...@@ -1166,8 +1166,9 @@ ...@@ -1166,8 +1166,9 @@
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]
if (!this.teamRefreshFlagBit.money) this.asc.getApiTeamApiTeamTeamAndMemberSel({ if (!this.teamRefreshFlagBit.money) this.asc.getApiTeamApiTeamBonusTeamAndMemberSel({
signid: res.response.competitionsign_id, signid: res.response.competitionsign_id,
bonus_id: res.response.bonusdeclareid,
}).then(res => { }).then(res => {
this.teamObjectData = res.response.map((cur, index) => { this.teamObjectData = res.response.map((cur, index) => {
//遍历团队成员奖项 //遍历团队成员奖项
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<h3 style="margin-left: auto; color: #1e93ff;font-family: 楷体;font-size: 20px;">奖金总金额: <h3 style="margin-left: auto; color: #1e93ff;font-family: 楷体;font-size: 20px;">奖金总金额:
<span>{{ <span>{{
flagObject.bonus_total flagObject.bonus_total
}}</span></h3> }}</span>元</h3>
</div> </div>
<!-- 团队卡片--> <!-- 团队卡片-->
<Card style="margin:0.5vw " v-for="(item,index) in teamObjectData" :key="index"> <Card style="margin:0.5vw " v-for="(item,index) in teamObjectData" :key="index">
...@@ -776,9 +776,10 @@ ...@@ -776,9 +776,10 @@
}) })
}, },
TeamAndMemberSel() { TeamAndMemberSel() {
//团队信息 /api/Team/api/Team/TeamAndMemberSel //团队信息 /api/Team/api/Team/BonusTeamAndMemberSel
this.asc.getApiTeamApiTeamTeamAndMemberSel({ this.asc.getApiTeamApiTeamBonusTeamAndMemberSel({
signid: this.flagObject.competitionsign_id, signid: this.flagObject.competitionsign_id,
bonus_id: this.flagObject.bonusdeclareid,
}).then(res => { }).then(res => {
this.teamObjectData = res.response.map((cur, index) => { this.teamObjectData = res.response.map((cur, index) => {
//遍历团队成员奖项 //遍历团队成员奖项
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或