提交 89cf962a authored 作者: 王鹏飞's avatar 王鹏飞

update

上级 c979a445
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<div class="buttons"> <div class="buttons">
<!-- 驳回的提交 --> <!-- 驳回的提交 -->
<el-popover placement="bottom" width="170" v-model="popoverVisible" v-if="detail.status === 1"> <el-popover placement="bottom" width="170" v-model="popoverVisible" v-if="detail.status === 1">
<p>您已完成作业,确定提交</p> <p>本次作业提交后不可修改,您确认提交吗</p>
<div style="text-align: right; margin-top: 10px"> <div style="text-align: right; margin-top: 10px">
<el-button size="mini" type="text" @click="popoverVisible = false">取消</el-button> <el-button size="mini" type="text" @click="popoverVisible = false">取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit">确定提交</el-button> <el-button type="primary" size="mini" @click="onSubmit">确定提交</el-button>
...@@ -231,6 +231,9 @@ export default { ...@@ -231,6 +231,9 @@ export default {
return this.detail.status === 0 || !this.isWorkTime return this.detail.status === 0 || !this.isWorkTime
}, },
dialogTitle() { dialogTitle() {
if (this.detail.status === 1 && this.detail.status2 === 1) {
return '作业、互评作业驳回'
}
if (this.detail.status === 1) { if (this.detail.status === 1) {
return '作业驳回' return '作业驳回'
} }
...@@ -257,7 +260,10 @@ export default { ...@@ -257,7 +260,10 @@ export default {
.getChapterHomework(this.sid, this.cid, this.resourceId) .getChapterHomework(this.sid, this.cid, this.resourceId)
.then(response => { .then(response => {
this.detail = Array.isArray(response) ? {} : response this.detail = Array.isArray(response) ? {} : response
if (this.detail.status === 1 || this.detail.status2 === 1) { if (
(this.detail.status === 1 || this.detail.status2 === 1) &&
!(this.detail.status === -1 || this.detail.status2 === -1)
) {
this.dialogVisible = true this.dialogVisible = true
} }
if (this.detail.id) { if (this.detail.id) {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div class="button"> <div class="button">
<!-- 驳回的提交 --> <!-- 驳回的提交 -->
<el-popover placement="bottom" width="170" v-model="popoverVisible" v-if="status === 1"> <el-popover placement="bottom" width="170" v-model="popoverVisible" v-if="status === 1">
<p>您已完成作业,确定提交</p> <p>本次作业提交后不可修改,您确认提交吗</p>
<div style="text-align: right; margin-top: 10px"> <div style="text-align: right; margin-top: 10px">
<el-button size="mini" type="text" @click="popoverVisible = false">取消</el-button> <el-button size="mini" type="text" @click="popoverVisible = false">取消</el-button>
<el-button type="primary" size="mini" @click="handleSubmit">确定提交</el-button> <el-button type="primary" size="mini" @click="handleSubmit">确定提交</el-button>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论