|
@@ -15,7 +15,7 @@
|
|
|
<a-input placeholder="请输入姓名查询" v-model="queryParam.realname"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="性别">
|
|
|
<a-select v-model="queryParam.sex" placeholder="请选择性别查询">
|
|
|
<a-select-option value="">请选择性别查询</a-select-option>
|
|
@@ -23,6 +23,28 @@
|
|
|
<a-select-option value="2">女性</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
+ </a-col> -->
|
|
|
+ <a-col :md="6" :sm="12">
|
|
|
+ <a-form-item label="汇报上级">
|
|
|
+ <a-input placeholder="请输入姓名查询" v-model="queryParam.leaderName"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="12">
|
|
|
+ <a-form-item label="用户角色">
|
|
|
+ <a-input placeholder="请输入用户角色" v-model="queryParam.roleName"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="12">
|
|
|
+ <a-form-item label="部门分配">
|
|
|
+ <a-tree-select
|
|
|
+ style="width: 100%"
|
|
|
+ :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
|
|
|
+ :treeData="treeData"
|
|
|
+ v-model="queryParam.departId"
|
|
|
+ placeholder="无"
|
|
|
+ >
|
|
|
+ </a-tree-select>
|
|
|
+ </a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
@@ -31,18 +53,18 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="手机号码">
|
|
|
<a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="状态">
|
|
|
<a-select v-model="queryParam.status" placeholder="请选择用户状态查询">
|
|
|
<a-select-option value="">请选择用户状态</a-select-option>
|
|
|
<a-select-option value="1">正常</a-select-option>
|
|
|
- <a-select-option value="2">解冻</a-select-option>
|
|
|
+ <a-select-option value="2">冻结</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -85,6 +107,16 @@
|
|
|
{{ text ? text : '-' }}
|
|
|
</span>
|
|
|
</template>
|
|
|
+ <template slot="sex" slot-scope="text, record">
|
|
|
+ <span>
|
|
|
+ {{ text ? (text == 1 ? '男' : '女') : '未填写' }}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
+ <template slot="status" slot-scope="text, record">
|
|
|
+ <span>
|
|
|
+ {{ text ? (text == 1 ? '正常' : '冻结') : '未填写' }}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
|
|
|
<span slot="action" slot-scope="text, record">
|
|
|
<a @click="handleEdit(record)">编辑</a>
|
|
@@ -141,7 +173,7 @@
|
|
|
import UserModal from './modules/UserModal'
|
|
|
import PasswordModal from './modules/PasswordModal'
|
|
|
import { putAction } from '@/api/manage'
|
|
|
-import { frozenBatch } from '@/api/api'
|
|
|
+import { frozenBatch, queryIdTree } from '@/api/api'
|
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
|
import SysUserAgentModal from './modules/SysUserAgentModal'
|
|
|
|
|
@@ -156,6 +188,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
description: '这是用户管理页面',
|
|
|
+ treeData: [],
|
|
|
queryParam: {},
|
|
|
columns: [
|
|
|
/*{
|
|
@@ -192,7 +225,8 @@ export default {
|
|
|
title: '性别',
|
|
|
align: 'center',
|
|
|
width: 80,
|
|
|
- dataIndex: 'sex_dictText',
|
|
|
+ dataIndex: 'sex',
|
|
|
+ scopedSlots: { customRender: 'sex' },
|
|
|
sorter: true,
|
|
|
},
|
|
|
// {
|
|
@@ -235,7 +269,8 @@ export default {
|
|
|
title: '状态',
|
|
|
align: 'center',
|
|
|
width: 80,
|
|
|
- dataIndex: 'status_dictText',
|
|
|
+ dataIndex: 'status',
|
|
|
+ scopedSlots: { customRender: 'status' },
|
|
|
},
|
|
|
/* {
|
|
|
title: '创建时间',
|
|
@@ -268,7 +303,44 @@ export default {
|
|
|
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
|
|
|
},
|
|
|
},
|
|
|
+ created() {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.loadTreeData()
|
|
|
+ })
|
|
|
+ },
|
|
|
methods: {
|
|
|
+ // loadTree() {
|
|
|
+ // var that = this
|
|
|
+ // that.treeData = []
|
|
|
+ // that.departTree = []
|
|
|
+ // queryDepartTreeList().then((res) => {
|
|
|
+ // if (res.success) {
|
|
|
+ // //部门全选后,再添加部门,选中数量增多
|
|
|
+ // this.allTreeKeys = []
|
|
|
+ // for (let i = 0; i < res.result.length; i++) {
|
|
|
+ // let temp = res.result[i]
|
|
|
+ // that.treeData.push(temp)
|
|
|
+ // that.departTree.push(temp)
|
|
|
+ // that.setThisExpandedKeys(temp)
|
|
|
+ // that.getAllKeys(temp)
|
|
|
+ // // console.log(temp.id)
|
|
|
+ // }
|
|
|
+ // this.loading = false
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ loadTreeData() {
|
|
|
+ var that = this
|
|
|
+ queryIdTree().then((res) => {
|
|
|
+ if (res.success) {
|
|
|
+ that.treeData = []
|
|
|
+ for (let i = 0; i < res.result.length; i++) {
|
|
|
+ let temp = res.result[i]
|
|
|
+ that.treeData.push(temp)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
getAvatarView: function (avatar) {
|
|
|
return this.url.imgerver + '/' + avatar
|
|
|
},
|