|
|
@@ -205,6 +205,20 @@
|
|
|
style="width: 200px"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="考试类型"
|
|
|
+ prop="examType"
|
|
|
+ v-if="!examDisabled"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ v-model="formMarkWork.examType"
|
|
|
+ style="width: 200px"
|
|
|
+ @change="examTypeChange()"
|
|
|
+ >
|
|
|
+ <el-option label="在线考试" value="ONLINE"> </el-option>
|
|
|
+ <el-option label="离线考试" value="OFFLINE"> </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="考试批次" prop="examIds">
|
|
|
<el-select
|
|
|
:disabled="examDisabled"
|
|
|
@@ -259,6 +273,7 @@ export default {
|
|
|
name: ""
|
|
|
},
|
|
|
formMarkWork: {
|
|
|
+ examType: "",
|
|
|
name: "",
|
|
|
examIds: [],
|
|
|
remark: ""
|
|
|
@@ -269,9 +284,17 @@ export default {
|
|
|
{
|
|
|
required: true,
|
|
|
message: "请选择考试批次",
|
|
|
- trigger: "blur,change",
|
|
|
+ trigger: "change",
|
|
|
type: "array"
|
|
|
}
|
|
|
+ ],
|
|
|
+ examType: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择考试类型",
|
|
|
+ trigger: "change",
|
|
|
+ type: "string"
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
statusList: [
|
|
|
@@ -356,6 +379,12 @@ export default {
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
+ examTypeChange() {
|
|
|
+ this.examSelect = [];
|
|
|
+ if (this.formMarkWork.examType) {
|
|
|
+ this.getExamSelect();
|
|
|
+ }
|
|
|
+ },
|
|
|
getExamSelect() {
|
|
|
var orgId = this.user.rootOrgId;
|
|
|
var examIds = this.formMarkWork.examIds;
|
|
|
@@ -365,6 +394,9 @@ export default {
|
|
|
if (examIds) {
|
|
|
params = params + "&examIds=" + examIds;
|
|
|
}
|
|
|
+ if (this.formMarkWork.examType) {
|
|
|
+ params = params + "&examType=" + this.formMarkWork.examType;
|
|
|
+ }
|
|
|
this.$http.get(DATA_PROCESS_API + "/exam/all" + params).then(response => {
|
|
|
response.data.forEach((element, index) => {
|
|
|
tempSelect[index] = {
|
|
|
@@ -466,7 +498,6 @@ export default {
|
|
|
if (this.$refs["formMarkWork"] !== undefined) {
|
|
|
this.$refs["formMarkWork"].resetFields();
|
|
|
}
|
|
|
- this.getExamSelect();
|
|
|
this.markWorkDialog = true;
|
|
|
},
|
|
|
editMarkWorkModal(row) {
|
