From 2b6c807e0336063b25ce751dbe7f71de4ebb38e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 20:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/student/list.vue | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 75db484..925026a 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -29,6 +29,14 @@
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
<!-- <el-table-column prop="userLevel" label="瀛︾骇" :formatter="levelFormatter"/>-->
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
+ <el-table-column label="鐝骇">
+ <template slot-scope="scope">
+ <span v-if="Array.isArray(scope.row.className) && scope.row.className.length > 0">
+ {{ scope.row.className.join(', ') }}
+ </span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�"/>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
<el-table-column label="鐘舵��" prop="status" width="70px">
@@ -56,6 +64,7 @@
>
<el-button slot="reference" type="danger" size="mini">鍒犻櫎</el-button>
</el-popconfirm>
+ <el-button size="mini" @click="resetPassword(row)" type="success" class="link-left">閲嶇疆瀵嗙爜</el-button>
</template>
</el-table-column>
</el-table>
@@ -162,7 +171,22 @@
},
statusBtnFormatter (status) {
return this.enumFormat(this.statusBtn, status)
- }
+ },
+ resetPassword(row) {
+ this.$confirm('姝ゆ搷浣滃皢閲嶇疆璇ユ垚鍛樼殑瀵嗙爜, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ userApi.resetUserPassword(row.id).then(re => {
+ if (re.code === 1) {
+ this.$message.success(re.message)
+ } else {
+ this.$message.error(re.message)
+ }
+ })
+ })
+ },
},
computed: {
...mapGetters('enumItem', [
--
Gitblit v1.8.0