zhangjie vor 2 Jahren
Ursprung
Commit
f32624fd13

+ 14 - 0
src/modules/analysis/components/ModifyAnalysisBatch.vue

@@ -31,6 +31,12 @@
           placeholder="学期"
         ></semester-select>
       </el-form-item>
+      <el-form-item label="考试:">
+        <exam-select
+          v-model="modalForm.examId"
+          :semester-id="modalForm.semesterId"
+        ></exam-select>
+      </el-form-item>
     </el-form>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
@@ -47,6 +53,7 @@ import { updateAnalysisBatch } from "../api";
 const initModalForm = {
   id: null,
   semesterId: null,
+  examId: null,
   batchName: ""
 };
 
@@ -92,6 +99,13 @@ export default {
             message: "请选择学期",
             trigger: "change"
           }
+        ],
+        examId: [
+          {
+            required: true,
+            message: "请选择考试",
+            trigger: "change"
+          }
         ]
       }
     };

+ 5 - 3
src/modules/analysis/components/SelectAnalysisPaper.vue

@@ -12,14 +12,15 @@
   >
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="55px" inline>
-        <el-form-item label="考试:">
+        <!-- <el-form-item label="考试:">
           <exam-select
             v-model="filter.examId"
             :semester-id="filter.semesterId"
             placeholder="考试"
+            disabled
             @change="examChange"
           ></exam-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="学院:">
           <!-- <college-select
             v-model="filter.collegeId"
@@ -215,7 +216,8 @@ export default {
       this.selectedPaperIds = [];
       this.filter = Object.assign({}, initFilter, {
         batchId: this.batch.id,
-        semesterId: this.batch.semesterId
+        semesterId: this.batch.semesterId,
+        examId: this.batch.examId
       });
       this.$nextTick(() => this.changeCurListSelect());
     },