From 0bfd176a6ce29e88b1ec509853a451d3d66fa782 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 30 十月 2024 22:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/paper/edit.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index a5c7d8e..f02869e 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -1,16 +1,16 @@
<template>
<div class="app-container">
<el-form :model="form" ref="form" label-width="150px" v-loading="formLoading" :rules="rules">
- <el-form-item label="璇曞嵎绫诲瀷锛�" prop="paperType" required>
+ <el-form-item label="璇曞嵎绫诲瀷锛�" prop="paperType">
<el-select v-model="form.paperType" placeholder="璇曞嵎绫诲瀷">
<el-option v-for="item in paperTypeEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璇曞嵎鍚嶇О锛�" prop="name" required>
+ <el-form-item label="璇曞嵎鍚嶇О锛�" prop="name">
<el-input style="width: 300px" v-model="form.name"/>
</el-form-item>
<!-- 棰樼洰璇︾粏淇℃伅 -->
- <el-form-item :key="index" :label="'鏍囬'+(index+1)+'锛�'" required
+ <el-form-item :key="index" :label="'鏍囬'+(index+1)+'锛�'"
v-for="(titleItem,index) in form.questionTitleList"
v-show="form.paperType===1 || (form.paperType ===3 && form.id)">
<el-input v-model="titleItem.title" style="width: 50%"/>
@@ -63,7 +63,7 @@
v-show="form.deductType === 2 || form.deductType === 3" :min="0"/>
</div>
</el-form-item>
- <el-form-item label="寤鸿鏃堕暱(鍒嗛挓)锛�" prop="suggestTime" required>
+ <el-form-item label="寤鸿鏃堕暱(鍒嗛挓)锛�" prop="suggestTime">
<el-input-number v-model="form.suggestTime" placeholder="鍒嗛挓" :min="0"/>
</el-form-item>
<el-form-item label="鏉冮檺锛�" prop="visibility">
@@ -123,13 +123,13 @@
</el-form-item>
</el-form>
- <el-dialog :visible.sync="questionPage.showDialog" width="70%">
+ <el-dialog :visible.sync="questionPage.showDialog" width="70%" :close-on-click-modal="false">
<el-form :model="questionPage.queryParam" ref="queryForm" :inline="true">
<el-form-item label="ID锛�">
- <el-input v-model="questionPage.queryParam.id" clearable></el-input>
+ <el-input v-model="questionPage.queryParam.id" clearable @input="queryForm"></el-input>
</el-form-item>
<el-form-item label="瀛︾锛�">
- <el-select v-model="questionPage.queryParam.subjectIdInt" placeholder="瀛︾">
+ <el-select v-model="questionPage.queryParam.subjectIdInt" placeholder="瀛︾" @change="queryForm">
<el-option v-for="item in subjects" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
@@ -383,6 +383,7 @@
addQuestion (titleItem) {
this.currentTitleItem = titleItem
this.questionPage.queryParam.questionType = []
+ this.questionPage.queryParam.status = 1
if (!titleItem.questionType) {
this.$message({
message: '璇峰厛閫夋嫨棰樺瀷',
@@ -414,8 +415,12 @@
},
queryForm () {
this.questionPage.queryParam.pageIndex = 1
- this.questionPage.queryParam.subjectId = [this.questionPage.queryParam.subjectIdInt]
- this.search()
+ if (!this.questionPage.queryParam.subjectIdInt){
+ this.search()
+ }else{
+ this.questionPage.queryParam.subjectId = [this.questionPage.queryParam.subjectIdInt]
+ this.search()
+ }
},
confirmQuestionSelect () {
let _this = this
--
Gitblit v1.8.0