自查卷

src/api.js

@@ -420,7 +420,10 @@ export const markerSelfCheckTask = ({ workId, markerId, subject, stage }) => {
   });
 };
 export const markerSelfCheckLevel = (id, level) => {
-  return $patch(`/api/marktasks/markingSelfCheckTask`, { id, level });
+  return $post(
+    `/api/marktasks/markingSelfCheckTask?id=${id}&level=${level}`,
+    {}
+  );
 };
 
 // grading or scoring

src/assets/styles/iview-custom.less

@@ -253,3 +253,7 @@
     }
   }
 }
+// ivu-notice
+.ivu-notice {
+  left: 10px !important;
+}

src/modules/grading/GradingDetail.vue

@@ -582,6 +582,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/grading/GradingOperation.vue

@@ -546,6 +546,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/grading/leader/LeaderGrading.vue

@@ -690,6 +690,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/grading/marker/MarkerGrading.vue

@@ -562,17 +562,14 @@ export default {
       this.multiplebtnClicked = true;
       const multipleGradingListCount = this.multipleGradingList.length;
 
-      let result = true;
-      await paperSelectLevelBatch(
+      const gradeRes = await paperSelectLevelBatch(
         this.multipleGradingList.map(item => item.id).join(), // is taskId
         level.name,
         this.curSubject.stage
-      ).catch(() => {
-        result = false;
-      });
+      ).catch(() => {});
 
       this.multiplebtnClicked = false;
-      if (!result) return;
+      if (!gradeRes) return;
 
       this.multipleGradingList = [];
       // this.getStepLevels();
@@ -587,6 +584,12 @@ export default {
         this.setPage({ current: this.page.current - 1 });
       }
 
+      // 待评阶段：自查卷获取逻辑
+      if (this.IS_UNDO_STEP && gradeRes.hasSelfTask) {
+        await this.gotoSelfCheckTask();
+        return;
+      }
+
       await this.getList();
       this.selectPaper(this.curPaperIndex);
     },
@@ -715,7 +718,9 @@ export default {
         this.$refs.CarouselPapersPreview.cancel();
         this.$refs.MarkerHistory.updatePapers();
       } else {
-        this.updateStepLevel(this.curStep, level.name, 1);
+        if (!this.curPaper.isSelfCheck)
+          this.updateStepLevel(this.curStep, level.name, 1);
+
         // 待评阶段：自查卷获取逻辑
         if (this.IS_UNDO_STEP && gradeRes.hasSelfTask) {
           await this.gotoSelfCheckTask();
@@ -744,6 +749,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/mark/MarkDetail.vue

@@ -438,6 +438,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/mark/MarkOperation.vue

@@ -468,6 +468,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/mark/leader/LeaderMarking.vue

@@ -490,6 +490,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },

src/modules/mark/marker/MarkerMarking.vue

@@ -540,6 +540,7 @@ export default {
       });
     },
     selectCarouselPaper(index) {
+      this.paperKey = this.$randomCode();
       this.curCarouselPaperIndex = index;
       this.curPaper = { ...this.carouselPapers[index] };
     },