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

V20240226 完成学生奖励、教师奖励、学生补助、教师工作量的运行

上级 70744c9b
流水线 #24302 已通过 ,包含阶段
in 43 second
无法预览此类型文件
[data-v-d9ffc4d6] .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-d9ffc4d6]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-d9ffc4d6]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-d9ffc4d6]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-d9ffc4d6]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-d9ffc4d6]:hover{transform:scale(1.2)}.container[data-v-d9ffc4d6]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-d9ffc4d6],.tableList[data-v-2b82414e]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2b82414e]{border-collapse:collapse}.tableList .container1 .row[data-v-2b82414e]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2b82414e]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2b82414e]{width:500px;height:50px;text-align:center}.Atext[data-v-2b82414e]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-2b82414e]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-7ec43492] .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-7ec43492]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-7ec43492]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-7ec43492]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-7ec43492]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-7ec43492]:hover{transform:scale(1.2)}.container[data-v-7ec43492]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-7ec43492],.tableList[data-v-125275ca]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-125275ca]{border-collapse:collapse}.tableList .container1 .row[data-v-125275ca]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-125275ca]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-125275ca]{width:500px;height:50px;text-align:center}.Atext[data-v-125275ca]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-125275ca]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-b8ab0f08] .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-b8ab0f08]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-b8ab0f08]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-b8ab0f08]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-b8ab0f08]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-b8ab0f08]:hover{transform:scale(1.2)}.container[data-v-b8ab0f08]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-b8ab0f08],.tableList[data-v-6a77a040]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-6a77a040]{border-collapse:collapse}.tableList .container1 .row[data-v-6a77a040]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-6a77a040]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-6a77a040]{width:500px;height:50px;text-align:center}.Atext[data-v-6a77a040]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-6a77a040]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.teamCardExtraText[data-v-d7e6f2d4]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-d7e6f2d4]{height:100vh;width:100vw}.container .header[data-v-d7e6f2d4]{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-d7e6f2d4],.container .header .h_right[data-v-d7e6f2d4]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-d7e6f2d4]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-d7e6f2d4]{width:100%;height:92%;align-content:flex-start;overflow-y:auto}.container .content .tableList[data-v-d7e6f2d4],.container .content[data-v-d7e6f2d4]{display:flex;flex-wrap:wrap;justify-content:center}.container .content .tableList .container1[data-v-d7e6f2d4]{border-collapse:collapse;box-sizing:border-box;width:100%}.container .content .tableList .container1 .row[data-v-d7e6f2d4]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-d7e6f2d4]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-d7e6f2d4]{height:50px;text-align:center}.container .content .card[data-v-d7e6f2d4]{padding:5px 5px}.container .content .teamInfo[data-v-d7e6f2d4]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-d7e6f2d4]:hover{transform:scale(1.3)}.container .content .aText[data-v-d7e6f2d4]:hover{transform:scale(1.2)}.container .content .Atext[data-v-d7e6f2d4]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-d7e6f2d4]:hover{transform:scale(1.2)}
\ No newline at end of file
[data-v-2f0f9470] .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-2f0f9470]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-2f0f9470]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-2f0f9470]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-2f0f9470]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-2f0f9470]:hover{transform:scale(1.2)}.container[data-v-2f0f9470]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-2f0f9470],.tableList[data-v-589bd714]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-589bd714]{border-collapse:collapse}.tableList .container1 .row[data-v-589bd714]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-589bd714]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-589bd714]{width:500px;height:50px;text-align:center}.Atext[data-v-589bd714]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-589bd714]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-d2a14d4c] .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-d2a14d4c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-d2a14d4c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-d2a14d4c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-d2a14d4c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-d2a14d4c]:hover{transform:scale(1.2)}.container[data-v-d2a14d4c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-d2a14d4c],.tableList[data-v-21e65a28]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-21e65a28]{border-collapse:collapse}.tableList .container1 .row[data-v-21e65a28]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-21e65a28]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-21e65a28]{width:500px;height:50px;text-align:center}.Atext[data-v-21e65a28]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-21e65a28]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-389cd90b] .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-389cd90b]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-389cd90b]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-389cd90b]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-389cd90b]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-389cd90b]:hover{transform:scale(1.2)}.container[data-v-389cd90b]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-389cd90b],.tableList[data-v-3f9171f2]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-3f9171f2]{border-collapse:collapse}.tableList .container1 .row[data-v-3f9171f2]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-3f9171f2]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-3f9171f2]{width:500px;height:50px;text-align:center}.Atext[data-v-3f9171f2]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-3f9171f2]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ 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
[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)} [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-3510a927]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-3510a927]{border-collapse:collapse}.tableList .container1 .row[data-v-3510a927]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-3510a927]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-3510a927]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-3510a927]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-3510a927]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-3510a927]:hover{transform:scale(1.2)}
\ No newline at end of file \ No newline at end of file
[data-v-69d905ae] .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-69d905ae]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-69d905ae]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-69d905ae]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-69d905ae]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-69d905ae]:hover{transform:scale(1.2)}.container[data-v-69d905ae]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-69d905ae],.tableList[data-v-1e5080a3]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-1e5080a3]{border-collapse:collapse}.tableList .container1 .row[data-v-1e5080a3]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-1e5080a3]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-1e5080a3]{width:500px;height:50px;text-align:center}.Atext[data-v-1e5080a3]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-1e5080a3]{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.efbd0eca.js></script><script src=js/app.e6a8c2bc.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.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.172e122e.js></script><script src=js/app.3f82c0cd.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -87,7 +87,24 @@ Vue.prototype.getUserRole = () => { ...@@ -87,7 +87,24 @@ Vue.prototype.getUserRole = () => {
return info ? info.role[0].split('').includes('员') : false return info ? info.role[0].split('').includes('员') : false
} }
Vue.prototype.$bus = new Vue() Vue.prototype.$bus = new Vue()
Vue.prototype.buttonAuthorization = function (approvalValue, key) {
//按钮权限控制 0-未审批,1-审批中,2-审批通过,3-审批不通过
let strategy = {
'studentOrTeacherAward': () => {
//学生奖励或教师奖励 通过审批才能编辑
console.log("🚀🚀studentOrTeacherAward🚀,", approvalValue, key)
return approvalValue === 2
},
'studentGrandsOrTeacherWorkLoad': () => {
//学生补助或教师工作量 审批中或审批通过不能编辑
console.log("🚀🚀studentGrandsOrTeacherWorkLoad🚀,", approvalValue, key)
return approvalValue !== 1 && approvalValue !== 2
},
}
return strategy[key]()
}
Vue.prototype.publicState = publicState Vue.prototype.publicState = publicState
Vue.use(plugins); Vue.use(plugins);
Vue.use(ViewUI, { Vue.use(ViewUI, {
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
}, },
{ {
path: '/listOfStudentGrants', path: '/listOfStudentGrants',
title: '学生补助列表(测试)', title: '学生补助列表',
header: 'home', header: 'home',
icon: '' icon: ''
}, },
...@@ -37,18 +37,18 @@ export default { ...@@ -37,18 +37,18 @@ export default {
}, },
{ {
path: '/teacherWorkloadList', path: '/teacherWorkloadList',
title: '教师工作量列表(测试)', title: '教师工作量列表',
header: 'home', header: 'home',
icon: '' icon: ''
}, },
{ // {
path: '/listOfCollegeGrants', // path: '/listOfCollegeGrants',
title: '学院包干经费列表(测试)', // title: '学院包干经费列表(测试)',
header: 'home', // header: 'home',
icon: '', // icon: '',
auth: ['admin'], // auth: ['admin'],
//
}, // },
] ]
} }
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
}, },
{ {
path: `/5-3`, path: `/5-3`,
title: '学生补助申请(测试)', title: '学生补助申请',
children: [ children: [
// { // {
// path: `/CertificateForm?id=103&remark=Certificate&entrance=flow`, // path: `/CertificateForm?id=103&remark=Certificate&entrance=flow`,
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
}, },
{ {
path: `/5-5`, path: `/5-5`,
title: '教师工作量申请(测试)', title: '教师工作量申请',
children: [ children: [
// { // {
......
...@@ -41,11 +41,11 @@ export let config = { ...@@ -41,11 +41,11 @@ export let config = {
header: 'home', header: 'home',
}, },
{ // {
path: `${pre}-collegeBudgetBonus`, // path: `${pre}-collegeBudgetBonus`,
title: '学院预算奖金(测试)', // title: '学院预算奖金(测试)',
header: 'home', // header: 'home',
}, // },
] ]
}, },
......
...@@ -93,12 +93,21 @@ ...@@ -93,12 +93,21 @@
<!-- <a @click="importFile(row)">导出</a>--> <!-- <a @click="importFile(row)">导出</a>-->
<a @click="printFile(row)" style="margin-right: 15px;">打印</a> <a @click="printFile(row)" style="margin-right: 15px;">打印</a>
<a v-if="row.approval_state===2" @click="generateStudentOrTeacherRewards(row)" <!-- <a v-if="row.approval_state===2" @click="generateStudentOrTeacherRewards(row)"-->
style="margin-right: 15px;">{{ ['生成学生补助', '生成教师工作量'][row.competition_method] }}</a> <!-- style="margin-right: 15px;">{{ ['生成学生补助', '生成教师工作量'][row.competition_method] }}</a>-->
<!-- <a v-else-->
<!-- style="margin-right: 15px;color: #9297A1">{{-->
<!-- ['生成学生补助', '生成教师工作量'][row.competition_method]-->
<!-- }}</a>-->
<a v-if="row.approval_state===2" @click="generateStudentOrTeacherRewards(row,'0')"
style="margin-right: 15px;">生成学生补助</a>
<a v-else <a v-else
style="margin-right: 15px;color: #9297A1">{{ style="margin-right: 15px;color: #9297A1">生成学生补助</a>
['生成学生补助', '生成教师工作量'][row.competition_method] <a v-if="row.approval_state===2" @click="generateStudentOrTeacherRewards(row,'1')"
}}</a> style="margin-right: 15px;">生成教师工作量</a>
<a v-else
style="margin-right: 15px;color: #9297A1">生成教师工作量</a>
<a v-if="row.approval_state === 2" @click="generateCertificateMaterialData(row)" <a v-if="row.approval_state === 2" @click="generateCertificateMaterialData(row)"
style="margin-right: 15px;">生成获奖材料</a> style="margin-right: 15px;">生成获奖材料</a>
...@@ -568,7 +577,7 @@ export default { ...@@ -568,7 +577,7 @@ export default {
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
minWidth: 380, minWidth: 480,
fixed: 'right', fixed: 'right',
show: true, show: true,
slot: 'action' slot: 'action'
...@@ -687,11 +696,9 @@ export default { ...@@ -687,11 +696,9 @@ export default {
} }
this.searchFun() this.searchFun()
}, },
generateStudentOrTeacherRewards(row) { generateStudentOrTeacherRewards(row, key) {
//生成学生补助或教师工作量 //生成学生补助或教师工作量
this.hooks.publicConfirm(() => { let strategy = {
this.hooks.myEncapsulationFunction(() => {
let object = {
'0': () => { '0': () => {
return this.asc.getApiCompetitionSignApiCompetitionSignSignAutoInsSubsidy({id: row.competitionsignid}).then(res => { return this.asc.getApiCompetitionSignApiCompetitionSignSignAutoInsSubsidy({id: row.competitionsignid}).then(res => {
if (res.code === 1) this.getCompetitionSignList() if (res.code === 1) this.getCompetitionSignList()
...@@ -705,8 +712,9 @@ export default { ...@@ -705,8 +712,9 @@ export default {
}) })
} }
} }
return object[row.competition_method]() this.hooks.publicConfirm(() => {
this.hooks.myEncapsulationFunction(() => {
return strategy[key]()
}) })
}) })
}, },
......
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
</table> </table>
<div :style="` max-height:${unfold.height}px;overflow-y: hidden;`"> <div :style="` max-height:${unfold.height}px;overflow-y: hidden;`">
<div v-if="!!teamObjectData.length" style=" width: 100%;height: 5vh;display: flex;align-items: center;"> <div v-if="!!teamObjectData.length" style=" width: 100%;height: 5vh;display: flex;align-items: center;">
<h3>参赛团队</h3> <h3>(团队信息)获奖信息:</h3>
<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
...@@ -675,10 +675,16 @@ export default { ...@@ -675,10 +675,16 @@ export default {
// this.init.modal.cmdDetailsModalLoading = false // this.init.modal.cmdDetailsModalLoading = false
// }) // })
// if (row.approval_state === 2 || row.approval_state === 1) {
// this.$Message.warning('此项流程审批中或已审批通过,不能进行编辑!')
// } else {
// this.Id = row.bonusdeclareid
// this.CertificateModal = true
// }
this.Id = row.bonusdeclareid this.Id = row.bonusdeclareid
this.CertificateModal = true this.CertificateModal = true
}, },
rowDelete(row) { rowDelete(row) {
//删除 //删除
......
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
</table> </table>
<div :style="` max-height:${unfold.height}px;overflow-y: hidden;`"> <div :style="` max-height:${unfold.height}px;overflow-y: hidden;`">
<div v-if="!!teamObjectData.length" style=" width: 100%;height: 5vh;display: flex;align-items: center;"> <div v-if="!!teamObjectData.length" style=" width: 100%;height: 5vh;display: flex;align-items: center;">
<h3>参赛团队</h3> <h3>(团队信息)获奖信息:</h3>
<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
...@@ -677,10 +677,16 @@ export default { ...@@ -677,10 +677,16 @@ export default {
// this.init.modal.cmdDetailsModalLoading = false // this.init.modal.cmdDetailsModalLoading = false
// }) // })
// if (row.approval_state === 2 || row.approval_state === 1) {
// this.$Message.warning('此项流程审批中或已审批通过,不能进行编辑!')
// } else {
// this.Id = row.bonusdeclareid
// this.CertificateModal = true
// }
this.Id = row.bonusdeclareid this.Id = row.bonusdeclareid
this.CertificateModal = true this.CertificateModal = true
}, },
rowDelete(row) { rowDelete(row) {
//删除 //删除
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
"competitionlevel_name": "", "competitionlevel_name": "",
"competitiontype_id": "", "competitiontype_id": "",
"competitiontype_name": "", "competitiontype_name": "",
"way": '2', "way": '3',
"money": '0', "money": '0',
"is_enabled": 1, "is_enabled": 1,
"is_del": 0, "is_del": 0,
...@@ -160,14 +160,17 @@ export default { ...@@ -160,14 +160,17 @@ export default {
name: '比赛形式', name: '比赛形式',
type: 'select', type: 'select',
show: true, show: true,
optList: [{label: '个人', value: 1}, {label: '团队', value: 0}, {label: '不限', value: 2}] optList: [{label: '个人', value: 1}, {label: '团队', value: 0}, {label: '不限', value: 2}, {
label: '全部',
value: 3
}]
}, },
], ],
search: { search: {
"hierarchy_id": "", "hierarchy_id": "",
"competitionlevel_id": "", "competitionlevel_id": "",
"competitiontype_id": "", "competitiontype_id": "",
"way": 2, "way": 3,
"page_index": 1, "page_index": 1,
"page_size": 10 "page_size": 10
}, },
...@@ -245,7 +248,7 @@ export default { ...@@ -245,7 +248,7 @@ export default {
"hierarchy_id": "", "hierarchy_id": "",
"competitionlevel_id": "", "competitionlevel_id": "",
"competitiontype_id": "", "competitiontype_id": "",
"way": 2, "way": 3,
"page_index": 1, "page_index": 1,
"page_size": 10 "page_size": 10
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或