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/personalRandomTemplate/edit.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/views/exam/personalRandomTemplate/edit.vue b/src/views/exam/personalRandomTemplate/edit.vue
index 3a476d4..efa8130 100644
--- a/src/views/exam/personalRandomTemplate/edit.vue
+++ b/src/views/exam/personalRandomTemplate/edit.vue
@@ -22,7 +22,7 @@
</el-select>
</el-form-item>
- <el-form-item label="鏃堕棿闄愬埗锛�">
+ <el-form-item label="鏃堕棿闄愬埗锛�" prop="limitDateTime">
<el-date-picker v-model="form.limitDateTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
@@ -134,12 +134,17 @@
<el-dialog :visible.sync="studentDialog" width="70%">
<el-form :model="student" ref="queryForm" :inline="true">
<el-form-item label="鏍囩锛�">
- <el-select v-model="student.tagId" clearable>
+ <el-select v-model="student.tagIds" clearable multiple>
+ <el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎺掗櫎鏍囩锛�">
+ <el-select v-model="student.excludeTagIds" clearable multiple>
<el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬锛�">
- <el-select v-model="student.deptId" clearable>
+ <el-select v-model="student.deptIds" clearable multiple>
<el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
@@ -150,7 +155,7 @@
<el-table ref="multipleTable" v-loading="student.listLoading" :data="tableData" border fit highlight-current-row
style="width: 100%" @selection-change="handleSelection" row-key="id">
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
- <el-table-column prop="realName" label="鐢ㄦ埛" />
+ <el-table-column prop="realName" label="瀛﹀憳" />
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="student.pageIndex" :limit.sync="student.pageSize"
@pagination="selectStudent" />
@@ -178,14 +183,14 @@
data() {
return {
tags: [],
- depts: [],
- student: {},
studentDialog: false,
student: {
+ deptIds: [],
pageIndex: 1,
pageSize: 5,
listLoading: true,
- multipleSelection: []
+ multipleSelection: [],
+ excludeTagIds: []
},
tableData: [],
total: 0,
@@ -240,6 +245,9 @@
name: [
{ required: true, message: '璇疯緭鍏ヨ瘯鍗峰悕绉�', trigger: 'blur' }
],
+ limitDateTime: [
+ { required: true, message: '璇烽�夋嫨鏃堕棿闄愬埗', trigger: 'blur' }
+ ],
suggestTime: [
{ required: true, message: '璇疯緭鍏ュ缓璁椂闀�', trigger: 'blur' }
]
--
Gitblit v1.8.0