From 827c151dac25d873c21929b5b0ded81e82937854 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 17:27:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/student/list.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index c6b3a81..8060c00 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -4,6 +4,14 @@
<el-form-item label="鐪熷疄濮撳悕锛�">
<el-input v-model="queryParam.userName" size="small" clearable></el-input>
</el-form-item>
+ <el-form-item label="閮ㄩ棬锛�">
+ <el-cascader
+ clearable
+ v-model="queryParam.departmentId"
+ :options="depts"
+ :props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true, multiple: true }"
+ ></el-cascader>
+ </el-form-item>
<el-form-item >
<div style="display: flex">
<el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
@@ -29,9 +37,9 @@
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" width="150"/>
<el-table-column prop="deptNames" label="閮ㄩ棬" />
- <el-table-column label="鏍囩" prop="tagNames" width="80px">
+ <el-table-column label="鏍囩" prop="tagNames" align="center">
<template slot-scope="{row}">
- <el-tag style="margin: 5px;" v-for="(item,index) in row.tagNames" :key="index">{{ item }}</el-tag>
+ <el-tag v-for="item, index in row.tagNames" :key="index">{{ item }}</el-tag>
</template>
</el-table-column>
<el-table-column label="浜哄憳鐘舵��" prop="condition" align="center" width="100px">
@@ -126,12 +134,14 @@
},
data () {
return {
+ depts: [],
user:{},
statusVisible: false,
upLoadUrl:'/api/admin/user/import',
fileList:[],
queryParam: {
userName: '',
+ departmentId: [],
roles: [1],
pageIndex: 1,
pageSize: 10
@@ -162,7 +172,10 @@
}
},
created () {
- this.search()
+ this.search();
+ department.getDeptAdmins().then(res => {
+ this.depts = res.response;
+ })
},
methods: {
deptAdmin() {
--
Gitblit v1.8.0