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

- 20240530

   - 更新文档多项...
上级 ab22331c
流水线 #26430 已通过 ,包含阶段
in 1 minute 和 20 second
...@@ -27,3 +27,4 @@ ...@@ -27,3 +27,4 @@
- 隐藏成绩申报“详情”和“表单填写”团队获奖奖项; - 隐藏成绩申报“详情”和“表单填写”团队获奖奖项;
- 师生奖励,团队成员金额为null 才通过比例自动计算成员奖金; - 师生奖励,团队成员金额为null 才通过比例自动计算成员奖金;
- 赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量; - 赛事报名、成绩申报、师生奖励,三项(待办,已办,我的)统计数量;
- 更新文档多项...
[data-v-637492aa] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-637492aa] .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-637492aa]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-637492aa]: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{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px} [data-v-7a03186c] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-7a03186c] .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-7a03186c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-7a03186c]: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{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file \ No newline at end of file
.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} .carClass[data-v-214d7e31]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-214d7e31] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-214d7e31] .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-214d7e31]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-214d7e31]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-214d7e31]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-214d7e31]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-214d7e31]:hover{transform:scale(1.2)}.container[data-v-214d7e31]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-214d7e31],.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 \ No newline at end of file
.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
.carClass[data-v-2fbc6ff0]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-2fbc6ff0] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-2fbc6ff0] .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-2fbc6ff0]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-2fbc6ff0]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-2fbc6ff0]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-2fbc6ff0]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-2fbc6ff0]:hover{transform:scale(1.2)}.container[data-v-2fbc6ff0]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-2fbc6ff0],.tableList[data-v-7466e3e0]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-7466e3e0]{border-collapse:collapse}.tableList .container1 .row[data-v-7466e3e0]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-7466e3e0]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-7466e3e0]{width:500px;height:50px;text-align:center}.Atext[data-v-7466e3e0]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-7466e3e0]{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.09317091.js></script><script src=js/app.2d970b3d.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.d17fb6d2.js></script><script src=js/app.3827dc71.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -51,13 +51,13 @@ export default { ...@@ -51,13 +51,13 @@ export default {
// }, // },
{ {
path: '/reportWorkloadAndSubsidy', path: '/reportWorkloadAndSubsidy',
title: '成绩申报', title: '成绩申报列表',
header: 'home', header: 'home',
icon: '' icon: ''
}, },
{ {
path: '/rewardForTeachersAndStudents', path: '/rewardForTeachersAndStudents',
title: '师生奖励', title: '奖励申请列表',
header: 'home', header: 'home',
icon: '' icon: ''
}, },
......
...@@ -270,10 +270,10 @@ ...@@ -270,10 +270,10 @@
<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>
<!-- </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">
...@@ -517,7 +517,7 @@ ...@@ -517,7 +517,7 @@
// key: 'sfzh' // key: 'sfzh'
// }, // },
{ {
title: '教学院系', title: '学院',
minWidth: 150, minWidth: 150,
key: 'dept' key: 'dept'
}, },
...@@ -568,7 +568,7 @@ ...@@ -568,7 +568,7 @@
// key: 'sfzh' // key: 'sfzh'
// }, // },
{ {
title: '教学院系', title: '学院',
minWidth: 150, minWidth: 150,
key: 'dept' key: 'dept'
}, },
......
...@@ -69,14 +69,17 @@ ...@@ -69,14 +69,17 @@
> >
<!-- <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 @closeModal="closeModal" @getData="getData" ref="updateCertificateModal" <updateCertificateModal @closeModal="closeModal" @isAuth="isAuth" @getData="getData"
ref="updateCertificateModal"
v-if="CertificateModal" 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 ref="load" type="primary" cs-style="width: 12vw;margin-right:10px;"
<cs-button :disabled="isAuth1 === 2" 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>
...@@ -295,7 +298,7 @@ ...@@ -295,7 +298,7 @@
key: 'sfzh' key: 'sfzh'
}, },
{ {
title: '教学院系', title: '学院',
minWidth: 150, minWidth: 150,
key: 'dept' key: 'dept'
}, },
...@@ -352,7 +355,7 @@ ...@@ -352,7 +355,7 @@
key: 'sfzh' key: 'sfzh'
}, },
{ {
title: '教学院系', title: '学院',
minWidth: 150, minWidth: 150,
key: 'dept' key: 'dept'
}, },
...@@ -402,7 +405,7 @@ ...@@ -402,7 +405,7 @@
key: 'sfzh' key: 'sfzh'
}, },
{ {
title: '教学院系', title: '学院',
minWidth: 150, minWidth: 150,
key: 'dept' key: 'dept'
}, },
...@@ -448,6 +451,7 @@ ...@@ -448,6 +451,7 @@
importModal: false, importModal: false,
importLoading: false, importLoading: false,
CertificateModal: false, CertificateModal: false,
isAuth1: 0,
init: { init: {
modal: { modal: {
...@@ -666,6 +670,10 @@ ...@@ -666,6 +670,10 @@
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
isAuth(value) {
this.isAuth1 = value
//接收师生奖励表单状态;审批通过则禁用按钮
},
closeModal() { closeModal() {
//关闭生成获奖材料modal //关闭生成获奖材料modal
this.CertificateModal = false this.CertificateModal = false
...@@ -903,6 +911,7 @@ ...@@ -903,6 +911,7 @@
this.init.tableData = res.response.data this.init.tableData = res.response.data
this.init.dataCount = res.response.data_count this.init.dataCount = res.response.data_count
this.init.tableLoading = false this.init.tableLoading = false
console.log("🚀🚀🚀,", res)
return res return res
}) })
}, },
......
...@@ -644,46 +644,6 @@ ...@@ -644,46 +644,6 @@
</div> </div>
<!--手动添加赛项列表-->
<!-- <Modal-->
<!-- v-model="selectionOfEvents"-->
<!-- title="选择编号"-->
<!-- width="60"-->
<!-- :styles="{top:'10px'}"-->
<!-- :closable="false"-->
<!-- >-->
<!-- <template #header>-->
<!-- <div style="display: flex;justify-content: space-between;align-items: center;">-->
<!-- <h3>选择编号</h3>-->
<!-- <Input style="width: 20vw" v-model="contestItem.condition"-->
<!-- placeholder="请输入编号或赛项名称、赛事名称搜索..."></Input>-->
<!-- </div>-->
<!-- </template>-->
<!-- <Table :columns="columnsCompetitionItem" :data="dataCompetitionItem" :loading="contestItem.loading">-->
<!-- <template #radio="{row}">-->
<!-- <input style="width: 30px;height: 30px;cursor: pointer;accent-color: #1e93ff" type="radio"-->
<!-- :value="row.name"-->
<!-- @click="tableRadio(row)"-->
<!-- name="name"></input>-->
<!-- </template>-->
<!-- </Table>-->
<!-- <div class="ivu-text-center ivu-mt">-->
<!-- <Page-->
<!-- :total="contestItem.total"-->
<!-- :current.sync="contestItem.pageIndex"-->
<!-- show-total-->
<!-- show-sizer-->
<!-- :page-size="contestItem.pageSize"-->
<!-- @on-change="contestItemhandleChangePage"-->
<!-- @on-page-size-change="contestItemhandleChangePageSize"-->
<!-- />-->
<!-- </div>-->
<!-- <template #footer>-->
<!-- <Button type="primary" @click="saveTheEventSingleOption" style="width: 15%;">确定</Button>-->
<!-- <Button type="text" @click="selectionOfEvents = false" style="width: 15%;">关闭</Button>-->
<!-- </template>-->
<!-- </Modal>-->
<!-- 创建 团队添加队员抽屉--> <!-- 创建 团队添加队员抽屉-->
<Drawer title="添加团队队员" width="100%" :transfer="false" :z-index="99999" <Drawer title="添加团队队员" width="100%" :transfer="false" :z-index="99999"
v-model="addTeamMembers.Drawer"> v-model="addTeamMembers.Drawer">
...@@ -733,7 +693,7 @@ ...@@ -733,7 +693,7 @@
<template #right> <template #right>
<div style="padding: 1vw;" :key="kkk"> <div style="padding: 1vw;" :key="kkk">
<Tabs> <Tabs>
<TabPane label="添加学生"> <TabPane label="添加学生" :disabled="tabsName ==1">
<div style="display: flex;"></div> <div style="display: flex;"></div>
<div <div
style="justify-content: flex-end; height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap"> style="justify-content: flex-end; height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
...@@ -961,7 +921,7 @@ ...@@ -961,7 +921,7 @@
<template #right> <template #right>
<div style="padding: 1vw" :key="kkk"> <div style="padding: 1vw" :key="kkk">
<Tabs> <Tabs>
<TabPane label="添加学生"> <TabPane label="添加学生" :disabled="tabsName == 1">
<div style="display: flex;"></div> <div style="display: flex;"></div>
<div <div
style="justify-content: flex-end; height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap"> style="justify-content: flex-end; height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
...@@ -1981,34 +1941,37 @@ ...@@ -1981,34 +1941,37 @@
}) })
}, },
async TeamAndMemberSel() { async TeamAndMemberSel() {
this.loading3 = true
await new Promise((resolve) => { if (this.signid) {
hook.getInitListRequest(() => { this.loading3 = true
let data = { await new Promise((resolve) => {
signid: this.signid, hook.getInitListRequest(() => {
} let data = {
api.TeamAndMemberSel(data).then(res => { signid: this.signid,
if (res.response) {
// 这里需要修改报错时 res.response 为[] *************************************************************** 1
this.teamObjectData = res.response
let length = res.response.length
length = length + 1
this.formValidate1.teamname = "团队" + length
this.addTeamPeople.selectArray = []
res.response.map((cur, index) => {
this.addTeamPeople.selectArray.push({
id: cur.teamid,
name: cur.teanname,
})
})
resolve()
} else if (res.response === null) {
this.formValidate1.teamname = "团队1"
} }
api.TeamAndMemberSel(data).then(res => {
if (res.response) {
// 这里需要修改报错时 res.response 为[] *************************************************************** 1
this.teamObjectData = res.response
let length = res.response.length
length = length + 1
this.formValidate1.teamname = "团队" + length
this.addTeamPeople.selectArray = []
res.response.map((cur, index) => {
this.addTeamPeople.selectArray.push({
id: cur.teamid,
name: cur.teanname,
})
})
resolve()
} else if (res.response === null) {
this.formValidate1.teamname = "团队1"
}
})
}) })
}) })
}) this.loading3 = false
this.loading3 = false }
}, },
createATeam() { createATeam() {
this.$refs['formValidate1'].validate((value) => { this.$refs['formValidate1'].validate((value) => {
......
...@@ -46,8 +46,7 @@ export default { ...@@ -46,8 +46,7 @@ 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 => { await asc.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
window.sessionStorage.setItem('aaa', JSON.stringify(res.response)); window.sessionStorage.setItem('aaa', JSON.stringify(res.response));
// this.asc++ // this.asc++
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或