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

- 20241111 重新发起教师流程》提交flowid 更换为110

上级 82fc2a36
流水线 #30783 已通过 ,包含阶段
in 53 second
.carClass[data-v-3a85aaaf]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3a85aaaf] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3a85aaaf] .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-3a85aaaf]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3a85aaaf]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3a85aaaf]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3a85aaaf]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3a85aaaf]:hover{transform:scale(1.2)}.container[data-v-3a85aaaf]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3a85aaaf],.tableList[data-v-f8bae4c2]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-f8bae4c2]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-f8bae4c2]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-f8bae4c2]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-f8bae4c2]{width:500px;height:50px;text-align:center}.Atext[data-v-f8bae4c2]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-f8bae4c2]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-f8bae4c2]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-f8bae4c2] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
.carClass[data-v-3a85aaaf]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3a85aaaf] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3a85aaaf] .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-3a85aaaf]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3a85aaaf]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3a85aaaf]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3a85aaaf]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3a85aaaf]:hover{transform:scale(1.2)}.container[data-v-3a85aaaf]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3a85aaaf],.tableList[data-v-2bef6ed6]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-2bef6ed6]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-2bef6ed6]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-2bef6ed6]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-2bef6ed6]{width:500px;height:50px;text-align:center}.Atext[data-v-2bef6ed6]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-2bef6ed6]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-2bef6ed6]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-2bef6ed6] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
[data-v-24dca222] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-24dca222] .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-24dca222]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-24dca222]:hover{color:red;transform:scale(1.5)}[data-v-51f50c9d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-51f50c9d] .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-51f50c9d]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-51f50c9d]: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-4456a0fa]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-4456a0fa]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-4456a0fa]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-4456a0fa]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-4456a0fa]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-4456a0fa]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-4456a0fa]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-4456a0fa]:hover{transform:scale(1.2)}.carClass[data-v-4456a0fa]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-4456a0fa] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
[data-v-38edba32] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-38edba32] .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-38edba32]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-38edba32]:hover{color:red;transform:scale(1.5)}[data-v-51f50c9d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-51f50c9d] .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-51f50c9d]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-51f50c9d]: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-4456a0fa]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-4456a0fa]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-4456a0fa]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-4456a0fa]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-4456a0fa]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-4456a0fa]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-4456a0fa]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-4456a0fa]:hover{transform:scale(1.2)}.carClass[data-v-4456a0fa]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-4456a0fa] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ 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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.db0ab0a4.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~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.1e0ef582.js></script><script src=js/app~748942c6.1ed97cb3.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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.db0ab0a4.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~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.1d0b9717.js></script><script src=js/app~748942c6.f2778e32.js></script></body></html>
\ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
......@@ -2137,7 +2137,7 @@
clearTimeout(this.timer)
this.timer = setTimeout(async () => {
await this.hooks.myEncapsulationFunction(async () => {
this.formValidate.flowid = 102
this.formValidate.flowid = 110
let data = _.cloneDeep(this.formValidate)
// 存在 runid 则是重新发起新流程
if (this.runId) data.runid = this.runId
......
......@@ -1212,7 +1212,6 @@
return new Promise(resolve => {
return resolve({code: 1})
})
})
}, true, '正在导出中...'),
'competitionScoreExport': () => this.hooks.myEncapsulationFunction(() => {
......
......@@ -7,11 +7,11 @@
<!-- 搜索框-->
<cs-search-cond-form
ref="search"
:searchCondList="searchCondList"
:labelWidth="120"
@onSubmit="cssearch"
@onReset="csreset"
:params="init"
:searchCondList="searchCondList"
@onReset="csreset"
@onSubmit="cssearch"
></cs-search-cond-form>
</div>
</template>
......@@ -22,16 +22,16 @@
>
<template #title="{row}">
<Ellipsis :text="row.title || ''" :length="20" tooltip :transfer="true"/>
<Ellipsis :length="20" :text="row.title || ''" :transfer="true" tooltip/>
</template>
<template #flow_name="{row}">
<Ellipsis :text="row.flow_name || ''" :length="20" tooltip :transfer="true"/>
<Ellipsis :length="20" :text="row.flow_name || ''" :transfer="true" tooltip/>
</template>
<template #todo="{row}">
<Ellipsis :text="row.todo || ''" :length="20" tooltip :transfer="true"/>
<Ellipsis :length="20" :text="row.todo || ''" :transfer="true" tooltip/>
</template>
<template #partcipant="{row}">
<Ellipsis :text="row.partcipant || ''" :length="20" tooltip :transfer="true"/>
<Ellipsis :length="20" :text="row.partcipant || ''" :transfer="true" tooltip/>
</template>
<template v-slot:status="{row}">
{{ ['草稿', '运行中', '已结束'][row.status] }}
......@@ -41,23 +41,23 @@
{{ publicState.completeFlow.action_type[row.action_type] }}
</Tag>
</template>
<template slot-scope="{ row }" slot="action">
<a :key="cancelKey" v-if="row.status === 2" class="cancel" style="margin-right: 15px;">取消</a>
<a :key="cancelKey" v-else @click="flowCancel(row)" style="margin-right: 15px;color: red">取消</a>
<template slot="action" slot-scope="{ row }">
<a v-if="row.status === 2" :key="cancelKey" class="cancel" style="margin-right: 15px;">取消</a>
<a v-else :key="cancelKey" style="margin-right: 15px;color: red" @click="flowCancel(row)">取消</a>
<a @click="approvalLisFun(row)">详细</a>
<a :key="cancelKey+'1'" v-if="row.action_type !== 6" class="cancel"
<a v-if="row.action_type !== 6" :key="cancelKey+'1'" class="cancel"
style="margin-left: 15px;">重新发起流程</a>
<a :key="cancelKey+'1'" v-else @click="reinitiateTheProcess(row)" style="margin-left: 15px;">重新发起流程</a>
<a v-else :key="cancelKey+'1'" style="margin-left: 15px;" @click="reinitiateTheProcess(row)">重新发起流程</a>
</template>
</Table>
<div style="height: 60px;display: flex;align-items: center;">
<Page
:current="init.page_index"
:total="init.total"
:modelValue="init.page_index"
show-total
show-sizer
:page-size="init.page_size"
:total="init.total"
show-sizer
show-total
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
......@@ -76,9 +76,9 @@
v-if="eventApplication.teacher.add.show"
ref="teacherCompetitionApplication"
:formId="eventApplication.teacher.add.form_id"
:runId="eventApplication.teacher.add.runId"
@closeModal="()=>eventApplication.teacher.add.show = false"
@getData="GetFlowTaskList"
:runId="eventApplication.teacher.add.runId"
></teacherCompetitionApplication>
</div>
<template #footer>
......@@ -109,9 +109,9 @@
<teacherCompetitionAdjustment
v-if="eventApplication.teacher.edit.show" ref="teacherCompetitionAdjustment"
:formId="eventApplication.teacher.edit.form_id"
:runId="eventApplication.teacher.edit.runId"
@closeModal="()=>eventApplication.teacher.edit.show = false"
@getData="GetFlowTaskList"
:runId="eventApplication.teacher.edit.runId"
></teacherCompetitionAdjustment>
</div>
<template #footer>
......@@ -141,9 +141,9 @@
<studentCompetitionApplication
v-if="eventApplication.student.add.show" ref="studentCompetitionApplication"
:formId="eventApplication.student.add.form_id"
:runId="eventApplication.student.add.runId"
@closeModal="()=>eventApplication.student.add.show = false"
@getData="GetFlowTaskList"
:runId="eventApplication.student.add.runId"
></studentCompetitionApplication>
</div>
<template #footer>
......@@ -174,9 +174,9 @@
<studentCompetitionAdjustment
v-if="eventApplication.student.edit.show" ref="studentCompetitionAdjustment"
:formId="eventApplication.student.edit.form_id"
:runId="eventApplication.student.edit.runId"
@closeModal="()=>eventApplication.student.edit.show = false"
@getData="GetFlowTaskList"
:runId="eventApplication.student.edit.runId"
></studentCompetitionAdjustment>
</div>
<template #footer>
......@@ -200,18 +200,19 @@
<!-- 赛事报名-->
<Modal
v-model="sign.updateSignModal"
:styles="{top:'10px'}"
title="修改"
width="75"
:styles="{top:'10px'}"
>
<div style=" display: flex;justify-content: space-around;">
<UpdateSignModal v-if="sign.updateSignModal && sign.signFlag === 1" @GetSignList="GetFlowTaskList"
@resultValue="resultValue"
:signId="sign.signId" :runId="sign.runId"></UpdateSignModal>
<UpdateSignModalStudentSIgn v-if="sign.updateSignModal && sign.signFlag === 0" @GetSignList="GetFlowTaskList"
@resultValue="resultValue"
:signId="sign.signId" :runId="sign.runId"></UpdateSignModalStudentSIgn>
<UpdateSignModal v-if="sign.updateSignModal && sign.signFlag === 1" :runId="sign.runId"
:signId="sign.signId"
@GetSignList="GetFlowTaskList" @resultValue="resultValue"></UpdateSignModal>
<UpdateSignModalStudentSIgn v-if="sign.updateSignModal && sign.signFlag === 0" :runId="sign.runId"
:signId="sign.signId"
@GetSignList="GetFlowTaskList"
@resultValue="resultValue"></UpdateSignModalStudentSIgn>
</div>
<template #footer>
......@@ -221,25 +222,25 @@
<!--成绩申报-->
<Modal
v-model="report.CertificateModal"
:styles="{top:'10px'}"
title="修改"
width="70"
:styles="{top:'10px'}"
>
<div style=" display: flex;justify-content: space-around;">
<updateCertificateModal
@getData="GetFlowTaskList"
@closeModal="closeModal"
ref="updateCertificateModal"
v-if="report.CertificateModal"
:winningMaterialId="report.form_id"
ref="updateCertificateModal"
:runId="report.runId"
:winningMaterialId="report.form_id"
@closeModal="closeModal"
@getData="GetFlowTaskList"
></updateCertificateModal>
</div>
<template #footer>
<div style="display: flex;justify-content: center">
<Button type="primary" @click="handleSubmit" style="width: 12vw">提交流程</Button>
<Button type="primary" @click="save" style="width: 12vw">保存</Button>
<Button @click="handleReset" style="margin-left: 8px;width: 12vw;">重置</Button>
<Button style="width: 12vw" type="primary" @click="handleSubmit">提交流程</Button>
<Button style="width: 12vw" type="primary" @click="save">保存</Button>
<Button style="margin-left: 8px;width: 12vw;" @click="handleReset">重置</Button>
</div>
</template>
</Modal>
......@@ -253,11 +254,11 @@
<div style=" display: flex;justify-content: space-around;">
<updateRewardForTeachersAndStudents
v-if="rewards.CertificateModal" ref="updateRewardForTeachersAndStudents"
:runId="rewards.runId"
:winningMaterialId="rewards.form_id"
@closeModal="closeModal"
@getData="GetFlowTaskList"
@isAuth="isAuth"
:runId="rewards.runId"
></updateRewardForTeachersAndStudents>
</div>
<template #footer>
......@@ -1450,7 +1451,8 @@
cursor: not-allowed;
color: #c5c8ce
}
.signModelWidth{
.signModelWidth {
width: 80%;
}
</style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或