zhangjie пре 1 година
родитељ
комит
1519c5ca5c

+ 2 - 2
src/modules/exam/components/ApplyContent.vue

@@ -574,7 +574,7 @@ const initTaskApply = {
   // 流程
   flowId: "",
   flowStatus: "",
-  setup: 0,
+  setup: null,
   // 工作台任务id
   flowTaskId: "",
   // 题卡状态
@@ -737,6 +737,7 @@ export default {
         this.examTask.source
       );
       this.$emit("info-update", {
+        setup: data.setup,
         semesterName: data.semesterName,
         examId: data.examId,
         examName: data.examName,
@@ -751,7 +752,6 @@ export default {
       this.curTaskApply.cardRuleId = this.examTask.cardRuleId;
       this.curTaskApply.customCard = this.examTask.customCard;
       this.curTaskApply.paperNumber = this.examTask.paperNumber;
-      this.curTaskApply.setup = this.examTask.setup;
       this.curTaskApply.includePaper =
         data.printContent.indexOf("PAPER") !== -1;
       this.paperAttachments = this.curTaskApply.paperAttachmentIds

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

@@ -145,7 +145,7 @@ const initModalForm = {
   cardRuleId: "",
   cardRuleName: "",
   flowId: "",
-  setup: 0,
+  setup: null,
   userId: "",
   userName: "",
   propositionName: "",

+ 6 - 2
src/views/HomePage.vue

@@ -213,11 +213,15 @@ export default {
     async getFlowWaitTaskList() {
       const data = await waitExamTaskListPage(this.waitTaskFilter);
       const dataList = data.records.map((item) => {
-        const flowTaskName = item.taskName.replace(/\(.+?\)/g, "");
+        const flowTaskName = item.taskName
+          ? item.taskName.replace(/\(.+?\)/g, "")
+          : "";
+        let content = `试卷编号${item.paperNumber},${item.courseName}(${item.courseCode})`;
+        if (flowTaskName) content = `${flowTaskName},${content}`;
         return {
           ...item,
           type: "flow",
-          content: `${flowTaskName},试卷编号${item.paperNumber},${item.courseName}(${item.courseCode})`,
+          content,
         };
       });
       this.taskList[0] = dataList;