From d7bee17c1d8fdb9a2a3c0303d7c38bc74a778e31 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 16 十月 2024 10:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/student/list.vue | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 85005d9..e258c70 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -2,21 +2,32 @@
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶏細">
- <el-input v-model="queryParam.userName"></el-input>
+ <el-input v-model="queryParam.userName" @input="search"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
+ <el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
<router-link :to="{path:'/user/student/edit'}" class="link-left">
- <el-button type="primary">娣诲姞</el-button>
+ <el-button type="primary" size="small">娣诲姞</el-button>
</router-link>
+ <el-button class="link-left" type="danger" @click="exportExcel" size="small">涓嬭浇妯℃澘</el-button>
+ <el-upload
+ class="link-left"
+ style="display: inline;"
+ accept=".xls,.xlsx"
+ :multiple="false"
+ action="/api/admin/user/import"
+ :with-credentials="true"
+ :on-success="importSuccess"
+ :show-file-list="false">
+ <el-button type="success" size="small">瀵煎叆</el-button>
+ </el-upload>
</el-form-item>
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
- <el-table-column prop="userLevel" label="瀛︾骇" :formatter="levelFormatter"/>
+<!-- <el-table-column prop="userLevel" label="瀛︾骇" :formatter="levelFormatter"/>-->
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
<el-table-column prop="phone" label="鎵嬫満鍙�"/>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
@@ -71,10 +82,28 @@
this.search()
},
methods: {
+ importSuccess (response) {
+ this.$message.success(response.message);
+ this.search();
+ },
+ exportExcel () {
+ let url = '/api/admin/user/importTemplate'
+ var x = new XMLHttpRequest()
+ x.open('GET', url, true)
+ x.responseType = 'blob'
+ x.onload = function () {
+ var url = window.URL.createObjectURL(x.response)
+ var a = document.createElement('a')
+ a.href = url
+ a.download = '鐢ㄦ埛瀵煎叆妯℃澘.xlsx'
+ a.click()
+ }
+ x.send()
+ },
search () {
this.listLoading = true
userApi.getUserPageList(this.queryParam).then(data => {
- const re = data.response
+ const re = data.data
this.tableData = re.list
this.total = re.total
this.queryParam.pageIndex = re.pageNum
@@ -85,7 +114,7 @@
let _this = this
userApi.changeStatus(row.id).then(re => {
if (re.code === 1) {
- row.status = re.response
+ row.status = re.data
_this.$message.success(re.message)
} else {
_this.$message.error(re.message)
--
Gitblit v1.8.0