切换导航条
此项目
正在载入...
登录
朱兆平
/
vue_cli
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
shenhailong
5 years ago
提交
3d20c458abc5a6857944950f889df09814b1e304
1 个父辈
3e2bb263
修改 用户绑定角色bug 添加用户不成功问题
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
24 行增加
和
12 行删除
src/views/nav1/user.vue
src/views/nav3/Page6.vue
src/views/nav1/user.vue
查看文件 @
3d20c45
...
...
@@ -145,10 +145,10 @@
<el-dialog title="权限设置" :visible.sync="roleFormVisible" :close-on-click-modal="false">
<el-form :model="roleEditForm" label-width="80px" ref="roleEditForm" >
<el-form-item label="ID">
<span>{{roleEditForm.
userI
d}}</span>
<span>{{roleEditForm.
i
d}}</span>
</el-form-item>
<el-form-item label="账号">
<span>{{roleEditForm.
usern
ame}}</span>
<span>{{roleEditForm.
loginN
ame}}</span>
</el-form-item>
<el-tree :data="roles" :props="treeDefaultProps" default-expand-all show-checkbox highlight-current check-strictly node-key="roleId" ref="tree" @check-change="treeHandleCheckChange">
</el-tree>
...
...
@@ -205,20 +205,26 @@
mobile: '',
id: '',
companyId:'',
loginFlag: ''
loginFlag: '',
officeId: '',
createBy: '',
updateBy: ''
},
addFormVisible: false,//新增界面是否显示
addLoading: false,
addFormRules: {
username: [
{ required: true, message: '请输入姓名,用户名长度在5-11位,支持英文和数字', trigger: 'blur' },
loginName: [
{ required: true, message: '请输入登录账户名称,用户名长度在5-11位,支持英文和数字', trigger: 'blur' },
],
password: [
{ required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'}
],
companyId: [
{ required: true, message: '请选择所属您的所属公司', trigger: 'blur' },
],
name: [
{ required: true, message: '请输入姓名', trigger: 'blur' },
]
},
//用户角色配置
...
...
@@ -231,11 +237,14 @@
address: '',
email: '',
mobile: '',
companyId:''
companyId:'',
officeId: '',
createBy: '',
updateBy: ''
},
roleEditForm: {
userId: 1,
username: "",
id: '',
loginName: "",
roles: []
},
roles: [],
...
...
@@ -295,7 +304,7 @@
}).then(() => {
this.listLoading = true;
//NProgress.start();
let para = {
userI
d: row.id };
let para = {
i
d: row.id };
removeUser(para).then((res) => {
this.listLoading = false;
//NProgress.done();
...
...
@@ -370,7 +379,10 @@
address: '',
email: '',
mobile: '',
companyId:''
companyId:'',
officeId: '5e95a0f081c64fce9f85d59e18cfdc5f',
createBy: JSON.parse(sessionStorage.getItem('user')).id,
updateBy: JSON.parse(sessionStorage.getItem('user')).id
};
},
//编辑
...
...
@@ -468,7 +480,7 @@
roleEditSubmit: function () {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
// this.editLoading = true;
let userId = this.roleEditForm.
userI
d;
let userId = this.roleEditForm.
i
d;
let roleIds = this.$refs.tree.getCheckedKeys();
let para = {userId,roleIds};
setUserRole(para).then((res) => {
...
...
src/views/nav3/Page6.vue
查看文件 @
3d20c45
...
...
@@ -90,7 +90,7 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="150">
<template slot-scope="scope">
<el-button type="success" @click="
opneEdit
(scope.$index, scope.row)" size="mini">修改</el-button>
<el-button type="success" @click="(scope.$index, scope.row)" size="mini">修改</el-button>
<el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>
<el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>
<el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
...
...
请
注册
或
登录
后发表评论