From 06325747422d00658f1dd4277cc2dd6f123321b3 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 17 五月 2024 09:32:54 +0800
Subject: [PATCH] Merge branch 'dev-zhang'
---
src/views/exam/paper/edit.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index a3b03fd..b6542b6 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -12,6 +12,11 @@
:label="item.name+' '"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="閮ㄩ棬锛�" prop="deptId" required>
+ <el-select v-model="form.deptId" collapse-tags placeholder="閮ㄩ棬">
+ <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="璇曞嵎绫诲瀷锛�" prop="paperType" required>
<el-select v-model="form.paperType" placeholder="璇曞嵎绫诲瀷" @visible-change="subjectIdEvent">
<el-option v-for="item in paperTypeEnum" :key="item.key" :value="item.key" :label="item.value" ></el-option>
@@ -135,6 +140,7 @@
components: { Pagination, QuestionShow },
data () {
return {
+ depts: [],
props: {
multiple: true
// lazy: true,
@@ -177,6 +183,9 @@
],
subjectId: [
{ required: true, message: '璇烽�夋嫨璇剧洰', trigger: 'change' }
+ ],
+ deptId: [
+ { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
],
paperType: [
{ required: true, message: '璇烽�夋嫨璇曞嵎绫诲瀷', trigger: 'change' }
@@ -224,6 +233,9 @@
console.log("res",res);
_this.options = res.response.map(x=>{return{value:x.department.id,label:x.department.name,children:x.userList.map(xx=>{return{value: xx.id,label: xx.realName}})}})
+ })
+ departmentApi.getDeptAdmins().then(res => {
+ this.depts = res.response
})
},
methods: {
@@ -340,6 +352,7 @@
})
},
addQuestion (titleItem) {
+ console.log('titleItem', titleItem)
this.currentTitleItem = titleItem
this.questionPage.showDialog = true
this.search()
@@ -358,7 +371,9 @@
let _this = this
this.questionPage.multipleSelection.forEach(q => {
questionApi.select(q.id).then(re => {
- _this.currentTitleItem.questionItems.push(re.response)
+ if (!_this.currentTitleItem.questionItems.some(obj => obj.id === re.response.id)) {
+ _this.currentTitleItem.questionItems.push(re.response)
+ }
})
})
this.questionPage.showDialog = false
--
Gitblit v1.8.0