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

V20240305 更新教师奖励与学生奖励使用同一字段覆盖问题。六表审批中或审批通过不可删除数据

上级 59d371f4
流水线 #24413 已通过 ,包含阶段
in 30 second
[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-e8c3799a]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-e8c3799a]{border-collapse:collapse}.tableList .container1 .row[data-v-e8c3799a]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-e8c3799a]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-e8c3799a]{width:500px;height:50px;text-align:center}.Atext[data-v-e8c3799a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-e8c3799a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-01bc900d] .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-01bc900d]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-01bc900d]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-01bc900d]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-01bc900d]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-01bc900d]:hover{transform:scale(1.2)}.container[data-v-01bc900d]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-01bc900d],.tableList[data-v-4e3722d4]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-4e3722d4]{border-collapse:collapse}.tableList .container1 .row[data-v-4e3722d4]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-4e3722d4]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-4e3722d4]{width:500px;height:50px;text-align:center}.Atext[data-v-4e3722d4]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-4e3722d4]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ 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-35ad343a]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-35ad343a]{border-collapse:collapse}.tableList .container1 .row[data-v-35ad343a]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-35ad343a]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-35ad343a]{width:500px;height:50px;text-align:center}.Atext[data-v-35ad343a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-35ad343a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-ea14d41c] .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-ea14d41c]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-ea14d41c]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-ea14d41c]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-ea14d41c]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-ea14d41c]:hover{transform:scale(1.2)}.container[data-v-ea14d41c]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-ea14d41c],.tableList[data-v-c3e605e8]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-c3e605e8]{border-collapse:collapse}.tableList .container1 .row[data-v-c3e605e8]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-c3e605e8]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-c3e605e8]{width:500px;height:50px;text-align:center}.Atext[data-v-c3e605e8]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-c3e605e8]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
[data-v-5f6d4b39] .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-5f6d4b39]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5f6d4b39]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-5f6d4b39]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-5f6d4b39]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-5f6d4b39]:hover{transform:scale(1.2)}.container[data-v-5f6d4b39]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-5f6d4b39],.tableList[data-v-6544c434]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-6544c434]{border-collapse:collapse}.tableList .container1 .row[data-v-6544c434]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-6544c434]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-6544c434]{width:500px;height:50px;text-align:center}.Atext[data-v-6544c434]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-6544c434]{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.8a3a4bb4.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.778ddccc.js></script><script src=js/app.86a00a1e.js></script></body></html>
\ 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.8a3a4bb4.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.161d19fb.js></script><script src=js/app.2b867fca.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -974,12 +974,17 @@ export default {
}
},
async delCompetition(row) {
if (row.approval_state === 2 || row.approval_state === 1) {
this.$Message.warning('此项流程审批中或已审批通过,不能进行删除!')
} else {
let data = {
id: row.certificateid
}
const res = await api.CertificateDel(data)
hook.publicMessage(res)
await this.getGetCertificateList()
}
},
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
......
......@@ -702,12 +702,17 @@ export default {
},
rowDelete(row) {
//删除
if (row.approval_state === 2 || row.approval_state === 1) {
this.$Message.warning('此项流程审批中或已审批通过,不能进行删除!')
} else {
this.hooks.myEncapsulationFunction(async () => {
return this.asc.getApiSubsidyDeclareSubsidyDeclareDel({id: row.subsidydeclareid}).then(res => {
if (res.code === 1) this.getData()
return res
})
})
}
},
getData() {
//初始化
......
......@@ -691,12 +691,17 @@ export default {
},
rowDelete(row) {
//删除
if (row.approval_state === 2 || row.approval_state === 1) {
this.$Message.warning('此项流程审批中或已审批通过,不能进行删除!')
} else {
this.hooks.myEncapsulationFunction(async () => {
return this.asc.getApiBonusDeclareBonusDeclareDel({id: row.bonusdeclareid, is_del: 1}).then(res => {
this.getData()
return res
})
})
}
},
getData() {
//初始化
......
......@@ -694,12 +694,15 @@ export default {
},
rowDelete(row) {
//删除
this.hooks.myEncapsulationFunction(async () => {
if (row.approval_state === 2 || row.approval_state === 1) {
this.$Message.warning('此项流程审批中或已审批通过,不能进行删除!')
} else this.hooks.myEncapsulationFunction(async () => {
return this.asc.getApiBonusDeclareBonusDeclareDel({id: row.bonusdeclareid, is_del: 1}).then(res => {
this.getData()
return res
})
})
},
getData() {
//初始化
......
......@@ -692,12 +692,15 @@ export default {
},
rowDelete(row) {
//删除
this.hooks.myEncapsulationFunction(async () => {
if (row.approval_state === 2 || row.approval_state === 1) {
this.$Message.warning('此项流程审批中或已审批通过,不能进行删除!')
} else this.hooks.myEncapsulationFunction(async () => {
return this.asc.getApiWorkloadDeclareWorkloadDeclareDel({id: row.workloaddeclareid}).then(res => {
this.getData()
return res
})
})
},
getData() {
//初始化
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或