From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/system/user.vue | 714 ++++++++++++++++++++++++++++------------------------------
1 files changed, 343 insertions(+), 371 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 975e0b9..898b687 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,128 +1,73 @@
<template>
<el-row>
- <!-- <el-col :span="5">
+ <el-col :span="5">
<div class="box">
<el-scrollbar>
<basic-container>
- <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+ <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
</basic-container>
</el-scrollbar>
</div>
- </el-col> -->
- <el-col :span="24">
+ </el-col>
+ <el-col :span="19">
<basic-container>
- <avue-crud :option="option"
- :search.sync="search"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- @row-del="rowDel"
- @row-update="rowUpdate"
- @row-save="rowSave"
- :before-open="beforeOpen"
- :page.sync="page"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+ v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+ :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad">
<template slot="menuLeft">
- <el-button type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- v-if="permission.user_delete"
- @click="handleDelete">删 除
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
+ @click="handleDelete">删 除
</el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="permission.user_role"
- icon="el-icon-user"
- @click="handleGrant">角色配置
+ <el-button type="info" size="small" plain v-if="permission.user_role" icon="el-icon-user"
+ @click="handleGrant">角色配置
</el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="permission.user_reset"
- icon="el-icon-refresh"
- @click="handleReset">密码重置
+ <el-button type="info" size="small" plain v-if="permission.user_reset" icon="el-icon-refresh"
+ @click="handleReset">密码重置
</el-button>
<!-- <el-button type="info"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-setting"
- @click="handlePlatform">平台配置
- </el-button> -->
- <el-button type="info"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-coordinate"
- @click="handleLock">账号解封
+ size="small"
+ plain
+ v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-setting"
+ @click="handlePlatform">平台配置
+ </el-button> -->
+ <el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-coordinate" @click="handleLock">账号解封
</el-button>
- <el-button type="success"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2"
- @click="handleImport">导入
+ <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-upload2" @click="handleImport">导入
</el-button>
- <el-button type="warning"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download"
- @click="handleExport">导出
+ <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
- <template slot-scope="{row}"
- slot="tenantName">
- <el-tag>{{row.tenantName}}</el-tag>
+ <template slot-scope="{row}" slot="tenantName">
+ <el-tag>{{ row.tenantName }}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="roleName">
- <el-tag>{{row.roleName}}</el-tag>
+ <template slot-scope="{row}" slot="roleName">
+ <el-tag>{{ row.roleName }}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="deptName">
- <el-tag>{{row.deptName}}</el-tag>
+ <template slot-scope="{row}" slot="deptName">
+ <el-tag>{{ row.deptName }}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
+ <template slot-scope="{row}" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
- <el-dialog title="用户角色配置"
- append-to-body
- :visible.sync="roleBox"
- width="345px">
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
- <el-tree :data="roleGrantList"
- show-checkbox
- check-strictly
- default-expand-all
- node-key="id"
- ref="treeRole"
- :default-checked-keys="roleTreeObj"
- :props="props">
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+ :default-checked-keys="roleTreeObj" :props="props">
</el-tree>
<span slot="footer" class="dialog-footer">
<el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary"
- @click="submitRole">确 定</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
- <el-dialog title="用户数据导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px">
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
<template slot="excelTemplate">
<el-button type="primary" @click="handleTemplate">
@@ -132,34 +77,34 @@
</avue-form>
</el-dialog>
<!-- <el-dialog title="用户平台配置"
- append-to-body
- :visible.sync="platformBox">
- <avue-crud :option="platformOption"
- :table-loading="platformLoading"
- :data="platformData"
- ref="platformCrud"
- v-model="platformForm"
- :before-open="platformBeforeOpen"
- :page.sync="platformPage"
- :permission="platformPermissionList"
- @row-update="platformRowUpdate"
- @search-change="platformSearchChange"
- @search-reset="platformSearchReset"
- @selection-change="platformSelectionChange"
- @current-change="platformCurrentChange"
- @size-change="platformSizeChange"
- @refresh-change="platformRefreshChange"
- @on-load="platformOnLoad">
- <template slot-scope="{row}"
- slot="tenantName">
- <el-tag>{{row.tenantName}}</el-tag>
- </template>
- <template slot-scope="{row}"
- slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
- </template>
- </avue-crud>
- </el-dialog> -->
+ append-to-body
+ :visible.sync="platformBox">
+ <avue-crud :option="platformOption"
+ :table-loading="platformLoading"
+ :data="platformData"
+ ref="platformCrud"
+ v-model="platformForm"
+ :before-open="platformBeforeOpen"
+ :page.sync="platformPage"
+ :permission="platformPermissionList"
+ @row-update="platformRowUpdate"
+ @search-change="platformSearchChange"
+ @search-reset="platformSearchReset"
+ @selection-change="platformSelectionChange"
+ @current-change="platformCurrentChange"
+ @size-change="platformSizeChange"
+ @refresh-change="platformRefreshChange"
+ @on-load="platformOnLoad">
+ <template slot-scope="{row}"
+ slot="tenantName">
+ <el-tag>{{row.tenantName}}</el-tag>
+ </template>
+ <template slot-scope="{row}"
+ slot="userTypeName">
+ <el-tag>{{row.userTypeName}}</el-tag>
+ </template>
+ </avue-crud>
+ </el-dialog> -->
</basic-container>
</el-col>
</el-row>
@@ -175,42 +120,60 @@
updatePlatform,
add,
grant,
- resetPassword, unlock
- } from "@/api/system/user";
- import {exportBlob} from "@/api/common";
- import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
- import {getRoleTree} from "@/api/system/role";
- import {getPostList} from "@/api/system/post";
- import {mapGetters} from "vuex";
- import website from '@/config/website';
- import {getToken} from '@/util/auth';
- import {downloadXls} from "@/util/util";
- import {dateNow} from "@/util/date";
- import NProgress from 'nprogress';
- import 'nprogress/nprogress.css';
- import func from "@/util/func";
+ resetPassword,
+ unlock
+ } from "@/api/system/user"
+ import {
+ exportBlob
+ } from "@/api/common"
+ import {
+ getDeptTree,
+ getDeptLazyTree
+ } from "@/api/system/dept"
+ import {
+ getRoleTree
+ } from "@/api/system/role"
+ import {
+ getPostList
+ } from "@/api/system/post"
+ import {
+ mapGetters
+ } from "vuex"
+ import website from '@/config/website'
+ import {
+ getToken
+ } from '@/util/auth'
+ import {
+ downloadXls
+ } from "@/util/util"
+ import {
+ dateNow
+ } from "@/util/date"
+ import NProgress from 'nprogress'
+ import 'nprogress/nprogress.css'
+ import func from "@/util/func"
export default {
data() {
const validatePass = (rule, value, callback) => {
if (value === '') {
- callback(new Error('请输入密码'));
+ callback(new Error('请输入密码'))
} else {
- callback();
+ callback()
}
- };
+ }
const validatePass2 = (rule, value, callback) => {
if (value === '') {
- callback(new Error('请再次输入密码'));
+ callback(new Error('请再次输入密码'))
} else if (value !== this.form.password) {
- callback(new Error('两次输入密码不一致!'));
+ callback(new Error('两次输入密码不一致!'))
} else {
- callback();
+ callback()
}
- };
+ }
return {
form: {},
- search:{},
+ search: {},
roleBox: false,
excelBox: false,
platformBox: false,
@@ -244,8 +207,8 @@
treeOption: {
nodeKey: 'id',
lazy: true,
- treeLoad: function (node, resolve) {
- const parentId = (node.level === 0) ? 0 : node.data.id;
+ treeLoad: function(node, resolve) {
+ const parentId = (node.level === 0) ? 0 : node.data.id
getDeptLazyTree(parentId).then(res => {
resolve(res.data.data.map(item => {
return {
@@ -253,7 +216,7 @@
leaf: !item.hasChildren
}
}))
- });
+ })
},
addBtn: false,
menu: false,
@@ -277,11 +240,11 @@
viewBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
- column: [
- {
+ column: [{
label: "登录账号",
prop: "account",
search: true,
+ searchLabelWidth: 76,
display: false
},
// {
@@ -302,12 +265,12 @@
slot: true,
display: false
},
- // {
- // label: "所属部门",
- // prop: "deptName",
- // slot: true,
- // display: false
- // },
+ {
+ label: "所属部门",
+ prop: "deptName",
+ slot: true,
+ display: false
+ },
// {
// label: "用户平台",
// prop: "userTypeName",
@@ -334,8 +297,7 @@
// }]
// },
],
- group: [
- {
+ group: [{
label: '基础信息',
prop: 'baseInfo',
icon: 'el-icon-user-solid',
@@ -392,7 +354,11 @@
hide: true,
editDisplay: false,
viewDisplay: false,
- rules: [{required: true, validator: validatePass, trigger: 'blur'}]
+ rules: [{
+ required: true,
+ validator: validatePass,
+ trigger: 'blur'
+ }]
},
{
label: '确认密码',
@@ -400,7 +366,11 @@
hide: true,
editDisplay: false,
viewDisplay: false,
- rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
+ rules: [{
+ required: true,
+ validator: validatePass2,
+ trigger: 'blur'
+ }]
},
]
},
@@ -408,8 +378,7 @@
label: '详细信息',
prop: 'detailInfo',
icon: 'el-icon-s-order',
- column: [
- {
+ column: [{
label: "用户昵称",
prop: "name",
hide: true,
@@ -447,8 +416,7 @@
label: "用户性别",
prop: "sex",
type: "select",
- dicData: [
- {
+ dicData: [{
label: "男",
value: 1
},
@@ -491,37 +459,42 @@
{
label: "所属角色",
prop: "roleId",
- multiple: true,
type: "tree",
+ multiple: true,
+ checkStrictly: true,
+ leafOnly: false,
dicData: [],
props: {
- label: "title"
+ label: "title",
+ value: "id"
},
- checkStrictly: true,
- slot: true,
rules: [{
required: true,
message: "请选择所属角色",
trigger: "click"
}]
},
- // {
- // label: "所属部门",
- // prop: "deptId",
- // type: "tree",
- // multiple: true,
- // dicData: [],
- // props: {
- // label: "title"
- // },
- // checkStrictly: true,
- // slot: true,
- // rules: [{
- // required: true,
- // message: "请选择所属部门",
- // trigger: "click"
- // }]
- // },
+ {
+ label: "所属部门",
+ prop: "deptId",
+ type: "tree",
+ multiple: true,
+ leafOnly: false,
+ dicData: [],
+ // dataType: "string",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ checkStrictly: true,
+ slot: true,
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请选择所属部门",
+ trigger: "click"
+ }]
+ },
// {
// label: "所属岗位",
// prop: "postId",
@@ -558,8 +531,7 @@
dialogClickModal: false,
menuWidth: 120,
editBtnText: '配置',
- column: [
- {
+ column: [{
label: "登录账号",
prop: "account",
search: true,
@@ -618,8 +590,7 @@
excelOption: {
submitBtn: false,
emptyBtn: false,
- column: [
- {
+ column: [{
label: '模板上传',
prop: 'excelFile',
type: 'upload',
@@ -638,8 +609,7 @@
type: "switch",
align: "center",
width: 80,
- dicData: [
- {
+ dicData: [{
label: "否",
value: 0
},
@@ -650,13 +620,11 @@
],
value: 0,
slot: true,
- rules: [
- {
- required: true,
- message: "请选择是否覆盖",
- trigger: "blur"
- }
- ]
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
},
{
label: '模板下载',
@@ -666,18 +634,18 @@
}
]
}
- };
+ }
},
watch: {
'form.tenantId'() {
if (this.form.tenantId !== '' && this.initFlag) {
- this.initData(this.form.tenantId);
+ this.initData(this.form.tenantId)
}
},
'excelForm.isCovered'() {
if (this.excelForm.isCovered !== '') {
- const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`;
+ const column = this.findObject(this.excelOption.column, "excelFile")
+ column.action = `/api/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`
}
}
},
@@ -689,7 +657,7 @@
viewBtn: this.vaildData(this.permission.user_view, false),
delBtn: this.vaildData(this.permission.user_delete, false),
editBtn: this.vaildData(this.permission.user_edit, false)
- };
+ }
},
platformPermissionList() {
return {
@@ -697,333 +665,337 @@
viewBtn: false,
delBtn: false,
editBtn: this.vaildData(this.permission.user_edit, false)
- };
+ }
},
ids() {
- let ids = [];
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
+ ids.push(ele.id)
+ })
+ return ids.join(",")
},
},
mounted() {
// 非租户模式默认加载管理组数据
if (!website.tenantMode) {
- this.initData(website.tenantId);
+ this.initData(website.tenantId)
}
+ },
+ created() {
+ this.initData(website.tenantId)
},
methods: {
nodeClick(data) {
- this.treeDeptId = data.id;
- this.page.currentPage = 1;
- this.onLoad(this.page);
+ this.treeDeptId = data.id
+ this.page.currentPage = 1
+ this.onLoad(this.page)
},
initData(tenantId) {
getRoleTree(tenantId).then(res => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
- });
+ const column = this.findObject(this.option.group, "roleId")
+ column.dicData = res.data.data
+ })
getDeptTree(tenantId).then(res => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
- });
- getPostList(tenantId).then(res => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
- });
+ const column = this.findObject(this.option.group, "deptId")
+ column.dicData = res.data.data
+ })
+ // getPostList(tenantId).then(res => {
+ // const column = this.findObject(this.option.group, "postId");
+ // column.dicData = res.data.data;
+ // });
},
submitRole() {
- const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+ const roleList = this.$refs.treeRole.getCheckedKeys().join(",")
grant(this.ids, roleList).then(() => {
- this.roleBox = false;
+ this.roleBox = false
this.$message({
type: "success",
message: "操作成功!"
- });
- this.onLoad(this.page);
- });
+ })
+ this.onLoad(this.page)
+ })
},
rowSave(row, done, loading) {
row['tenantId'] = "000000"
row['userType'] = 1
- row['deptId'] = '1123598813738675201'
- // row.deptId = func.join(row.deptId);
- row.roleId = func.join(row.roleId);
- // row.postId = func.join(row.postId);
+ row.deptId = func.join(row.deptId)
+ row.roleId = func.join(row.roleId)
+ // row.postId = func.join(row.postId)
add(row).then(() => {
- this.initFlag = false;
- this.onLoad(this.page);
+ this.initFlag = false
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!"
- });
- done();
+ })
+ done()
}, error => {
- window.console.log(error);
- loading();
- });
+ window.console.log(error)
+ loading()
+ })
},
rowUpdate(row, index, done, loading) {
row['tenantId'] = "000000"
- row['deptId'] = '1123598813738675201'
row['userType'] = 1
- // row.deptId = func.join(row.deptId);
- row.roleId = func.join(row.roleId);
- // row.postId = func.join(row.postId);
+ row.deptId = func.join(row.deptId)
+ row.roleId = func.join(row.roleId)
+ // row.postId = func.join(row.postId)
update(row).then(() => {
- this.initFlag = false;
- this.onLoad(this.page);
+ this.initFlag = false
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!"
- });
- done();
+ })
+ done()
}, error => {
- window.console.log(error);
- loading();
- });
+ window.console.log(error)
+ loading()
+ })
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id);
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
})
.then(() => {
- this.onLoad(this.page);
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!"
- });
- });
+ })
+ })
},
searchReset() {
- this.query = {};
- this.treeDeptId = '';
- this.onLoad(this.page);
+ this.query = {}
+ this.treeDeptId = ''
+ this.onLoad(this.page)
},
searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
selectionChange(list) {
- this.selectionList = list;
+ this.selectionList = list
},
selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
handleDelete() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(this.ids);
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
})
.then(() => {
- this.onLoad(this.page);
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
handleReset() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择账号密码重置为123456?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
.then(() => {
- return resetPassword(this.ids);
+ return resetPassword(this.ids)
})
.then(() => {
this.$message({
type: "success",
message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
handleGrant() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
- this.roleTreeObj = [];
+ this.roleTreeObj = []
if (this.selectionList.length === 1) {
- this.roleTreeObj = this.selectionList[0].roleId.split(",");
+ this.roleTreeObj = this.selectionList[0].roleId.split(",")
}
getRoleTree().then(res => {
- this.roleGrantList = res.data.data;
- this.roleBox = true;
- });
+ this.roleGrantList = res.data.data
+ this.roleBox = true
+ })
},
handlePlatform() {
- this.platformBox = true;
+ this.platformBox = true
},
handleLock() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择账号解封？", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
.then(() => {
- return unlock(this.ids);
+ return unlock(this.ids)
})
.then(() => {
this.$message({
type: "success",
message: "操作成功!"
- });
- });
+ })
+ })
},
handleImport() {
- this.excelBox = true;
+ this.excelBox = true
},
uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.excelBox = false;
- this.refreshChange();
- done();
+ window.console.log(column)
+ this.excelBox = false
+ this.refreshChange()
+ done()
},
handleExport() {
- const account = func.toStr(this.search.account);
- const realName = func.toStr(this.search.realName);
+ const account = func.toStr(this.search.account)
+ const realName = func.toStr(this.search.realName)
+ const deptId = this.treeDeptId
this.$confirm("是否导出用户数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
- NProgress.start();
- exportBlob(`/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
- downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
- NProgress.done();
+ NProgress.start()
+ exportBlob(
+ `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}&deptId=${deptId}`
+ ).then(res => {
+ downloadXls(res.data, `用户数据表${dateNow()}.xlsx`)
+ NProgress.done()
})
- });
+ })
},
handleTemplate() {
exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
- downloadXls(res.data, "用户数据模板.xlsx");
+ downloadXls(res.data, "用户数据模板.xlsx")
})
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getUser(this.form.id).then(res => {
- this.form = res.data.data;
- if(this.form.hasOwnProperty("deptId")){
- this.form.deptId = this.form.deptId.split(",");
+ this.form = res.data.data
+ if (this.form.hasOwnProperty("deptId")) {
+ this.form.deptId = this.form.deptId.split(",")
}
- if(this.form.hasOwnProperty("roleId")){
- this.form.roleId = this.form.roleId.split(",");
+ if (this.form.hasOwnProperty("roleId")) {
+ this.form.roleId = this.form.roleId.split(",")
}
- if(this.form.hasOwnProperty("postId")){
- this.form.postId = this.form.postId.split(",");
- }
- });
+ // if (this.form.hasOwnProperty("postId")) {
+ // this.form.postId = this.form.postId.split(",")
+ // }
+ })
}
- this.initFlag = true;
- done();
+ this.initFlag = true
+ done()
},
currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ this.page.currentPage = currentPage
},
sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ this.page.pageSize = pageSize
},
refreshChange() {
- this.onLoad(this.page, this.query);
+ this.onLoad(this.page, this.query)
},
onLoad(page, params = {}) {
- this.loading = true;
+ this.loading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
},
platformRowUpdate(row, index, done, loading) {
updatePlatform(row.id, row.userType, row.userExt).then(() => {
- this.platformOnLoad(this.platformPage);
+ this.platformOnLoad(this.platformPage)
this.$message({
type: "success",
message: "操作成功!"
- });
- done();
+ })
+ done()
}, error => {
- window.console.log(error);
- loading();
- });
+ window.console.log(error)
+ loading()
+ })
},
platformBeforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getUserPlatform(this.platformForm.id).then(res => {
- this.platformForm = res.data.data;
- });
+ this.platformForm = res.data.data
+ })
}
- done();
+ done()
},
platformSearchReset() {
- this.platformQuery = {};
- this.platformOnLoad(this.platformPage);
+ this.platformQuery = {}
+ this.platformOnLoad(this.platformPage)
},
platformSearchChange(params, done) {
- this.platformQuery = params;
- this.platformPage.currentPage = 1;
- this.platformOnLoad(this.platformPage, params);
- done();
+ this.platformQuery = params
+ this.platformPage.currentPage = 1
+ this.platformOnLoad(this.platformPage, params)
+ done()
},
platformSelectionChange(list) {
- this.platformSelectionList = list;
+ this.platformSelectionList = list
},
platformSelectionClear() {
- this.platformSelectionList = [];
- this.$refs.platformCrud.toggleSelection();
+ this.platformSelectionList = []
+ this.$refs.platformCrud.toggleSelection()
},
platformCurrentChange(currentPage) {
- this.platformPage.currentPage = currentPage;
+ this.platformPage.currentPage = currentPage
},
platformSizeChange(pageSize) {
- this.platformPage.pageSize = pageSize;
+ this.platformPage.pageSize = pageSize
},
platformRefreshChange() {
- this.platformOnLoad(this.platformPage, this.platformQuery);
+ this.platformOnLoad(this.platformPage, this.platformQuery)
},
platformOnLoad(page, params = {}) {
- this.platformLoading = true;
+ this.platformLoading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
- const data = res.data.data;
- this.platformPage.total = data.total;
- this.platformData = data.records;
- this.platformLoading = false;
- this.selectionClear();
- });
+ const data = res.data.data
+ this.platformPage.total = data.total
+ this.platformData = data.records
+ this.platformLoading = false
+ this.selectionClear()
+ })
}
}
- };
+ }
</script>
<style>
@@ -1038,4 +1010,4 @@
.box .el-scrollbar__wrap {
overflow: scroll;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3