|
@@ -41,7 +41,7 @@
|
|
|
</el-button>
|
|
</el-button>
|
|
|
</template>
|
|
</template>
|
|
|
<!-- 用户名列 -->
|
|
<!-- 用户名列 -->
|
|
|
-<!-- <template v-slot:nickname="{ row }">
|
|
|
|
|
|
|
+ <!-- <template v-slot:nickname="{ row }">
|
|
|
<router-link :to="'/system/user/details?id=' + row.userId">
|
|
<router-link :to="'/system/user/details?id=' + row.userId">
|
|
|
{{ row.nickname }}
|
|
{{ row.nickname }}
|
|
|
</router-link>
|
|
</router-link>
|
|
@@ -49,7 +49,7 @@
|
|
|
<!-- 角色列 -->
|
|
<!-- 角色列 -->
|
|
|
<template v-slot:roleList="{ row }">
|
|
<template v-slot:roleList="{ row }">
|
|
|
<el-tag
|
|
<el-tag
|
|
|
- v-for="(item,index) in row.roleList"
|
|
|
|
|
|
|
+ v-for="item in row.roleList"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="primary"
|
|
type="primary"
|
|
@@ -127,7 +127,7 @@
|
|
|
UserEdit,
|
|
UserEdit,
|
|
|
UserImport
|
|
UserImport
|
|
|
},
|
|
},
|
|
|
- data() {
|
|
|
|
|
|
|
+ data () {
|
|
|
return {
|
|
return {
|
|
|
// 表格列配置
|
|
// 表格列配置
|
|
|
columns: [
|
|
columns: [
|
|
@@ -202,13 +202,13 @@
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
/* 表格数据源 */
|
|
/* 表格数据源 */
|
|
|
- datasource({ page, limit, where, order }) {
|
|
|
|
|
- return pageUsers({ ...where, ...order, pageNum:page, size:limit });
|
|
|
|
|
|
|
+ datasource ({ page, limit, where, order }) {
|
|
|
|
|
+ return pageUsers({ ...where, ...order, pageNum: page, size: limit });
|
|
|
},
|
|
},
|
|
|
- async changeEnable(row) {
|
|
|
|
|
- let params = {...row}
|
|
|
|
|
- params.roleId = row.roleList.map((d) => d.id)
|
|
|
|
|
- delete params.roleList
|
|
|
|
|
|
|
+ async changeEnable (row) {
|
|
|
|
|
+ let params = { ...row };
|
|
|
|
|
+ params.roleId = row.roleList.map((d) => d.id);
|
|
|
|
|
+ delete params.roleList;
|
|
|
const res = await putUsers(params);
|
|
const res = await putUsers(params);
|
|
|
if (res.code == 0) {
|
|
if (res.code == 0) {
|
|
|
this.$message({
|
|
this.$message({
|
|
@@ -220,20 +220,20 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
/* 刷新表格 */
|
|
/* 刷新表格 */
|
|
|
- reload(where) {
|
|
|
|
|
|
|
+ reload (where) {
|
|
|
this.$refs.table.reload({ page: 1, where: where });
|
|
this.$refs.table.reload({ page: 1, where: where });
|
|
|
},
|
|
},
|
|
|
/* 打开编辑弹窗 */
|
|
/* 打开编辑弹窗 */
|
|
|
- openEdit(row) {
|
|
|
|
|
|
|
+ openEdit (row) {
|
|
|
this.current = row;
|
|
this.current = row;
|
|
|
this.showEdit = true;
|
|
this.showEdit = true;
|
|
|
},
|
|
},
|
|
|
/* 打开导入弹窗 */
|
|
/* 打开导入弹窗 */
|
|
|
- openImport() {
|
|
|
|
|
|
|
+ openImport () {
|
|
|
this.showImport = true;
|
|
this.showImport = true;
|
|
|
},
|
|
},
|
|
|
/* 删除 */
|
|
/* 删除 */
|
|
|
- remove(row) {
|
|
|
|
|
|
|
+ remove (row) {
|
|
|
const loading = this.$loading({ lock: true });
|
|
const loading = this.$loading({ lock: true });
|
|
|
deleteUsers([row.id])
|
|
deleteUsers([row.id])
|
|
|
.then((msg) => {
|
|
.then((msg) => {
|
|
@@ -247,7 +247,7 @@
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
/* 批量删除 */
|
|
/* 批量删除 */
|
|
|
- removeBatch() {
|
|
|
|
|
|
|
+ removeBatch () {
|
|
|
if (!this.selection.length) {
|
|
if (!this.selection.length) {
|
|
|
this.$message.error('请至少选择一条数据');
|
|
this.$message.error('请至少选择一条数据');
|
|
|
return;
|
|
return;
|
|
@@ -257,7 +257,7 @@
|
|
|
})
|
|
})
|
|
|
.then(() => {
|
|
.then(() => {
|
|
|
const loading = this.$loading({ lock: true });
|
|
const loading = this.$loading({ lock: true });
|
|
|
- deleteUsers(this.selection.map((d) => d.id ))
|
|
|
|
|
|
|
+ deleteUsers(this.selection.map((d) => d.id))
|
|
|
.then((msg) => {
|
|
.then((msg) => {
|
|
|
loading.close();
|
|
loading.close();
|
|
|
this.$message.success(msg);
|
|
this.$message.success(msg);
|
|
@@ -271,7 +271,7 @@
|
|
|
.catch(() => {});
|
|
.catch(() => {});
|
|
|
},
|
|
},
|
|
|
/* 重置用户密码 */
|
|
/* 重置用户密码 */
|
|
|
- resetPsw(row) {
|
|
|
|
|
|
|
+ resetPsw (row) {
|
|
|
this.$confirm('确定要重置此用户的密码为"123456"吗?', '提示', {
|
|
this.$confirm('确定要重置此用户的密码为"123456"吗?', '提示', {
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
})
|
|
})
|
|
@@ -290,7 +290,7 @@
|
|
|
.catch(() => {});
|
|
.catch(() => {});
|
|
|
},
|
|
},
|
|
|
/* 更改状态 */
|
|
/* 更改状态 */
|
|
|
- editStatus(row) {
|
|
|
|
|
|
|
+ editStatus (row) {
|
|
|
const loading = this.$loading({ lock: true });
|
|
const loading = this.$loading({ lock: true });
|
|
|
updateUserStatus(row.userId, row.status)
|
|
updateUserStatus(row.userId, row.status)
|
|
|
.then((msg) => {
|
|
.then((msg) => {
|