fix: 很多bug

src/components/base/SemesterSelect.vue

@@ -6,6 +6,7 @@
     filterable
     :clearable="clearable"
     :disabled="disabled"
+    style="width: 240px"
     @change="select"
   >
     <el-option

src/modules/base/components/ModifyCourse.vue

@@ -38,6 +38,7 @@
             v-model="modalForm.teachingRoomId"
             style="width: 100%"
             placeholder="开课学院"
+            :filter-param="{ withoutPrintingRoom: true }"
           ></org-select>
         </el-form-item>
       </el-form>

src/modules/base/components/ModifyUser.vue

@@ -241,6 +241,7 @@ export default {
         this.modalForm.roleIds = val.roles.map((item) => item.id);
         this.modalForm.orgId = [val.orgId];
         this.modalForm.allowManualCard = val.allowManualCard ? 1 : 0;
+        this.modalForm.allowCourseScan = val.allowCourseScan ? 1 : 0;
       } else {
         this.modalForm = { ...initModalForm };
         this.$nextTick(() => {

src/modules/base/views/ExamStudentManage.vue

@@ -146,16 +146,6 @@
           width="55"
           align="center"
         ></el-table-column>
-        <el-table-column
-          prop="courseName"
-          label="课程名称"
-          min-width="300"
-        ></el-table-column>
-        <el-table-column
-          prop="courseCode"
-          label="课程代码"
-          width="120"
-        ></el-table-column>
         <el-table-column
           prop="studentName"
           label="姓名"
@@ -167,24 +157,14 @@
           width="140"
         ></el-table-column>
         <el-table-column
-          prop="collegeName"
-          label="学院"
-          min-width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="majorName"
-          label="专业"
-          min-width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="teachClassName"
-          label="教学班"
-          min-width="180"
+          prop="courseName"
+          label="课程名称"
+          min-width="300"
         ></el-table-column>
         <el-table-column
-          prop="className"
-          label="行政班"
-          min-width="180"
+          prop="courseCode"
+          label="课程代码"
+          width="120"
         ></el-table-column>
         <el-table-column
           prop="teachingRoomName"
@@ -201,6 +181,11 @@
           label="卷型"
           width="80"
         ></el-table-column>
+        <el-table-column prop="status" label="状态" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.status | studentStatusFilter }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="teacherName"
           label="任课老师"
@@ -211,6 +196,26 @@
           label="任课老师工号"
           width="120"
         ></el-table-column>
+        <el-table-column
+          prop="collegeName"
+          label="学院"
+          min-width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="majorName"
+          label="专业"
+          min-width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="teachClassName"
+          label="教学班"
+          min-width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="className"
+          label="行政班"
+          min-width="180"
+        ></el-table-column>
         <el-table-column
           prop="examDate"
           label="考试日期"
@@ -231,11 +236,6 @@
           label="考场（考试教室）"
           width="140"
         ></el-table-column>
-        <el-table-column prop="status" label="状态" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.status | studentStatusFilter }}
-          </template>
-        </el-table-column>
         <el-table-column
           class-name="action-column"
           label="操作"

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

