提交修改

This commit is contained in:
quyixiao 2020-09-23 10:58:19 +08:00
parent 345a6b9e27
commit 1a92e78751
3 changed files with 142 additions and 28 deletions

View File

@ -8,3 +8,9 @@ export const apiGetFlowList = params => {
export const apiFlowInfo = params => {
return http({url: `/lz_management/user/lzflowmanager/info/${params}`, method: 'post'})
}
// 菜单管理列表
export const apiDepartmentMenuList = params => {
return http({ url: '/lz_management/user/lzflowmanager/menu/list', method: 'get', params })
}

View File

@ -1,4 +1,7 @@
<template>
<el-tabs type="border-card" @tab-click="handleClick" v-model="tabValue">
<el-tab-pane label="流程管理" name="0"></el-tab-pane>
<el-tab-pane label="流程列表" name="1"></el-tab-pane>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
@ -13,9 +16,7 @@
</el-form-item>
</el-form>
<el-tabs type="border-card" @tab-click="handleClick" v-model="tabValue">
<el-tab-pane label="流程管理" name="0"></el-tab-pane>
<el-tab-pane label="流程列表" name="1"></el-tab-pane>
<el-table v-if="tabValue=='1'"
:data="dataList"
border
@ -45,34 +46,45 @@
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible " ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<el-table v-if="tabValue=='0'"
:data="dataList"
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50" ></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="" > </el-table-column>
<el-table-column prop="gmtCreate" header-align="center" align="center" label="创建时间" > </el-table-column>
<el-table-column prop="gmtModified" header-align="center" align="center" label="修改时间" > </el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="流程名称" > </el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-tabs>
</div>
<div class="staff" v-if="tabValue=='0'" >
<el-card>
<el-row>
<el-col class="menu" :span="6">
<el-tree
ref="treeList"
:data="menuList"
:props="defaultProps"
:expand-on-click-node="false"
:highlight-current="true"
node-key="departmentId"
@node-click="handleNodeClick"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.departmentName}}</span>
<span>{{" " + data.realName}}</span>
</span>
</el-tree>
</el-col>
</el-row>
</el-card>
</div>
</el-tabs>
</template>
<script>
import AddOrUpdate from './lzflowmanager-add-or-update'
import {apiGetFlowList, apiFlowInfo} from '@/api/api_flow_manager'
import {apiGetFlowList, apiFlowInfo, apiDepartmentMenuList} from '@/api/api_flow_manager'
import {treeDataTranslate} from '@/utils'
import { apiOrganizationList, apiEmployeesList, apiUploadFile, apiExportFile } from '@/api/api_staff'
export default {
data () {
@ -81,20 +93,25 @@ export default {
dataForm: {
key: ''
},
menuList: [],
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false
addOrUpdateVisible: false,
defaultProps: {
children: 'list',
label: 'name'
},
}
},
components: {
AddOrUpdate
},
activated () {
this.getDataList()
this.handleGetMenuList()
},
methods: {
//
@ -114,12 +131,38 @@ export default {
this.dataListLoading = false
})
},
getTable () {
this.query.page = 1
this.handleGetTableList()
},
handleNodeClick (data) {
// highlight - current
this.query.departmentId = data.departmentId
this.getTable()
console.log('data', data)
},
//
async handleGetMenuList () {
let result = await apiDepartmentMenuList()
console.log('result: ', result)
this.menuList = result
},
handleClick (row) {
this.tabValue = row.name
if (this.tabValue === '1') {
this.getDataList()
} else if (this.tabValue === '0') {
// this.handleGetTableList()
}
},
//
handleGetTableList () {
apiDepartmentMenuList({}).then(res => {
this.dataList = treeDataTranslate(res, 'menuId')
this.dataListLoading = false
})
},
//
sizeChangeHandle (val) {
this.pageSize = val
@ -175,3 +218,61 @@ export default {
}
}
</script>
<style lang="scss">
.custom-tree-node span {
font-size: 16px !important;
}
</style>
<style lang="scss" >
.conatnt-name {
position: relative;
&-label {
position: absolute;
font-size: 10px;
background: rgba(24, 144, 255, 1);
border-radius: 5px;
color: #fff;
padding: 0 4px;
top: -4px;
transform: scale(0.7);
}
}
.el-tree-node__content {
margin: 10px 0 !important;
}
.el-table td,
.el-table th {
padding: 8px 0 !important;
}
</style>
<style lang="scss" scoped>
.staff .block,
.staff .table {
margin-left: 20px;
}
.el-form-item .el-form-item {
margin-bottom: 22px;
}
.add-wrap {
margin-bottom: 22px;
}
.turn-work-list {
background-color: pink;
padding-bottom: 10px;
margin-bottom: 20px;
}
.dialogVisible-tabs {
// width: 248px;
margin: 0 auto;
}
.bl-form3 {
&.el-pagination {
margin-top: 16px;
text-align: right;
}
}
.noInfo {
text-align: center;
}
</style>

View File

@ -2,6 +2,9 @@
<div class="staff">
<el-card>
<el-row>
<el-col class="menu" :span="6">
<el-tree
ref="treeList"
@ -128,6 +131,10 @@
</span>
</el-dialog>
</div>
</template>
<script>