zhangjie há 3 anos atrás
pai
commit
37eb15e0c7

+ 1 - 2
src/modules/exam/components/ModifyTaskApply.vue

@@ -271,8 +271,7 @@ export default {
       })
         .then(async () => {
           const data = await cancelOrRestartTaskApply({
-            id: this.instance.id,
-            status: "CANCEL"
+            id: this.instance.id
           }).catch(() => {});
           if (!data) return;
           this.$message.success("操作成功!");

+ 8 - 1
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -64,7 +64,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="试卷名称:">
+            <el-form-item prop="paperName" label="试卷名称:">
               <el-input
                 v-model.trim="examTask.paperName"
                 placeholder="请输入试卷名称"
@@ -267,6 +267,13 @@ export default {
             message: "请选择题卡规则",
             trigger: "change"
           }
+        ],
+        paperName: [
+          {
+            required: true,
+            message: "请输入试卷名称",
+            trigger: "change"
+          }
         ]
       },
       examTask: {},

+ 2 - 14
src/modules/exam/views/TaskApplyManage.vue

@@ -148,18 +148,7 @@
               >立即申请</el-button
             >
             <el-button
-              v-if="
-                scope.row.auditStatus === 'AUDITED' &&
-                  scope.row.reviewStatus === 'NOT_PASS' &&
-                  checkPrivilege('link', 'edit')
-              "
-              class="btn-primary"
-              type="text"
-              @click="toEdit(scope.row)"
-              >重新申请</el-button
-            >
-            <el-button
-              v-if="scope.row.setup === 0 && checkPrivilege('link', 'end')"
+              v-if="scope.row.setup === 2 && checkPrivilege('link', 'end')"
               class="btn-danger"
               type="text"
               @click="toCancel(scope.row)"
@@ -313,8 +302,7 @@ export default {
       })
         .then(async () => {
           const data = await cancelOrRestartTaskApply({
-            id: row.id,
-            status: "CANCEL"
+            id: row.id
           }).catch(() => {});
           if (!data) return;
           this.$message.success("操作成功!");