1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-11 13:39:48 +08:00

login section according to role and organization (#634)

Co-authored-by: Elsio Sanchez <elsiosanche@gmail.com>
This commit is contained in:
Elsio Sanchez 2021-03-08 20:04:52 -04:00 committed by GitHub
parent ba27d672ea
commit db2e6968cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions

View File

@ -12,6 +12,8 @@ import {
export function login({ export function login({
userName, userName,
password, password,
roleUuid,
organizationUuid,
token token
}) { }) {
return requestRest({ return requestRest({
@ -20,6 +22,8 @@ export function login({
data: { data: {
username: userName, username: userName,
password, password,
role_uuid: roleUuid,
organization_uuid: organizationUuid,
token token
} }
}) })

View File

@ -107,6 +107,13 @@ const actions = {
token token
}) { }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log({
userName,
password,
roleUuid,
organizationUuid,
token
})
login({ login({
userName, userName,
password, password,

View File

@ -119,7 +119,9 @@ export default {
return { return {
loginForm: { loginForm: {
userName: '', userName: '',
password: '' password: '',
roleUuid: '',
organizationUuid: ''
}, },
loginRules: { loginRules: {
userName: [{ required: true, trigger: 'blur', validator: validateUsername }], userName: [{ required: true, trigger: 'blur', validator: validateUsername }],
@ -169,8 +171,8 @@ export default {
if (!this.isEmptyValue(query)) { if (!this.isEmptyValue(query)) {
this.loginForm = { this.loginForm = {
...this.loginForm, ...this.loginForm,
roleId: this.clientIdRedirect(query, expr), roleUuid: this.clientIdRedirect(query, expr),
organizationId: this.organizationIdRedirect(query, expr) organizationUuid: this.organizationIdRedirect(query, expr)
} }
} }
this.$refs.loginForm.validate(valid => { this.$refs.loginForm.validate(valid => {