@@ -579,9 +579,10 @@ export default {
       }
     },
     async getCourses() {
-      if (!this.examTask.teachingRoomId) return;
+      if (!this.examTask.teachingRoomId || !this.examTask.examId) return;
       const res = await courseQuery({
         teachingRoomId: this.examTask.teachingRoomId,
+        examId: this.examTask.examId,
       });
       const teachingCourseIds = res.teachCourseList.map((item) => item.id);
       this.courses = [
@@ -604,7 +605,11 @@ export default {
       if (!val.id) return;
       this.examTask.examModel = val.examModel;
       this.examTask.category = val.category;
-      this.clearTaskData();
+      // this.clearTaskData();
+
+      this.examTask.courseId = "";
+      this.getCourses();
+      this.courseChange();
     },
     courseChange(val) {
       if (val) {

src/modules/exam/views/ExamTaskManage.vue

@@ -3,11 +3,7 @@
     <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <secp-select
-            v-model="filter"
-            defaultSelectExam
-            @exam-default="getList"
-          ></secp-select>
+          <secp-select v-model="filter" defaultSelectExam></secp-select>
           <el-form-item label="命题状态：">
             <el-select
               v-model="filter.status"
@@ -103,13 +99,13 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column prop="semesterName" label="学期" min-width="210">
+        <!-- <el-table-column prop="semesterName" label="学期" min-width="210">
         </el-table-column>
         <el-table-column
           prop="examName"
           label="考试"
           min-width="160"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="paperNumber"
           label="试卷编号"
@@ -270,6 +266,14 @@ export default {
       pickerOptions,
     };
   },
+  watch: {
+    "filter.examId": {
+      handler(val, oldval) {
+        if (val && val !== oldval) this.toPage(1);
+      },
+      immediate: true,
+    },
+  },
   methods: {
     ...mapActions("exam", ["updateWaitTaskCount"]),
     async getList() {

src/modules/exam/views/TaskApplyManage.vue

@@ -3,11 +3,7 @@
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <secp-select
-            v-model="filter"
-            defaultSelectExam
-            @exam-default="toPage(1)"
-          ></secp-select>
+          <secp-select v-model="filter" defaultSelectExam></secp-select>
           <el-form-item label="审核状态：">
             <el-select
               v-model="filter.auditStatus"
@@ -74,7 +70,7 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="semesterName"
           label="学期"
           min-width="210"
@@ -83,7 +79,7 @@
           prop="examName"
           label="考试"
           min-width="160"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="paperNumber"
           label="试卷编号"
@@ -261,6 +257,14 @@ export default {
       pickerOptions,
     };
   },
+  watch: {
+    "filter.examId": {
+      handler(val, oldval) {
+        if (val && val !== oldval) this.toPage(1);
+      },
+      immediate: true,
+    },
+  },
   created() {
     this.initData();
   },

src/modules/exam/views/TaskPaperManage.vue

@@ -3,11 +3,7 @@
     <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <secp-select
-            v-model="filter"
-            defaultSelectExam
-            @exam-default="toPage(1)"
-          ></secp-select>
+          <secp-select v-model="filter" defaultSelectExam></secp-select>
           <el-form-item label="入库时间：">
             <el-date-picker
               v-model="createTime"
@@ -63,7 +59,7 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="semesterName"
           label="学期"
           min-width="210"
@@ -72,7 +68,7 @@
           prop="examName"
           label="考试"
           min-width="160"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="paperNumber"
           label="试卷编号"
@@ -262,6 +258,14 @@ export default {
       pickerOptions,
     };
   },
+  watch: {
+    "filter.examId": {
+      handler(val, oldval) {
+        if (val && val !== oldval) this.toPage(1);
+      },
+      immediate: true,
+    },
+  },
   mounted() {
     this.initData();
   },

src/modules/exam/views/TaskReviewManage.vue

@@ -18,11 +18,7 @@
             (!AUDITED && checkPrivilege('condition', 'notReviewCondition'))
           "
         >
-          <secp-select
-            v-model="filter"
-            defaultSelectExam
-            @exam-default="toPage(1)"
-          ></secp-select>
+          <secp-select v-model="filter" defaultSelectExam></secp-select>
           <el-form-item label="命题老师：">
             <question-teacher-select
               ref="QuestionTeacherSelect"
@@ -133,7 +129,7 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="semesterName"
           label="学期"
           min-width="210"
@@ -142,7 +138,7 @@
           prop="examName"
           label="考试"
           min-width="160"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
         <el-table-column prop="courseName" label="课程（代码）">
           <template slot-scope="scope">
@@ -318,6 +314,14 @@ export default {
       pickerOptions,
     };
   },
+  watch: {
+    "filter.examId": {
+      handler(val, oldval) {
+        if (val && val !== oldval) this.toPage(1);
+      },
+      immediate: true,
+    },
+  },
   computed: {
     AUDITED() {
       return this.auditStatus === "AUDITED";

src/modules/mark/components/ScoreCheckDetail.vue

@@ -244,30 +244,6 @@
           label="密号"
           width="120"
         ></el-table-column>
-        <el-table-column
-          prop="college"
-          label="学院"
-          min-width="160"
-          sortable
-        ></el-table-column>
-        <el-table-column
-          prop="majorName"
-          label="专业"
-          min-width="160"
-          sortable
-        ></el-table-column>
-        <el-table-column
-          prop="teachClassName"
-          label="教学班"
-          min-width="160"
-          sortable
-        ></el-table-column>
-        <el-table-column
-          prop="className"
-          label="行政班"
-          min-width="160"
-          sortable
-        ></el-table-column>
         <el-table-column
           prop="statusDisplay"
           label="状态"
@@ -294,7 +270,31 @@
         <el-table-column
           prop="subjectiveScoreList"
           label="主观题明细"
-          min-width="240"
+          min-width="300"
+        ></el-table-column>
+        <el-table-column
+          prop="college"
+          label="学院"
+          min-width="200"
+          sortable
+        ></el-table-column>
+        <el-table-column
+          prop="majorName"
+          label="专业"
+          min-width="200"
+          sortable
+        ></el-table-column>
+        <el-table-column
+          prop="teachClassName"
+          label="教学班"
+          min-width="160"
+          sortable
+        ></el-table-column>
+        <el-table-column
+          prop="className"
+          label="行政班"
+          min-width="200"
+          sortable
         ></el-table-column>
         <el-table-column prop="checkUserName" label="复核人" min-width="140">
           <span slot-scope="scope"