From 5b432498c2dea1523f5cf21efb555a0df96f616d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 03 Nov 2023 11:58:45 +0800
Subject: [PATCH] 系统权限，用户，名称等调整
---
src/views/system/user.vue | 250 +++++++++++++++++++++++++------------------------
1 files changed, 128 insertions(+), 122 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 921d9a8..975e0b9 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,6 +1,6 @@
<template>
<el-row>
- <el-col :span="5">
+ <!-- <el-col :span="5">
<div class="box">
<el-scrollbar>
<basic-container>
@@ -8,8 +8,8 @@
</basic-container>
</el-scrollbar>
</div>
- </el-col>
- <el-col :span="19">
+ </el-col> -->
+ <el-col :span="24">
<basic-container>
<avue-crud :option="option"
:search.sync="search"
@@ -52,13 +52,13 @@
icon="el-icon-refresh"
@click="handleReset">密码重置
</el-button>
- <el-button type="info"
+ <!-- <el-button type="info"
size="small"
plain
v-if="userInfo.role_name.includes('admin')"
icon="el-icon-setting"
@click="handlePlatform">平台配置
- </el-button>
+ </el-button> -->
<el-button type="info"
size="small"
plain
@@ -131,7 +131,7 @@
</template>
</avue-form>
</el-dialog>
- <el-dialog title="用户平台配置"
+ <!-- <el-dialog title="用户平台配置"
append-to-body
:visible.sync="platformBox">
<avue-crud :option="platformOption"
@@ -159,7 +159,7 @@
<el-tag>{{row.userTypeName}}</el-tag>
</template>
</avue-crud>
- </el-dialog>
+ </el-dialog> -->
</basic-container>
</el-col>
</el-row>
@@ -284,12 +284,12 @@
search: true,
display: false
},
- {
- label: "所属租户",
- prop: "tenantName",
- slot: true,
- display: false
- },
+ // {
+ // label: "所属租户",
+ // prop: "tenantName",
+ // slot: true,
+ // display: false
+ // },
{
label: "用户姓名",
prop: "realName",
@@ -302,37 +302,37 @@
slot: true,
display: false
},
- {
- label: "所属部门",
- prop: "deptName",
- slot: 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: "deptName",
+ // slot: 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"
+ // }]
+ // },
],
group: [
{
@@ -340,26 +340,26 @@
prop: 'baseInfo',
icon: 'el-icon-user-solid',
column: [
- {
- label: "所属租户",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- hide: !website.tenantMode,
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请输入所属租户",
- trigger: "click"
- }],
- span: 24,
- },
+ // {
+ // label: "所属租户",
+ // prop: "tenantId",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/tenant/select",
+ // props: {
+ // label: "tenantName",
+ // value: "tenantId"
+ // },
+ // hide: !website.tenantMode,
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
+ // rules: [{
+ // required: true,
+ // message: "请输入所属租户",
+ // trigger: "click"
+ // }],
+ // span: 24,
+ // },
{
label: "登录账号",
prop: "account",
@@ -369,23 +369,23 @@
trigger: "blur"
}],
},
- {
- label: "用户平台",
- type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "userType",
- rules: [{
- required: true,
- message: "请选择用户平台",
- trigger: "blur"
- }]
- },
+ // {
+ // label: "用户平台",
+ // type: "select",
+ // dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // dataType: "number",
+ // slot: true,
+ // prop: "userType",
+ // rules: [{
+ // required: true,
+ // message: "请选择用户平台",
+ // trigger: "blur"
+ // }]
+ // },
{
label: '密码',
prop: 'password',
@@ -484,10 +484,10 @@
prop: 'dutyInfo',
icon: 'el-icon-s-custom',
column: [
- {
- label: "用户编号",
- prop: "code",
- },
+ // {
+ // label: "用户编号",
+ // prop: "code",
+ // },
{
label: "所属角色",
prop: "roleId",
@@ -505,39 +505,39 @@
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: "postId",
- type: "tree",
- multiple: true,
- dicData: [],
- props: {
- label: "postName",
- value: "id"
- },
- 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: "postId",
+ // type: "tree",
+ // multiple: true,
+ // dicData: [],
+ // props: {
+ // label: "postName",
+ // value: "id"
+ // },
+ // rules: [{
+ // required: true,
+ // message: "请选择所属岗位",
+ // trigger: "click"
+ // }],
+ // },
]
},
]
@@ -745,9 +745,12 @@
});
},
rowSave(row, done, loading) {
- row.deptId = func.join(row.deptId);
+ 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.postId = func.join(row.postId);
add(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@@ -762,9 +765,12 @@
});
},
rowUpdate(row, index, done, loading) {
- row.deptId = func.join(row.deptId);
+ 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.postId = func.join(row.postId);
update(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
--
Gitblit v1.9.3