From 584f2d892201e6fbd0a932f8fb8571734c7797a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 11 Nov 2021 11:59:46 +0800
Subject: [PATCH] 用户管理权限控制
---
src/views/system/user copy.vue | 1163 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/views/system/user.vue | 119 +++-
src/api/system/dept.js | 6
3 files changed, 1,245 insertions(+), 43 deletions(-)
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 2634f3e..befcc24 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -69,13 +69,13 @@
})
}
-export const getDeptLazyTree = (parentId, jurisdiction) => {
+export const getDeptLazyTree = (parentId, userId) => {
return request({
url: '/api/blade-system/dept/lazy-tree',
method: 'get',
params: {
parentId,
- jurisdiction
+ userId
}
})
}
@@ -103,4 +103,4 @@
url: '/api/blade-system/role/selectRole',
method: 'get',
})
-}
+}
\ No newline at end of file
diff --git a/src/views/system/user copy.vue b/src/views/system/user copy.vue
new file mode 100644
index 0000000..df38d65
--- /dev/null
+++ b/src/views/system/user copy.vue
@@ -0,0 +1,1163 @@
+<template>
+ <el-row class="user">
+ <el-col :span="sizes[0]">
+ <div class="box">
+ <el-scrollbar>
+ <basic-container>
+ <avue-tree
+ :option="treeOption"
+ :data="treeData"
+ :parent="parent"
+ @node-click="nodeClick"
+ />
+ </basic-container>
+ </el-scrollbar>
+ </div>
+ </el-col>
+ <el-col :span="sizes[1]">
+ <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"
+ >
+ <template slot="menuLeft">
+ <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 && isguanli"
+ 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>
+ <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="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>
+ </template>
+ <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>
+ <template slot-scope="{ row }" slot="deptName">
+ <el-tag>{{ row.deptName.split(",").join(" ，") }}</el-tag>
+ </template>
+ <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-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>
+ </span>
+ </el-dialog>
+ <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">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </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>
+ </basic-container>
+ </el-col>
+ </el-row>
+</template>
+
+<script>
+import {
+ getList,
+ getUser,
+ getUserPlatform,
+ remove,
+ update,
+ updateUser,
+ updatePlatform,
+ add,
+ grant,
+ resetPassword,
+ getJurisdiction,
+ getJurisdictionDetail
+} from "@/api/system/user";
+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";
+
+export default {
+ data() {
+ const validatePass = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("请输入密码"));
+ } else {
+ callback();
+ }
+ };
+ const validatePass2 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("请再次输入密码"));
+ } else if (value !== this.form.password) {
+ callback(new Error("两次输入密码不一致!"));
+ } else {
+ callback();
+ }
+ };
+
+ return {
+ isguanli: true,
+ parent: true,
+ sizes: [5, 19],
+ deptids: null,
+
+ form: {},
+ search: {},
+ roleBox: false,
+ excelBox: false,
+ platformBox: false,
+ initFlag: true,
+ selectionList: [],
+ query: {},
+ loading: true,
+ platformLoading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ platformPage: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ init: {
+ roleTree: [],
+ deptTree: [],
+ },
+ props: {
+ label: "title",
+ value: "key",
+ },
+ roleGrantList: [],
+ roleTreeObj: [],
+ treeDeptId: "",
+ treeData: [],
+ treeOption: {
+ nodeKey: "id",
+ // lazy: true,
+ // treeLoad: "", //处理权限 在created中
+ // function (node, resolve) {
+ // const parentId = node.level === 0 ? 0 : node.data.id;
+ // //公安局进入
+
+ // getDeptLazyTree(parentId, jurisdiction).then((res) => {
+ // resolve(
+ // res.data.data.map((item) => {
+ // return {
+ // ...item,
+ // leaf: !item.hasChildren,
+ // };
+ // })
+ // );
+ // });
+ // },
+ addBtn: false,
+ defaultExpandAll: true,
+ menu: false,
+ size: "small",
+ props: {
+ labelText: "标题",
+ label: "title",
+ value: "value",
+ children: "children",
+ },
+ },
+ // treeOption:{
+ // nodeKey:"id",
+ // defaultExpandAll:true,
+ // formOption:{
+ // labelWidth:100,
+ // column:[{
+ // label:'自定义项',
+ // prop:'test'
+ // }],
+ // },
+ // props:{
+ // labelText:'标题',
+ // label:'label',
+ // value:'value',
+ // children:'children'
+ // }
+ // },
+ option: {
+ height: "auto",
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ delBtnText: "注销",
+ selection: true,
+ viewBtn: true,
+ //dialogType: 'drawer',
+ dialogClickModal: false,
+ column: [
+ {
+ label: "登录账号",
+ prop: "account",
+ search: true,
+ width: 190,
+ display: false,
+ },
+ {
+ label: "所属组织机构",
+ prop: "deptName",
+ slot: true,
+ overHidden: true,
+ display: false,
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ search: true,
+ width: 90,
+ display: false,
+ },
+ {
+ label: "所属角色",
+ prop: "roleName",
+ slot: true,
+ width: 130,
+ display: false,
+ },
+ ],
+ group: [
+ {
+ label: "基础信息",
+ labelWidth: "110",
+ prop: "baseInfo",
+ icon: "el-icon-user-solid",
+ column: [
+ {
+ label: "所属组织机构",
+ prop: "deptId",
+ type: "tree",
+ defaultExpandAll: true,
+ // dicUrl: "/api/blade-system/dept/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // hide: !website.tenantMode,
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
+ rules: [
+ {
+ required: true,
+ message: "所属组织机构",
+ trigger: "click",
+ },
+ ],
+ span: 12,
+ },
+ {
+ label: "登录账号",
+ prop: "account",
+ rules: [
+ {
+ required: true,
+ message: "请输入登录账号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "密码",
+ prop: "password",
+ type: "password",
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ span: 12,
+ rules: [
+ { required: true, validator: validatePass, trigger: "blur" },
+ ],
+ },
+ {
+ label: "确认密码",
+ prop: "password2",
+ type: "password",
+ hide: true,
+ span: 12,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [
+ { required: true, validator: validatePass2, trigger: "blur" },
+ ],
+ },
+ ],
+ },
+ {
+ label: "详细信息",
+ labelWidth: "110",
+ prop: "detailInfo",
+ icon: "el-icon-s-order",
+ column: [
+ {
+ label: "用户姓名",
+ prop: "realName",
+ rules: [
+ {
+ required: true,
+ message: "请输入用户姓名",
+ trigger: "blur",
+ },
+ {
+ min: 2,
+ max: 5,
+ message: "姓名长度在2到5个字符",
+ },
+ ],
+ },
+ {
+ label: "所属角色",
+ prop: "roleId",
+ multiple: true,
+ type: "tree",
+ dicData: [],
+ props: {
+ label: "title",
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属角色",
+ trigger: "click",
+ },
+ ],
+ },
+ {
+ label: "警号",
+ prop: "code",
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入警号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "身份证号码",
+ prop: "cardid",
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证号码",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true,
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [
+ {
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ ],
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择性别",
+ trigger: "blur",
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ data: [],
+ platformQuery: {},
+ platformSelectionList: [],
+ platformData: [],
+ platformForm: {},
+ platformOption: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ dialogClickModal: false,
+ menuWidth: 120,
+ editBtnText: "配置",
+ column: [
+ {
+ label: "登录账号",
+ prop: "account",
+ search: true,
+ display: false,
+ },
+ {
+ label: "所属单位",
+ prop: "tenantName",
+ slot: true,
+ display: false,
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ search: true,
+ display: false,
+ },
+ {
+ label: "用户平台",
+ prop: "userTypeName",
+ slot: true,
+ display: false,
+ },
+ {
+ label: "用户平台",
+ type: "select",
+ dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ dataType: "number",
+ search: true,
+ hide: true,
+ display: false,
+ prop: "userType",
+ rules: [
+ {
+ required: true,
+ message: "请选择用户平台",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "用户拓展",
+ prop: "userExt",
+ type: "textarea",
+ minRows: 8,
+ span: 24,
+ overHidden: true,
+ row: true,
+ hide: true,
+ },
+ ],
+ },
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "模板上传",
+ prop: "excelFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ tip: "请上传 .xls,.xlsx 标准格式文件",
+ action: "/api/blade-user/import-user",
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [
+ {
+ label: "否",
+ value: 0,
+ },
+ {
+ label: "是",
+ value: 1,
+ },
+ ],
+ value: 0,
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "模板下载",
+ prop: "excelTemplate",
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
+ };
+ },
+ watch: {
+ "form.tenantId"() {
+ if (this.form.tenantId !== "" && this.initFlag) {
+ this.initData(this.form.tenantId, this.userInfo.role_name);
+ }
+ },
+ "form.deptId"() {
+ this.initData(this.form.tenantId, this.userInfo.role_name);
+ },
+ "excelForm.isCovered"() {
+ if (this.excelForm.isCovered !== "") {
+ const column = this.findObject(this.excelOption.column, "excelFile");
+ column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ }
+ },
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.user_add, false),
+ 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 {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: this.vaildData(this.permission.user_edit, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ created() {
+ console.log(this.userInfo.role_name);
+ if (this.userInfo.role_name == "保安公司管理员") {
+ this.deptids = this.userInfo.dept_id;
+ this.sizes = [0, 24];
+ this.isguanli = false;
+ this.option.group[0].column[0]["value"] = this.userInfo.dept_id;
+ this.option.group[0].column[0]["disabled"] = true;
+ // this.option.group[2].column[1]["disabled"] = true;
+ } else {
+ this.deptids = null;
+ this.sizes = [5, 19];
+ }
+
+ //公安局进入
+ var parentId = null;
+ var that = this;
+ // if (this.userInfo.role_name == "公安管理员") {
+
+ parentId = this.userInfo.dept_id;
+ if (parentId == "1123598813738675201") {
+ parentId = 0;
+ }
+ // this.treeOption.treeLoad = function (node, resolve) {
+ // const parentId = node.level === 0 ? 0 : node.data.id;
+ getDeptLazyTree(parentId).then((res) => {
+ that.treeData = res.data.data;
+ // console.log(that.treeData, 123456);
+ // resolve(
+ // res.data.data.map((item) => {
+ // return {
+ // ...item,
+ // leaf: !item.hasChildren,
+ // };
+ // })
+ // );
+ });
+ // };
+ // }
+ // else {
+ // this.treeOption.treeLoad = function (node, resolve) {
+ // // const parentId = node.level === 0 ? 0 : node.data.id;
+ // getDeptLazyTree(parentId).then((res) => {
+ // resolve(
+ // res.data.data.map((item) => {
+ // return {
+ // ...item,
+ // leaf: !item.hasChildren,
+ // };
+ // })
+ // );
+ // });
+ // };
+ // }
+ },
+ mounted() {
+ // 非保安单位模式默认加载管理组数据
+ if (!website.tenantMode) {
+ this.initData(website.tenantId, this.userInfo.role_name);
+ }
+ },
+ methods: {
+ nodeClick(data) {
+ if (data.id == "1123598813738675201") {
+ data.id = "1372091709474910209";
+ }
+ this.treeDeptId = data;
+ this.page.currentPage = 1;
+ // console.log(this.treeDeptId);
+ this.onLoad(this.page);
+ },
+ initData(tenantId, d) {
+ getRoleTree(tenantId).then((res) => {
+ const column = this.findObject(this.option.group, "roleId");
+ var k = res.data.data;
+ var b = [];
+ if (d == "保安公司管理员") {
+ for (var n in k) {
+ if (k[n].title == "保安" || k[n].title == "保安公司管理员") {
+ b.push(k[n]);
+ }
+ }
+ column.dicData = b;
+ } else if (d == "公安管理员") {
+ for (var i in k) {
+ if (k[i].title == "公安管理员") {
+ b.push(k[i]);
+ }
+ }
+ column.dicData = b;
+ } else {
+ column.dicData = k;
+ }
+ });
+ // getDeptTree(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "deptId");
+ // column.dicData = res.data.data;
+ // });
+
+ // var parentId = this.userInfo.dept_id;
+ // if (parentId == "1123598813738675201") {
+ // parentId = 0;
+ // }
+
+ // getDeptLazyTree(parentId).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;
+ // });
+ },
+ submitRole() {
+ const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+ grant(this.ids, roleList).then(() => {
+ this.roleBox = false;
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.onLoad(this.page);
+ });
+ },
+ rowSave(row, done, loading) {
+ row.deptId = row.deptId;
+ row.roleId = row.roleId.join(",");
+ var params = {
+ deptname: row.$deptId,
+ };
+ getJurisdiction(params).then((res) => {
+ console.log(res.data, 123);
+ console.log(res.data.data, 1234);
+ if (res.data.msg != "暂无承载数据") {
+ row.jurisdiction = res.data.data;
+ } else {
+ row.jurisdiction = "";
+ }
+ add(row).then(
+ () => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ });
+ // return;
+ },
+ rowUpdate(row, index, done, loading) {
+ row.deptId = row.deptId;
+ row.roleId = row.roleId.join(",");
+ // row.postId = row.postId.join(",");
+ delete row.postId;
+ updateUser(row).then(
+ () => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择用户注销?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = "";
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择用户注销?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleReset() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择账号密码重置为123456?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return resetPassword(this.ids);
+ })
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleGrant() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.roleTreeObj = [];
+ if (this.selectionList.length === 1) {
+ this.roleTreeObj = this.selectionList[0].roleId.split(",");
+ }
+ getRoleTree().then((res) => {
+ this.roleGrantList = res.data.data;
+ this.roleBox = true;
+ });
+ },
+ handlePlatform() {
+ this.platformBox = true;
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ window.open(
+ `/api/blade-user/export-user?${
+ this.website.tokenHeader
+ }=${getToken()}&account=${this.search.account}&realName=${
+ this.search.realName
+ }`
+ );
+ });
+ },
+ handleTemplate() {
+ window.open(
+ `/api/blade-user/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ if (this.userInfo.role_name != "公安管理员") {
+ const column = this.findObject(this.option.group, "code");
+ column.display = false;
+ }
+
+ // getJurisdictionDetail(this.userInfo.jurisdiction).then((res)=>{
+ // console.log(res.data.data,123);
+ // })
+ var parentId = this.userInfo.dept_id;
+ if (parentId == "1123598813738675201") {
+ parentId = 0;
+ }
+ getDeptLazyTree(parentId).then((res) => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+
+ getUser(this.form.id).then((res) => {
+ this.form = res.data.data;
+ if (this.form.hasOwnProperty("deptId")) {
+ this.form.deptId = this.form.deptId;
+ }
+ 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 (["add"].includes(type)) {
+ if (this.userInfo.role_name != "公安管理员") {
+ const column = this.findObject(this.option.group, "code");
+ column.display = false;
+ }
+
+ var parentId1 = this.userInfo.dept_id;
+ if (parentId1 == "1123598813738675201") {
+ parentId = 0;
+ }
+ getDeptLazyTree(parentId1).then((res) => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ var deptid = this.deptids == null ? this.treeDeptId.id : this.deptids;
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ }
+ var test = /派出所|分局|公安局|市公安局$/g;
+ var jurisdiction = "";
+ if (test.test(this.treeDeptId.title)) {
+ jurisdiction = this.treeDeptId.id;
+ }
+ params["status"] = 1;
+ params["roleId"] = "1";
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query),
+ deptid,
+ jurisdiction
+ ).then((res) => {
+ 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.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ platformBeforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getUserPlatform(this.platformForm.id).then((res) => {
+ this.platformForm = res.data.data;
+ });
+ }
+ done();
+ },
+ platformSearchReset() {
+ this.platformQuery = {};
+ this.platformOnLoad(this.platformPage);
+ },
+ platformSearchChange(params, done) {
+ this.platformQuery = params;
+ this.platformPage.currentPage = 1;
+ this.platformOnLoad(this.platformPage, params);
+ done();
+ },
+ platformSelectionChange(list) {
+ this.platformSelectionList = list;
+ },
+ platformSelectionClear() {
+ this.platformSelectionList = [];
+ this.$refs.platformCrud.toggleSelection();
+ },
+ platformCurrentChange(currentPage) {
+ this.platformPage.currentPage = currentPage;
+ },
+ platformSizeChange(pageSize) {
+ this.platformPage.pageSize = pageSize;
+ },
+ platformRefreshChange() {
+ this.platformOnLoad(this.platformPage, this.platformQuery);
+ },
+ platformOnLoad(page, params = {}) {
+ this.platformLoading = true;
+ var jurisdiction = "";
+ var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query),
+ deptid,
+ jurisdiction
+ ).then((res) => {
+ const data = res.data.data;
+ this.platformPage.total = data.total;
+ this.platformData = data.records;
+ this.platformLoading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style>
+.box {
+ height: 800px;
+}
+
+.el-scrollbar {
+ height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
+</style>
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 819a088..3e43dd0 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -262,8 +262,9 @@
treeData: [],
treeOption: {
nodeKey: "id",
- lazy: true,
- treeLoad: "", //处理权限 在created中
+ defaultExpandAll:true,
+ // lazy: false,
+ // treeLoad: "", //处理权限 在created中
// function (node, resolve) {
// const parentId = node.level === 0 ? 0 : node.data.id;
// //公安局进入
@@ -289,6 +290,26 @@
children: "children",
},
},
+ // treeOption:{
+ // nodeKey: "id",
+ // defaultExpandAll:true,
+ // addBtn: false,
+ // menu: false,
+ // size: "small",
+ // formOption:{
+ // labelWidth:100,
+ // column:[{
+ // label:'自定义项',
+ // prop:'test'
+ // }],
+ // },
+ // props:{
+ // labelText:'标题',
+ // label:'label',
+ // value:'value',
+ // children:'children'
+ // }
+ // },
option: {
height: "auto",
calcHeight: 80,
@@ -343,15 +364,17 @@
label: "所属组织机构",
prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-system/dept/lazy-tree",
+ defaultExpandAll:true,
+ // dicUrl: "/api/blade-system/dept/lazy-tree",
props: {
label: "title",
value: "id",
},
- hide: !website.tenantMode,
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
+ dicData:[],
+ // hide: !website.tenantMode,
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
rules: [
{
required: true,
@@ -680,37 +703,32 @@
this.sizes = [5, 19];
}
+ var that = this;
//公安局进入
- var jurisdiction = "";
if (this.userInfo.role_name == "公安管理员") {
- jurisdiction = this.userInfo.jurisdiction;
- this.treeOption.treeLoad = function (node, resolve) {
- const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId, jurisdiction).then((res) => {
- resolve(
- res.data.data.map((item) => {
- return {
- ...item,
- leaf: !item.hasChildren,
- };
- })
- );
- });
- };
+ var parentId = this.userInfo.dept_id;
+ var userId = this.userInfo.Id;
+ getDeptLazyTree(parentId, userId).then((res) => {
+ that.treeData = res.data.data;
+ });
} else {
- this.treeOption.treeLoad = function (node, resolve) {
- const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then((res) => {
- resolve(
- res.data.data.map((item) => {
- return {
- ...item,
- leaf: !item.hasChildren,
- };
- })
- );
- });
- };
+ // this.treeOption.treeLoad = function (node, resolve) {
+ // const parentId = node.level === 0 ? 0 : node.data.id;
+ // getDeptLazyTree(parentId).then((res) => {
+ // resolve(
+ // res.data.data.map((item) => {
+ // return {
+ // ...item,
+ // leaf: !item.hasChildren,
+ // };
+ // })
+ // );
+ // });
+ // };
+ getDeptLazyTree(0).then((res) => {
+ that.treeData = res.data.data;
+ });
+ this.treeOption.defaultExpandAll = false;
}
},
mounted() {
@@ -735,21 +753,43 @@
var k = res.data.data;
var b = [];
if (d == "保安公司管理员") {
- console.log(k);
+ // console.log(k);
for (var n in k) {
if (k[n].title == "保安" || k[n].title == "保安公司管理员") {
b.push(k[n]);
}
}
column.dicData = b;
- } else {
+ } else if(d == "公安管理员"){
+ for (var i in k) {
+ if (k[i].title == "公安管理员") {
+ b.push(k[i]);
+ }
+ }
+ column.dicData = b;
+ }else {
column.dicData = k;
}
});
- getDeptTree(tenantId).then((res) => {
+
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "保安公司管理员") {
+ var parentId = this.userInfo.dept_id;
+ var userId = this.userInfo.Id;
+ getDeptLazyTree(parentId, userId).then((res) => {
const column = this.findObject(this.option.group, "deptId");
column.dicData = res.data.data;
});
+ } else {
+ getDeptLazyTree(0).then((res) => {
+ const column = this.findObject(this.option.group, "deptId");
+ 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;
@@ -773,8 +813,6 @@
deptname: row.$deptId,
};
getJurisdiction(params).then((res) => {
- console.log(res.data,123);
- console.log(res.data.data,1234);
if (res.data.msg != "暂无承载数据") {
row.jurisdiction = res.data.data;
} else {
@@ -989,6 +1027,7 @@
//公安局进入
if (this.userInfo.role_name == "公安管理员") {
params["jurisdiction"] = this.userInfo.jurisdiction;
+ params["roleId"] = "1";
}
var test = /派出所|分局|公安局|市公安局$/g;
var jurisdiction = "";
--
Gitblit v1.9.3