dev #8

Merged
hy merged 45 commits from dev into master 2025-08-26 19:03:29 +08:00
2 changed files with 6 additions and 35 deletions
Showing only changes of commit a7c526806b - Show all commits

View File

@ -6,37 +6,8 @@
<el-form-item>
<el-input v-model="search.searchStr" placeholder="姓名/账号/学号" />
</el-form-item>
<!-- <el-form-item style="width: 100px">
<el-select
v-model="search.userType"
placeholder="用户类型"
clearable
filterable
@change="userTypeChange"
>
<el-option
v-for="item in userTypeList"
:key="item.value"
:label="item.text"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item v-show="search.userType === 1" style="width: 100px">
<el-select v-model="search.level" placeholder="学生层次" clearable filterable>
<el-option
v-for="item in userLevelList"
:key="item.value"
:label="item.text"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item v-show="search.schoolId != 0">
<el-select
v-model="search.schoolId"
placeholder="学校"
@ -54,7 +25,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px">
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-select
v-model="search.grade"
placeholder="年级"
@ -72,7 +43,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px">
<el-form-item style="width: 100px" v-show="search.schoolId != 0">
<el-select v-model="search.classId" placeholder="班级" clearable filterable>
<el-option
v-for="item in classList"

View File

@ -54,7 +54,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px">
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-select
v-model="search.grade"
placeholder="年级"
@ -72,7 +72,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px">
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-select v-model="search.classId" placeholder="班级" clearable filterable>
<el-option
v-for="item in classList"
@ -84,7 +84,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px">
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-select v-model="search.subjectId" placeholder="科目" clearable filterable>
<el-option
v-for="item in subjectList"