somemd

src/modules/base/components/MergePushDialog.vue

@@ -39,6 +39,7 @@
           v-model.trim="modalForm.thirdRelateId"
           placeholder="请输入考试ID"
           clearable
+          @input="thirdRelateIdChange"
         ></el-input>
       </el-form-item>
       <el-form-item label="考试名称：">
@@ -46,6 +47,7 @@
           v-model.trim="modalForm.thirdRelateName"
           placeholder="请输入考试名称"
           clearable
+          :disabled="!canEditThirdRelateName"
         ></el-input>
       </el-form-item>
       <el-form-item prop="thirdRelate"></el-form-item>
@@ -65,8 +67,8 @@
           style="width:100%"
         >
           <el-option
-            v-for="item in exams"
-            :key="item.thirdRelateId"
+            v-for="(item, index) in exams"
+            :key="index"
             :value="item.thirdRelateId"
             :label="item.thirdRelateName"
           >
@@ -126,6 +128,7 @@ export default {
       modalIsShow: false,
       isSubmit: false,
       exams: [],
+      canEditThirdRelateName: true,
       modalForm: { ...initModalForm },
       rules: {
         thirdRelate: [
@@ -152,9 +155,6 @@ export default {
       }
     };
   },
-  created() {
-    this.getExamList();
-  },
   methods: {
     initData(val) {
       this.modalForm = { ...initModalForm };
@@ -164,11 +164,24 @@ export default {
     },
     visibleChange() {
       this.initData(this.instance);
+      this.getExamList();
     },
     async getExamList() {
       const data = await printPlanSyncExamList();
       this.exams = data || [];
     },
+    thirdRelateIdChange() {
+      const exam = this.exams.find(
+        exam => this.modalForm.thirdRelateId === exam.thirdRelateId
+      );
+      if (!exam) {
+        this.modalForm.thirdRelateName = "";
+        this.canEditThirdRelateName = true;
+        return;
+      }
+      this.modalForm.thirdRelateName = exam.thirdRelateName;
+      this.canEditThirdRelateName = false;
+    },
     selectMenu(val) {
       this.examType = val;
       this.modalForm = { ...initModalForm };

src/modules/exam/components/PublishPrintTask.vue

@@ -101,7 +101,7 @@
             class="btn-danger"
             type="text"
             @click="toDelete(scope.row)"
-            >删除</el-button
+            >取消</el-button
           >
           <el-button
             v-if="scope.row.status === 'WAITING'"
@@ -358,13 +358,13 @@ export default {
       this.getList();
     },
     async toDelete(row) {
-      const result = await this.$confirm(`确定要删除当前卷袋吗?`, "提示", {
+      const result = await this.$confirm(`确定要取消当前卷袋吗?`, "提示", {
         type: "warning"
       }).catch(() => {});
       if (result !== "confirm") return;
 
       await removeTaskPrint(row.id);
-      this.$message.success("删除成功！");
+      this.$message.success("取消成功！");
       this.getList();
     }
   }

src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -80,7 +80,7 @@
               class="btn-danger"
               type="text"
               @click="toDelete(scope.row)"
-              >删除</el-button
+              >取消</el-button
             >
           </template>
         </el-table-column>

src/modules/exam/views/StatisticsManage.vue

@@ -92,6 +92,11 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
+        <el-table-column prop="collegeName" label="开课学院"></el-table-column>
+        <el-table-column
+          prop="teachingRoomName"
+          label="开课部门"
+        ></el-table-column>
         <el-table-column prop="courseCode" label="课程代码"></el-table-column>
         <el-table-column prop="courseName" label="课程名称"></el-table-column>
         <el-table-column prop="teacherName" label="任课老师"></el-table-column>