zhangjie 5 年之前
父節點
當前提交
9ce6f7c5cf

+ 3 - 0
src/modules/exam-center/api.js

@@ -94,6 +94,9 @@ export const changeCardStatus = ({ cardId, cardStatus }) => {
 export const printTaskListPage = datas => {
   return $get("/api/print/exam/exam/listPrintPage", datas);
 };
+export const printRevokeAudit = examId => {
+  return $post("/api/print/exam/exam/revokeAudit", { examId });
+};
 
 // card-audit
 export const auditListPage = datas => {

+ 1 - 0
src/modules/exam-center/components/CardOptionDialog.vue

@@ -148,6 +148,7 @@ export default {
     },
     async getCardList() {
       const data = await cardList({
+        taskId: this.modalForm.taskId,
         courseNameCode: this.modalForm.courseNameCode,
         enablePaperType: this.modalForm.enablePaperType
       });

+ 4 - 0
src/modules/exam-center/components/UploadSamplePaperDialog.vue

@@ -74,6 +74,8 @@ export default {
       modalForm: {
         title: "",
         cardSource: "2",
+        courseName: "",
+        courseCode: "",
         paperAttachmentId: ""
       },
       rules: {
@@ -107,6 +109,8 @@ export default {
     visibleChange() {
       this.modalForm.title = "";
       this.modalForm.cardSource = this.data.cardSource;
+      this.modalForm.courseName = this.data.courseName;
+      this.modalForm.courseCode = this.data.courseCode;
       this.modalForm.paperAttachmentId = "";
     },
     uplaodError(msg) {

+ 1 - 1
src/modules/exam-center/views/DoneTask.vue

@@ -35,7 +35,7 @@
         <el-table-column prop="cardStatus" label="答题卡"></el-table-column>
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column prop="printStatus" label="印刷状态"></el-table-column>
-        <el-table-column prop="revokeStatus" label="撤回状态"></el-table-column>
+        <el-table-column prop="cancelStatus" label="撤回状态"></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button

+ 6 - 5
src/modules/exam-center/views/PrintManage.vue

@@ -69,7 +69,7 @@
               icon="icon icon-confirm"
               @click="toConfirm(scope.row)"
               title="确认"
-              v-if="scope.row.revokeStatus === 0"
+              v-if="scope.row.revokeStatus === '0'"
             ></el-button>
           </template>
         </el-table-column>
@@ -91,7 +91,7 @@
 
 <script>
 import { REVOKE_STATUS } from "@/constants/enumerate";
-import { printTaskListPage, examList } from "../api";
+import { printTaskListPage, examList, printRevokeAudit } from "../api";
 
 export default {
   name: "exam-manage",
@@ -150,9 +150,10 @@ export default {
         };
       });
     },
-    toConfirm(row) {
-      // TODO:
-      console.log(row);
+    async toConfirm(row) {
+      await printRevokeAudit(row.id);
+      this.$message.success("确认成功!");
+      this.getList();
     }
   },
   beforeDestroy() {

+ 1 - 1
src/modules/exam-center/views/WaitTaskDetail.vue

@@ -237,7 +237,7 @@ export default {
         return;
       }
 
-      if (!this.task.cardId) {
+      if (!this.task.cardId && !this.task.refCardId) {
         this.$message.error("请选择题卡创建方式!");
         return;
       }