朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 3d20c458abc5a6857944950f889df09814b1e304 1 个父辈 3e2bb263

修改 用户绑定角色bug 添加用户不成功问题

内嵌 并排对比
正在显示 2 个修改的文件 包含 24 行增加 和 12 行删除
@@ -145,10 +145,10 @@ @@ -145,10 +145,10 @@
145 <el-dialog title="权限设置" :visible.sync="roleFormVisible" :close-on-click-modal="false"> 145 <el-dialog title="权限设置" :visible.sync="roleFormVisible" :close-on-click-modal="false">
146 <el-form :model="roleEditForm" label-width="80px" ref="roleEditForm" > 146 <el-form :model="roleEditForm" label-width="80px" ref="roleEditForm" >
147 <el-form-item label="ID"> 147 <el-form-item label="ID">
148 - <span>{{roleEditForm.userId}}</span> 148 + <span>{{roleEditForm.id}}</span>
149 </el-form-item> 149 </el-form-item>
150 <el-form-item label="账号"> 150 <el-form-item label="账号">
151 - <span>{{roleEditForm.username}}</span> 151 + <span>{{roleEditForm.loginName}}</span>
152 </el-form-item> 152 </el-form-item>
153 <el-tree :data="roles" :props="treeDefaultProps" default-expand-all show-checkbox highlight-current check-strictly node-key="roleId" ref="tree" @check-change="treeHandleCheckChange"> 153 <el-tree :data="roles" :props="treeDefaultProps" default-expand-all show-checkbox highlight-current check-strictly node-key="roleId" ref="tree" @check-change="treeHandleCheckChange">
154 </el-tree> 154 </el-tree>
@@ -205,20 +205,26 @@ @@ -205,20 +205,26 @@
205 mobile: '', 205 mobile: '',
206 id: '', 206 id: '',
207 companyId:'', 207 companyId:'',
208 - loginFlag: '' 208 + loginFlag: '',
  209 + officeId: '',
  210 + createBy: '',
  211 + updateBy: ''
209 }, 212 },
210 213
211 addFormVisible: false,//新增界面是否显示 214 addFormVisible: false,//新增界面是否显示
212 addLoading: false, 215 addLoading: false,
213 addFormRules: { 216 addFormRules: {
214 - username: [  
215 - { required: true, message: '请输入姓名,用户名长度在5-11位,支持英文和数字', trigger: 'blur' }, 217 + loginName: [
  218 + { required: true, message: '请输入登录账户名称,用户名长度在5-11位,支持英文和数字', trigger: 'blur' },
216 ], 219 ],
217 password: [ 220 password: [
218 { required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'} 221 { required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'}
219 ], 222 ],
220 companyId: [ 223 companyId: [
221 { required: true, message: '请选择所属您的所属公司', trigger: 'blur' }, 224 { required: true, message: '请选择所属您的所属公司', trigger: 'blur' },
  225 + ],
  226 + name: [
  227 + { required: true, message: '请输入姓名', trigger: 'blur' },
222 ] 228 ]
223 }, 229 },
224 //用户角色配置 230 //用户角色配置
@@ -231,11 +237,14 @@ @@ -231,11 +237,14 @@
231 address: '', 237 address: '',
232 email: '', 238 email: '',
233 mobile: '', 239 mobile: '',
234 - companyId:'' 240 + companyId:'',
  241 + officeId: '',
  242 + createBy: '',
  243 + updateBy: ''
235 }, 244 },
236 roleEditForm: { 245 roleEditForm: {
237 - userId: 1,  
238 - username: "", 246 + id: '',
  247 + loginName: "",
239 roles: [] 248 roles: []
240 }, 249 },
241 roles: [], 250 roles: [],
@@ -295,7 +304,7 @@ @@ -295,7 +304,7 @@
295 }).then(() => { 304 }).then(() => {
296 this.listLoading = true; 305 this.listLoading = true;
297 //NProgress.start(); 306 //NProgress.start();
298 - let para = { userId: row.id }; 307 + let para = { id: row.id };
299 removeUser(para).then((res) => { 308 removeUser(para).then((res) => {
300 this.listLoading = false; 309 this.listLoading = false;
301 //NProgress.done(); 310 //NProgress.done();
@@ -370,7 +379,10 @@ @@ -370,7 +379,10 @@
370 address: '', 379 address: '',
371 email: '', 380 email: '',
372 mobile: '', 381 mobile: '',
373 - companyId:'' 382 + companyId:'',
  383 + officeId: '5e95a0f081c64fce9f85d59e18cfdc5f',
  384 + createBy: JSON.parse(sessionStorage.getItem('user')).id,
  385 + updateBy: JSON.parse(sessionStorage.getItem('user')).id
374 }; 386 };
375 }, 387 },
376 //编辑 388 //编辑
@@ -468,7 +480,7 @@ @@ -468,7 +480,7 @@
468 roleEditSubmit: function () { 480 roleEditSubmit: function () {
469 this.$confirm('确认提交吗？', '提示', {}).then(() => { 481 this.$confirm('确认提交吗？', '提示', {}).then(() => {
470 // this.editLoading = true; 482 // this.editLoading = true;
471 - let userId = this.roleEditForm.userId; 483 + let userId = this.roleEditForm.id;
472 let roleIds = this.$refs.tree.getCheckedKeys(); 484 let roleIds = this.$refs.tree.getCheckedKeys();
473 let para = {userId,roleIds}; 485 let para = {userId,roleIds};
474 setUserRole(para).then((res) => { 486 setUserRole(para).then((res) => {
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </el-table-column> 90 </el-table-column>
91 <el-table-column fixed="right" label="操作" width="150"> 91 <el-table-column fixed="right" label="操作" width="150">
92 <template slot-scope="scope"> 92 <template slot-scope="scope">
93 - <el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button> 93 + <el-button type="success" @click="(scope.$index, scope.row)" size="mini">修改</el-button>
94 <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button> 94 <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>
95 <el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button> 95 <el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>
96 <el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button> 96 <el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>