This commit is contained in:
寻欢·李 2018-01-02 12:09:14 +08:00
parent 1c400c3658
commit baba1ffc34
4 changed files with 20 additions and 5 deletions

View File

@ -32,7 +32,7 @@ export function delObj(id) {
export function putObj(obj) { export function putObj(obj) {
return request({ return request({
url: '/admin/user/', url: '/admin/user',
method: 'put', method: 'put',
data: obj data: obj
}) })

View File

@ -1,7 +1,7 @@
import Vue from 'vue' import Vue from 'vue'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' import 'element-ui/lib/theme-chalk/index.css'
// import locale from 'element-ui/lib/locale/lang/en' import locale from 'element-ui/lib/locale/lang/en'
import locale from 'element-ui/lib/locale/lang/zh-CN' import locale from 'element-ui/lib/locale/lang/zh-CN'
import App from './App' import App from './App'
import router from './router' import router from './router'

View File

@ -75,17 +75,23 @@
<el-form-item label="用户名" prop="username"> <el-form-item label="用户名" prop="username">
<el-input v-model="form.username" placeholder="请输用户名"></el-input> <el-input v-model="form.username" placeholder="请输用户名"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="dialogStatus == 'create'" label="密码" placeholder="请输入密码" prop="password"> <el-form-item v-if="dialogStatus == 'create'" label="密码" placeholder="请输入密码" prop="password">
<el-input type="password" v-model="form.password"></el-input> <el-input type="password" v-model="form.password"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="角色" prop="role"> <el-form-item label="角色" prop="role">
<el-select class="filter-item" v-model="form.role" placeholder="请选择"> <el-select class="filter-item" v-model="form.role" placeholder="请选择">
<el-option v-for="item in rolesOptions" :key="item.roleId" :label="item.roleDesc" :value="item.roleId"> <el-option v-for="item in rolesOptions" :key="item.roleId" :label="item.roleDesc" :value="item.roleId" :disabled="isDisabled[item.delFlag]">
<span style="float: left">{{ item.roleDesc }}</span> <span style="float: left">{{ item.roleDesc }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.roleCode }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.roleCode }}</span>
</el-option> </el-option>
</el-select> </el-select>
<!--<el-radio-group v-model="form.role" placeholder="请选择">-->
<!--<el-radio v-for="item in rolesOptions" :key="item.roleId" :label="item.roleDesc" :value="item.roleId"></el-radio>-->
<!--</el-radio-group>-->
</el-form-item> </el-form-item>
<el-form-item label="状态" v-if="dialogStatus == 'update' && sys_user_del " prop="delFlag" > <el-form-item label="状态" v-if="dialogStatus == 'update' && sys_user_del " prop="delFlag" >
<el-select class="filter-item" v-model="form.delFlag" placeholder="请选择"> <el-select class="filter-item" v-model="form.delFlag" placeholder="请选择">
<el-option v-for="item in statusOptions" :key="item" :label="item | statusFilter" :value="item"> </el-option> <el-option v-for="item in statusOptions" :key="item" :label="item | statusFilter" :value="item"> </el-option>
@ -107,8 +113,13 @@
import waves from '@/directive/waves/index.js' // import waves from '@/directive/waves/index.js' //
// import { parseTime } from '@/utils' // import { parseTime } from '@/utils'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ElRadioGroup from 'element-ui/packages/radio/src/radio-group';
import ElOption from "element-ui/packages/select/src/option";
export default { export default {
components: {
ElOption,
ElRadioGroup },
name: 'table_user', name: 'table_user',
directives: { directives: {
waves waves
@ -167,6 +178,10 @@
update: '编辑', update: '编辑',
create: '创建' create: '创建'
}, },
isDisabled: {
0: false,
1: true
},
tableKey: 0 tableKey: 0
} }
}, },

View File

@ -41,8 +41,8 @@ export default {
} }
return { return {
loginForm: { loginForm: {
username: 'admin', username: null,
password: '123456' password: null
}, },
loginRules: { loginRules: {
username: [{ required: true, trigger: 'blur' }], username: [{ required: true, trigger: 'blur' }],