root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server

Browse Source
This commit is contained in:
ludj
2022-11-30 15:36:55 +08:00
parent 135c93413c fd5b644be1
commit 67a4def2cc
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
nladmin-ui/src/views/system/user/index.vue
View File

@@ -2,27 +2,27 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<!--侧边部门数据--> <!--侧边部门数据-->
<el-col :xs="9" :sm="6" :md="5" :lg="5" :xl="4"> <!-- <el-col :xs="9" :sm="6" :md="5" :lg="5" :xl="4">-->
<div class="head-container"> <!-- <div class="head-container">-->
<el-input <!-- <el-input-->
v-model="deptName" <!-- v-model="deptName"-->
clearable <!-- clearable-->
size="mini" <!-- size="mini"-->
placeholder="请输入部门名称" <!-- placeholder="请输入部门名称"-->
prefix-icon="el-icon-search" <!-- prefix-icon="el-icon-search"-->
class="filter-item" <!-- class="filter-item"-->
@input="getDeptDatas" <!-- @input="getDeptDatas"-->
/> <!-- />-->
</div> <!-- </div>-->
<el-tree <!-- <el-tree-->
:data="deptDatas" <!-- :data="deptDatas"-->
:load="getDeptDatas" <!-- :load="getDeptDatas"-->
:props="defaultProps" <!-- :props="defaultProps"-->
:expand-on-click-node="false" <!-- :expand-on-click-node="false"-->
lazy <!-- lazy-->
@node-click="handleNodeClick" <!-- @node-click="handleNodeClick"-->
/> <!-- />-->
</el-col> <!-- </el-col>-->
<!--用户数据--> <!--用户数据-->
<el-col :xs="15" :sm="18" :md="19" :lg="19" :xl="20"> <el-col :xs="15" :sm="18" :md="19" :lg="19" :xl="20">
<!--工具栏--> <!--工具栏-->
@@ -90,8 +90,8 @@
/> />
</el-form-item> </el-form-item>
<br v-if="!crud.status.add"> <br v-if="!crud.status.add">
<el-form-item label="密码" prop="password" v-if="crud.status.add"> <el-form-item v-if="crud.status.add" label="密码" prop="password">
<el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password"/> <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password" />
</el-form-item> </el-form-item>
<el-form-item label="性别"> <el-form-item label="性别">
<el-radio-group v-model="form.gender" style="width: 178px"> <el-radio-group v-model="form.gender" style="width: 178px">
@@ -143,29 +143,27 @@
> >
<el-table-column :selectable="checkboxT" type="selection" width="55" /> <el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="username" label="用户名" /> <el-table-column show-overflow-tooltip prop="username" label="用户名" />
<el-table-column show-overflow-tooltip prop="nickName" label="姓名" /> <el-table-column show-overflow-tooltip prop="person_name" label="姓名" />
<el-table-column prop="gender" label="性别" /> <el-table-column prop="gender" label="性别" />
<el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" /> <el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
<el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" /> <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
<el-table-column show-overflow-tooltip prop="dept" label="部门"> <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
<template slot-scope="scope"> <el-table-column label="状态" align="center" prop="is_used">
<div>{{ scope.row.dept.name }}</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="enabled">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.enabled" v-model="scope.row.is_used"
:disabled="user.id === scope.row.id" :disabled="user.id === scope.row.id"
active-color="#409EFF" active-color="#409EFF"
inactive-color="#F56C6C" inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.enabled)" active-value="1"
inactive-value="0"
@change="changeEnabled(scope.row, scope.row.is_used)"
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip prop="createTime" width="135" label="创建日期"> <el-table-column show-overflow-tooltip prop="create_time" width="135" label="创建日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.create_time) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -183,11 +181,12 @@
:disabled-dle="scope.row.id === user.id" :disabled-dle="scope.row.id === user.id"
/> />
<el-button <el-button
type="text"
slot="left" slot="left"
icon="el-icon-refresh-left"
v-permission="permission.edit" v-permission="permission.edit"
@click="resetPassword(scope.row)"> type="text"
icon="el-icon-refresh-left"
@click="resetPassword(scope.row)"
>
重置密码 重置密码
</el-button> </el-button>
</template> </template>