zhangjie 1 vuosi sitten
vanhempi
commit
a89313c26e

+ 6 - 3
src/modules/card/components/CardBuildDialog.vue

@@ -99,7 +99,7 @@ export default {
       cardId: "",
       loading: false,
       modalIsShow: false,
-      paperUuid: "",
+      paperInfo: {},
     };
   },
   computed: {
@@ -140,7 +140,10 @@ export default {
       // const res = paperData;
       // 构建题卡
       try {
-        this.paperUuid = res.uuid;
+        this.paperInfo = {
+          uuid: res.uuid,
+          attachmentId: res.attachmentId,
+        };
         const paperJson = res.paperJson ? JSON.parse(res.paperJson) : {};
         const paperSimpleStruct = getPaperJsonSimpleStructInfo(paperJson);
         const elementTypePreSetInfo = {
@@ -231,7 +234,7 @@ export default {
       if (!result) return;
       this.emitResult({
         success: true,
-        data: { ...result, paperUuid: this.paperUuid },
+        data: { ...result, ...this.paperInfo },
       });
     },
     emitResult(data) {

+ 3 - 2
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -724,7 +724,7 @@ export default {
 
       if (this.IS_TIKU_TAB) {
         const attachmentValid = !this.paperAttachments.some(
-          (item) => !item.filename
+          (item) => !item.cardId
         );
         if (!attachmentValid) {
           this.$message.error("请完成试卷选择!");
@@ -830,7 +830,8 @@ export default {
         filename: this.cardBuildPresetData.paperName,
         cardId: info.id,
         cardTitle: info.title,
-        uuid: info.paperUuid,
+        uuid: info.uuid,
+        attachmentId: info.attachmentId,
       });
     },
     // exam-task-detail edit