|
@@ -54,16 +54,37 @@
|
|
clearable
|
|
clearable
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item
|
|
|
|
+ v-if="checkRequiredFieldValid('teachingRoomName')"
|
|
|
|
+ prop="teachingRoomId"
|
|
|
|
+ label="开课学院:"
|
|
|
|
+ >
|
|
|
|
+ <org-select
|
|
|
|
+ v-model="modalForm.teachingRoomId"
|
|
|
|
+ placeholder="开课学院"
|
|
|
|
+ @change="teachingRoomChange"
|
|
|
|
+ ></org-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item
|
|
<el-form-item
|
|
v-if="checkRequiredFieldValid('courseCode')"
|
|
v-if="checkRequiredFieldValid('courseCode')"
|
|
prop="courseId"
|
|
prop="courseId"
|
|
label="课程:"
|
|
label="课程:"
|
|
>
|
|
>
|
|
- <course-common-select
|
|
|
|
|
|
+ <el-select
|
|
v-model="modalForm.courseId"
|
|
v-model="modalForm.courseId"
|
|
|
|
+ class="course-select"
|
|
placeholder="课程"
|
|
placeholder="课程"
|
|
- clearable
|
|
|
|
- ></course-common-select>
|
|
|
|
|
|
+ filterable
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="(item, index) in courseList"
|
|
|
|
+ :key="index"
|
|
|
|
+ :value="item.id"
|
|
|
|
+ :label="`${item.name}(${item.code})`"
|
|
|
|
+ >
|
|
|
|
+ <span>{{ `${item.name}(${item.code})` }}</span>
|
|
|
|
+ </el-option>
|
|
|
|
+ </el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item
|
|
<el-form-item
|
|
v-if="checkRequiredFieldValid('examDate')"
|
|
v-if="checkRequiredFieldValid('examDate')"
|
|
@@ -131,17 +152,6 @@
|
|
clearable
|
|
clearable
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item
|
|
|
|
- v-if="checkRequiredFieldValid('teachingRoomName')"
|
|
|
|
- prop="teachingRoomName"
|
|
|
|
- label="开课学院:"
|
|
|
|
- >
|
|
|
|
- <el-input
|
|
|
|
- v-model.trim="modalForm.teachingRoomName"
|
|
|
|
- placeholder="请输入开课学院"
|
|
|
|
- clearable
|
|
|
|
- ></el-input>
|
|
|
|
- </el-form-item>
|
|
|
|
|
|
|
|
<!-- 选填信息 -->
|
|
<!-- 选填信息 -->
|
|
<el-form-item
|
|
<el-form-item
|
|
@@ -181,7 +191,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-import { updateExamStudent, examRuleDetail } from "../api";
|
|
|
|
|
|
+import { updateExamStudent, examRuleDetail, courseQuery } from "../api";
|
|
import { getTimeDatestamp } from "@/plugins/utils";
|
|
import { getTimeDatestamp } from "@/plugins/utils";
|
|
|
|
|
|
const requiredModalForm = {
|
|
const requiredModalForm = {
|
|
@@ -196,7 +206,7 @@ const requiredModalForm = {
|
|
collegeName: "",
|
|
collegeName: "",
|
|
examRoom: "",
|
|
examRoom: "",
|
|
teachClassName: "",
|
|
teachClassName: "",
|
|
- teachingRoomName: "",
|
|
|
|
|
|
+ teachingRoomId: "",
|
|
};
|
|
};
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -317,7 +327,7 @@ export default {
|
|
trigger: "change",
|
|
trigger: "change",
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- teachingRoomName: [
|
|
|
|
|
|
+ teachingRoomId: [
|
|
{
|
|
{
|
|
required: true,
|
|
required: true,
|
|
message: "请输入开课学院",
|
|
message: "请输入开课学院",
|
|
@@ -343,6 +353,7 @@ export default {
|
|
],
|
|
],
|
|
optionalFields: [],
|
|
optionalFields: [],
|
|
extendFields: [],
|
|
extendFields: [],
|
|
|
|
+ courseList: [],
|
|
// date-picker
|
|
// date-picker
|
|
defaultTime: "",
|
|
defaultTime: "",
|
|
examSetDate: "",
|
|
examSetDate: "",
|
|
@@ -372,9 +383,11 @@ export default {
|
|
extendFieldData.forEach((item) => {
|
|
extendFieldData.forEach((item) => {
|
|
this.modalForm[item.code] = item.value;
|
|
this.modalForm[item.code] = item.value;
|
|
});
|
|
});
|
|
|
|
+ await this.getCourses();
|
|
} else {
|
|
} else {
|
|
this.modalForm = { ...this.initModalForm };
|
|
this.modalForm = { ...this.initModalForm };
|
|
this.getInitCreateTime();
|
|
this.getInitCreateTime();
|
|
|
|
+ this.courseList = [];
|
|
}
|
|
}
|
|
|
|
|
|
this.defaultTime = getTimeDatestamp(Date.now());
|
|
this.defaultTime = getTimeDatestamp(Date.now());
|
|
@@ -421,6 +434,20 @@ export default {
|
|
visibleChange() {
|
|
visibleChange() {
|
|
this.initData(this.instance);
|
|
this.initData(this.instance);
|
|
},
|
|
},
|
|
|
|
+ async teachingRoomChange() {
|
|
|
|
+ this.modalForm.courseId = "";
|
|
|
|
+ this.courseList = [];
|
|
|
|
+ await this.getCourses();
|
|
|
|
+ },
|
|
|
|
+ async getCourses() {
|
|
|
|
+ if (!this.modalForm.teachingRoomId) return;
|
|
|
|
+
|
|
|
|
+ const res = await courseQuery({
|
|
|
|
+ teachingRoomId: this.modalForm.teachingRoomId,
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ this.courseList = res.basicCourseList || [];
|
|
|
|
+ },
|
|
updateRules() {
|
|
updateRules() {
|
|
// const paperNumberRequired = this.curExam.examModel === "MODEL4";
|
|
// const paperNumberRequired = this.curExam.examModel === "MODEL4";
|
|
const rules = { ...this.requiredRules };
|
|
const rules = { ...this.requiredRules };
|