Skip to content

9
91isoft_vue_manage
Commit 99ee7450 authored by yf's avatar yf
Browse files
Options

显示调通 --杨帆

parent b15898e2
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 120 deletions
src/api/system/dept.js
View file @ 99ee7450
import request from '@/utils/request'
import Qs from 'qs'
// 查询部门列表
export function listDept(query) {
return request({
url: '/authority/system/dept/list',
method: 'post',
url: '/system/dept/list',
method: 'get',
params: query
})
}
// 查询部门列表
export function listAllDept() {
return request({
url: '/authority/system/dept/listAll',
method: 'post'
url: '/system/dept/list',
method: 'get'
})
}
// 查询部门列表（排除节点）
export function listDeptExcludeChild(deptId) {
return request({
url: '/authority/system/dept/list/exclude/' + deptId,
url: '/system/dept/list/exclude/' + deptId,
method: 'get'
})
}
......@@ -26,7 +27,7 @@ export function listDeptExcludeChild(deptId) {
// 查询部门详细
export function getDept(deptId) {
return request({
url: '/authority/system/dept/' + deptId,
url: '/system/dept/detail/' + deptId,
method: 'get'
})
}
......@@ -34,48 +35,65 @@ export function getDept(deptId) {
// 查询部门下拉树结构
export function treeselect() {
return request({
url: '/authority/system/dept/treeselect',
url: '/system/dept/treeSelect',
method: 'get'
})
}
// 查询部门下拉树结构
export function getChildrenDept(userId) {
return request({
url: '/system/dept/getChildren/'+userId,
method: 'get'
})
}
// 根据角色ID查询部门树结构
export function roleDeptTreeselect(roleId) {
export function roleDeptTreeselect(roleId,menuId) {
return request({
url: '/authority/system/dept/roleDeptTreeselect/' + roleId,
url: '/system/dept/roleDeptTreeSelect/' + roleId + '/'+ menuId,
method: 'get'
})
}
// 新增部门
export function addDept(data) {
console.log(data)
data = Qs.stringify(data)
console.log(11112311111111)
console.log(data)
return request({
url: '/authority/system/dept',
url: '/system/dept/add',
method: 'post',
data: data
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 修改部门
export function updateDept(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/authority/system/dept',
url: '/system/dept/update/' + businessId,
method: 'put',
data: data
data
})
}
// 删除部门
export function delDept(deptId) {
return request({
url: '/authority/system/dept/' + deptId,
url: '/system/dept/deleteLogical/' + deptId,
method: 'delete'
})
}
// 查询无部门人员
export function queryUserWithoutDept(params) {
return request({
url: '/authority/system/dept/getAllUserWithoutDept',
url: '/system/dept/getAllUserWithoutDept',
method: 'get',
params
})
......@@ -83,7 +101,7 @@ export function queryUserWithoutDept(params) {
// 根据查询内容查询用户
export function queryUserByName(params) {
return request({
url: '/authority/system/user/getListWithDept',
url: '/system/user/getListWithDept',
method: 'get',
params
})
......@@ -91,7 +109,7 @@ export function queryUserByName(params) {
// 查询该部门下的所有用户
export function queryUserByDeptId(id, params) {
return request({
url: '/authority/system/dept/getAllUserByDeptId/' + id,
url: '/system/dept/getAllUserByDeptId/' + id,
method: 'get',
params
})
......@@ -99,7 +117,7 @@ export function queryUserByDeptId(id, params) {
// 转部门
export function transformDept(data) {
return request({
url: '/authority/system/user/updateUserDept',
url: '/system/dept/update/{businessId}',
method: 'put',
data
})
......@@ -107,7 +125,7 @@ export function transformDept(data) {
// 查询部门详细
export function getDeptDetail(deptId) {
return request({
url: '/authority/system/dept/' + deptId,
url: '/system/dept/detail/' + deptId,
method: 'get'
})
}
src/api/system/menu.js
View file @ 99ee7450
import request from '@/utils/request'
import Qs from 'qs'
// 查询菜单列表
export function listMenu(query) {
return request({
url: '/authority/system/menu/list',
url: '/system/menu/list',
method: 'get',
params: query
})
......@@ -11,7 +12,7 @@ export function listMenu(query) {
// 查询菜单列表-全部
export function listAllMenu(query) {
return request({
url: '/authority/system/menu/listAll',
url: '/system/menu/listAll',
method: 'get',
params: query
})
......@@ -19,16 +20,15 @@ export function listAllMenu(query) {
// 查询菜单列表
export function findAllMenu(query) {
return request({
url: '/authority/system/menu/findAllMenu?menuName=' + query,
url: '/system/menu/findAllMenu?menu_name=' + query,
method: 'get'
})
}
// 查询菜单详细
export function getMenu(menuId) {
return request({
url: '/authority/system/menu/' + menuId,
url: '/system/menu/detail/' + menuId,
method: 'get'
})
}
......@@ -45,7 +45,7 @@ export function getWork() {
// 查询菜单下拉树结构
export function treeselect() {
return request({
url: '/authority/system/menu/treeselect',
url: '/system/menu/treeSelect',
method: 'get'
})
}
......@@ -53,38 +53,52 @@ export function treeselect() {
// 根据角色ID查询菜单下拉树结构
export function roleMenuTreeselect(roleId) {
return request({
url: '/authority/system/menu/roleMenuTreeselect/' + roleId,
url: '/system/menu/roleMenuTreeSelect/' + roleId,
method: 'get'
})
}
export function getAllMenu() {
return request({
url: '/authority/getMenuTree',
url: '/getMenuTree',
method: 'get'
})
}
// 新增菜单
export function addMenu(data) {
data = Qs.stringify(data)
return request({
url: '/authority/system/menu',
url: '/system/menu/add',
method: 'post',
data: data
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 根据角色ID查询菜单下拉树结构 无按钮
export function roleMenuTreeselectMC(roleId) {
return request({
url: '/system/menu/treeSelectMC/' + roleId,
method: 'get'
})
}
// 修改菜单
export function updateMenu(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/authority/system/menu',
url: '/system/menu/update/'+ businessId,
method: 'put',
data: data
data
})
}
// 删除菜单
export function delMenu(menuId) {
return request({
url: '/authority/system/menu/' + menuId,
url: '/system/menu/deleteLogical/' + menuId,
method: 'delete'
})
}
src/views/system/dept/index.vue
View file @ 99ee7450
<template>
<div class="app-container">
<el-form :inline="true">
<el-form-item label="部门名称">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
:maxlength="30"
......@@ -11,7 +11,7 @@
/>
</el-form-item>
<el-form-item label="部门状态">
<el-select v-model="queryParams.status" placeholder="请选择部门状态" clearable size="small">
<el-select v-model="queryParams.flag" placeholder="请选择部门状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
......@@ -39,27 +39,28 @@
<el-table
:data="deptList"
row-key="deptId"
v-loading="Loading"
row-key="businessId"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column
label="序号"
type="index"
width="50">
</el-table-column>
<el-table-column
label="部门编号">
<template v-slot:default="scope">
{{ scope.row.deptId }}
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="序号"-->
<!-- type="index"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="部门编号">-->
<!-- <template v-slot:default="scope">-->
<!-- {{ scope.row.businessId }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="deptName" label="部门名称" width="260" />
<el-table-column :show-overflow-tooltip="true" prop="orderNum" label="排序" width="200" />
<el-table-column :show-overflow-tooltip="true" prop="status" label="部门状态" :formatter="statusFormat" width="100" />
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createTime" width="200">
<el-table-column :show-overflow-tooltip="true" prop="flag" label="部门状态" :formatter="statusFormat" width="100" />
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate" width="200">
<template slot-scope="scope">
<span>{{scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -148,9 +149,16 @@
</el-col>
<el-col :span="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio label="0">正常</el-radio>
<el-radio label="1">停用</el-radio>
<!-- <el-radio-group v-model="form.flag">-->
<!-- <el-radio label="0">正常</el-radio>-->
<!-- <el-radio label="1">停用</el-radio>-->
<!-- </el-radio-group>-->
<el-radio-group v-model="form.flag">
<el-radio
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -174,6 +182,10 @@ export default {
components: { Treeselect },
data() {
return {
// 搜索条件
showSearch: true,
// 遮罩
Loading: true,
// 表格树数据
deptList: [],
// 部门树选项
......@@ -187,7 +199,7 @@ export default {
// 查询参数
queryParams: {
deptName: undefined,
status: undefined
flag: undefined
},
// 表单参数
form: {},
......@@ -228,8 +240,10 @@ export default {
methods: {
/** 查询部门列表 */
getList() {
this.Loading = true
listDept(this.queryParams).then(response => {
this.deptList = this.handleTree(response.data, 'deptId')
this.deptList = this.handleTree(response.data, 'businessId')
this.Loading = false
})
},
/** 转换部门数据结构 */
......@@ -238,14 +252,14 @@ export default {
delete node.children
}
return {
id: node.deptId,
id: node.businessId,
label: node.deptName,
children: node.children
}
},
// 字典状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status)
return this.selectDictLabel(this.statusOptions, row.flag)
},
// 取消按钮
cancel() {
......@@ -255,14 +269,14 @@ export default {
// 表单重置
reset() {
this.form = {
deptId: undefined,
businessId: undefined,
parentId: undefined,
deptName: undefined,
orderNum: undefined,
leader: undefined,
phone: undefined,
email: undefined,
status: '0'
flag: '0'
}
this.resetForm('form')
},
......@@ -271,37 +285,37 @@ export default {
handleAdd(row) {
this.reset()
if (row !== undefined) {
this.form.parentId = row.deptId
this.form.parentId = row.businessId
}
this.open = true
this.title = '添加'
this.title = '添加部门'
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, 'deptId')
this.deptOptions = this.handleTree(response.data, 'businessId')
})
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.deptName = undefined
this.queryParams.status = undefined
this.queryParams.flag = undefined
this.getList()
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
getDept(row.deptId).then(response => {
getDept(row.businessId).then(response => {
this.form = response.data
this.open = true
this.title = '修改'
})
listDeptExcludeChild(row.deptId).then(response => {
this.deptOptions = this.handleTree(response.data, 'deptId')
listDeptExcludeChild(row.businessId).then(response => {
this.deptOptions = this.handleTree(response.data, 'businessId')
})
},
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.deptId !== undefined) {
if (this.form.businessId !== undefined) {
updateDept(this.form).then(response => {
if (response.code === 200) {
this.$message({
......@@ -334,7 +348,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return delDept(row.deptId)
return delDept(row.businessId)
}).then(() => {
this.getList()
this.$message({
......
src/views/system/menu/index.vue
View file @ 99ee7450
......@@ -27,7 +27,7 @@
<el-table
v-loading="loading"
:data="menuList"
:row-key="`menuId`"
:row-key="`businessId`"
:default-expand-all="true"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
......@@ -53,9 +53,9 @@
{{ scope.row.component || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime">
<el-table-column label="创建时间" align="center" prop="createDate">
<template slot-scope="scope">
<span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -91,7 +91,7 @@
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-switch
v-model="scope.row.status"
v-model="scope.row.flag"
v-hasPermi="['system:menu:toggle']"
active-value="0"
inactive-value="1"
......@@ -215,7 +215,7 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.menuType !== 'f'" label="菜单状态">
<el-radio-group v-model="form.status">
<el-radio-group v-model="form.flag">
<el-radio label="0">启用</el-radio>
<el-radio label="1">停用</el-radio>
</el-radio-group>
......@@ -254,10 +254,11 @@
</template>
<script>
import { listMenu, getMenu, delMenu, addMenu, updateMenu, getWork, findAllMenu, listAllMenu } from '@/api/system/menu'
import { listMenu, getMenu, delMenu, addMenu, updateMenu, findAllMenu } from '@/api/system/menu'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import IconSelect from '@/components/IconSelect'
import dictCons from '@/utils/dictCons'
export default {
name: 'Menu',
......@@ -298,8 +299,8 @@ export default {
],
// 查询参数
queryParams: {
menuName: '',
visible: undefined
menuName: undefined,
flag: undefined
},
// 表单参数
form: {
......@@ -333,16 +334,25 @@ export default {
}
}
},
// created() {
// this.getList()
// this.getDicts('SYS_SHOW_HIDE').then(response => {
// this.visibleOptions = response.data
// })
// // this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
// // this.statusOptions = response.data
// // })
// getWork().then(response => {
// this.workFlows = response.data
// })
// },
created() {
this.getList()
this.getDicts('SYS_SHOW_HIDE').then(response => {
this.getDicts(dictCons['SHOW_HIDE']).then(response => {
this.visibleOptions = response.data
})
// this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
// this.statusOptions = response.data
// })
getWork().then(response => {
this.workFlows = response.data
this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
this.statusOptions = response.data
})
},
methods: {
......@@ -355,14 +365,14 @@ export default {
this.loading = true
if (this.queryParams.menuName) {
findAllMenu(this.queryParams.menuName).then(response => {
this.menuList = this.handleTree(response.data.filter(menu => { return menu.menuId }), 'menuId')
this.menuList = this.handleTree(response.data.filter(menu => { return menu.businessId }), 'businessId')
this.loading = false
}).catch(e => {
this.loading = false
})
} else {
listAllMenu(this.queryParams).then(response => {
const menu = this.handleTree(response.data.filter(menu => { return menu.menuId }), 'menuId')
listMenu(this.queryParams).then(response => {
const menu = this.handleTree(response.data.filter(menu => { return menu.businessId }), 'businessId')
this.$set(this, 'menuList', menu)
this.loading = false
}).catch(e => {
......@@ -376,17 +386,17 @@ export default {
delete node.children
}
return {
id: node.menuId,
id: node.businessId,
label: node.menuName,
children: node.children
}
},
/** 查询菜单下拉树结构 */
getTreeselect() {
listAllMenu().then(response => {
listMenu().then(response => {
this.menuOptions = []
const menu = { menuId: 0, menuName: '主类目', children: [] }
menu.children = this.handleTree(response.data.filter(menu => { return menu.menuId }), 'menuId')
const menu = { businessId: 0, menuName: '主类目', children: [] }
menu.children = this.handleTree(response.data.filter(menu => { return menu.businessId }), 'businessId')
this.menuOptions.push(menu)
})
},
......@@ -402,7 +412,7 @@ export default {
if (row.menuType === 'f') {
return ''
}
return this.selectDictLabel(this.statusOptions, row.status)
return this.selectDictLabel(this.statusOptions, row.flag)
},
// 取消按钮
cancel() {
......@@ -412,7 +422,7 @@ export default {
// 表单重置
reset() {
this.form = {
menuId: undefined,
businessId: undefined,
parentId: 0,
menuName: undefined,
icon: undefined,
......@@ -422,7 +432,7 @@ export default {
isFrame: '1',
visible: '0',
isProcess: '1',
status: '0'
flag: '0'
}
this.resetForm('form')
},
......@@ -430,7 +440,7 @@ export default {
handleQuery() {
this.loading = true
findAllMenu(this.queryParams.menuName).then(response => {
this.menuList = this.handleTree(response.data.filter(menu => { return menu.menuId }), 'menuId')
this.menuList = this.handleTree(response.data.filter(menu => { return menu.businessId }), 'businessId')
this.loading = false
}).catch(e => {
this.loading = false
......@@ -439,7 +449,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.queryParams.menuName = ''
this.queryParams.status = undefined
this.queryParams.flag = undefined
this.getList()
},
/** 新增按钮操作 */
......@@ -447,7 +457,7 @@ export default {
this.reset()
this.getTreeselect()
if (row != null) {
this.form.parentId = row.menuId
this.form.parentId = row.businessId
}
this.open = true
this.title = '添加'
......@@ -456,14 +466,14 @@ export default {
handleUpdate(row) {
this.reset()
this.getTreeselect()
getMenu(row.menuId).then(response => {
getMenu(row.businessId).then(response => {
this.form = response.data
this.open = true
this.title = '修改'
})
},
handleStatusChange(row) {
const text = row.status === '0' ? '启用' : '停用'
const text = row.flag === '0' ? '启用' : '停用'
this.$confirm(`“${row.menuName}”菜单即将被${text}，是否继续？`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -476,14 +486,14 @@ export default {
type: 'success'
})
}).catch(function() {
row.status = row.status === '0' ? '1' : '0'
row.flag = row.flag === '0' ? '1' : '0'
})
},
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.menuId !== undefined) {
if (this.form.businessId !== undefined) {
this.form.isSee = this.form.visible
updateMenu(this.form).then(response => {
if (response.code === 200) {
......@@ -517,7 +527,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return delMenu(row.menuId)
return delMenu(row.businessId)
}).then(() => {
this.getList()
this.$message({
......@@ -530,26 +540,26 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container {
font-size: 18px;
padding: 0;
.placeholder{
height:1.3vh;
background-color: #F4F4F4;
margin-bottom:10px
}
.table-drop{
vertical-align: 2px;
line-height: 20px;
margin-left: 15px
}
.el-switch{
margin-left: 15px;
}
.icon-list {
div {
white-space: nowrap;
}
.app-container {
font-size: 18px;
padding: 0;
.placeholder{
height:1.3vh;
background-color: #F4F4F4;
margin-bottom:10px
}
.table-drop{
vertical-align: 2px;
line-height: 20px;
margin-left: 15px
}
.el-switch{
margin-left: 15px;
}
.icon-list {
div {
white-space: nowrap;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment