From 3bc00a9f9ccfad8cacc78c3fb68b6880f5522d5c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 14:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/question/edit/multiple-choice.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/exam/question/edit/multiple-choice.vue b/src/views/exam/question/edit/multiple-choice.vue
index b89ab2c..8b156c8 100644
--- a/src/views/exam/question/edit/multiple-choice.vue
+++ b/src/views/exam/question/edit/multiple-choice.vue
@@ -1,15 +1,15 @@
<template>
<div class="app-container">
<el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
- <el-form-item label="閮ㄩ棬锛�" prop="gradeLevel" required>
- <el-select v-model="form.gradeLevel" placeholder="閮ㄩ棬" @change="levelChange">
+ <el-form-item label="鎵�灞為儴闂細" prop="deptIds">
+ <el-select v-model="form.deptIds" placeholder="鎵�灞為儴闂�" multiple filterable>
<el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璇剧洰锛�" prop="subjectIds" required>
<el-select v-model="form.subjectIds" placeholder="璇剧洰" multiple
collapse-tags>
- <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
+ <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' '"></el-option>
</el-select>
</el-form-item>
<el-form-item label="棰樺共锛�" prop="title" required>
@@ -79,7 +79,7 @@
id: null,
questionType: 2,
gradeLevel: null,
-
+ deptIds: [],
title: '',
items: [
{ id: null, prefix: 'A', content: '' },
@@ -96,9 +96,9 @@
subjectFilter: null,
formLoading: false,
rules: {
- gradeLevel: [
- { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
- ],
+ // gradeLevel: [
+ // { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
+ // ],
subjectIds: [
{ required: true, message: '璇烽�夋嫨璇剧洰', trigger: 'change' }
],
@@ -228,7 +228,7 @@
id: null,
questionType: 2,
gradeLevel: null,
-
+ deptIds: [],
title: '',
items: [
{ id: null, prefix: 'A', content: '' },
--
Gitblit v1.8.0