wulin/wl_management_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-23 15:15:37 +08:00
parent b9a5c0b359
commit 9612cbc237
3 changed files with 108 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/api_flow_manager.js
View File

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

169
src/views/modules/result/role/lzflowmanager.vue
View File

@ -1,54 +1,42 @@
<template> <template>
<el-tabs type="border-card" @tab-click="handleClick" v-model="tabValue"> <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="0"></el-tab-pane>
<el-tab-pane label="流程列表" name="1"></el-tab-pane> <el-tab-pane label="流程列表" name="1"></el-tab-pane>
<div class="mod-config"> <div class="mod-config" v-if="tabValue=='1'">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
<el-button v-if="isAuth('user:lzflowmanager:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> </el-form-item>
<el-button v-if="isAuth('user:lzflowmanager:delete')" type="danger" @click="deleteHandle()" </el-form>
:disabled="dataListSelections.length <= 0">批量删除
</el-button>
</el-form-item>
</el-form>
<el-table v-if="tabValue=='1'" <el-table
:data="dataList" :data="dataList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@selection-change="selectionChangeHandle" @selection-change="selectionChangeHandle"
style="width: 100%;"> style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50" ></el-table-column> <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="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="name" 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="gmtCreate" 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 prop="gmtModified" 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-table>
<el-pagination v-if="tabValue=='1'" <el-pagination v-if="tabValue=='1'"
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@current-change="currentChangeHandle" @current-change="currentChangeHandle"
:current-page="pageIndex" :current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="totalPage" :total="totalPage"
layout="total, sizes, prev, pager, next, jumper"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> </div>
<add-or-update v-if="addOrUpdateVisible " ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
<div class="staff" v-if="tabValue=='0'" > <div class="staff" v-if="tabValue=='0'">
<el-card> <el-card>
<el-row> <el-row>
<el-col class="menu" :span="6"> <el-col class="menu" :span="6">
@ -62,29 +50,59 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
> >
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.departmentName}}</span> <span>{{ data.departmentName }}</span>
<span>{{" " + data.realName}}</span> <span>{{ ' ' + data.realName }}</span>
</span> </span>
</el-tree> </el-tree>
</el-col> </el-col>
<el-col :span="18">
<div class="block">
<el-form :inline="true">
<el-form-item>
<el-button type="primary" @click="getTable">新增流程</el-button>
</el-form-item>
</el-form>
</div>
<div class="table">
<el-table
v-loading="loading"
:data="tableData"
:header-cell-style="{'color': '#909399', 'background-color': '#f5f7fa'}"
style="width: 100%"
height="600">
<el-table-column header-align="center" align="center" label="ID" prop="id"></el-table-column>
<el-table-column header-align="center" align="center" label="流程名称" prop="name">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{scope.row.name}}</el-button>
</template>
</el-table-column>
<el-table-column header-align="center" align="center" label="类型" prop="type">
<template slot-scope="scope">
<div class="conatnt-name">
<span>{{ scope.row.type === 'type1' ? '月初目标' :'月未总结' }}</span>
</div>
</template>
</el-table-column>
<el-table-column header-align="center" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" @click="handleView(scope.row)">编辑流程</el-button>
</template>
</el-table-column>
</el-table>
<add-or-update v-if="addOrUpdateVisible " ref="addOrUpdate" @refreshDataList="handleGetTableList"></add-or-update>
</div>
</el-col>
</el-row> </el-row>
</el-card> </el-card>
</div> </div>
</el-tabs> </el-tabs>
</template> </template>
<script> <script>
import AddOrUpdate from './lzflowmanager-add-or-update' import AddOrUpdate from './lzflowmanager-add-or-update'
import {apiGetFlowList, apiFlowInfo, apiDepartmentMenuList} from '@/api/api_flow_manager' import {apiGetFlowList, apiFlowInfo, apiGetFlowInfo, apiDepartmentMenuList} from '@/api/api_flow_manager'
import {treeDataTranslate} from '@/utils'
import { apiOrganizationList, apiEmployeesList, apiUploadFile, apiExportFile } from '@/api/api_staff'
export default { export default {
data () { data () {
@ -93,18 +111,28 @@ export default {
dataForm: { dataForm: {
key: '' key: ''
}, },
tableData: [], // 表格数据
menuList: [], menuList: [],
dataList: [], dataList: [],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
query: {
page: 1,
limit: 20,
name: '',
pageTotal: 0,
departmentId: null,
staffId: 0
},
loading: false,
dataListLoading: false, dataListLoading: false,
dataListSelections: [], dataListSelections: [],
addOrUpdateVisible: false, addOrUpdateVisible: false,
defaultProps: { defaultProps: {
children: 'list', children: 'list',
label: 'name' label: 'name'
}, }
} }
}, },
components: { components: {
@ -136,32 +164,30 @@ export default {
this.handleGetTableList() this.handleGetTableList()
}, },
handleNodeClick (data) { handleNodeClick (data) {
// highlight - current this.query.staffId = data.staffId
this.query.departmentId = data.departmentId
this.getTable() this.getTable()
console.log('data', data)
}, },
// 获取侧边架构列表 // 获取侧边架构列表
async handleGetMenuList () { async handleGetMenuList () {
let result = await apiDepartmentMenuList() let result = await apiDepartmentMenuList()
console.log('result: ', result)
this.menuList = result this.menuList = result
}, },
handleClick (row) { handleClick (row) {
this.tabValue = row.name this.tabValue = row.name
if (this.tabValue === '1') { if (this.tabValue === '1') {
this.getDataList() this.getDataList()
} else if (this.tabValue === '0') {
// this.handleGetTableList()
} }
}, },
// 获取数据列表 async handleGetTableList (id) {
handleGetTableList () { this.loading = true
apiDepartmentMenuList({}).then(res => { let result = await apiGetFlowInfo(this.query.staffId)
this.dataList = treeDataTranslate(res, 'menuId') if (result.code === 0) {
this.dataListLoading = false this.tableData = result.page.list
}) this.query.pageTotal = result.page.totalCount
} else {
this.$message.error(result.msg)
}
this.loading = false
}, },
// 每页数 // 每页数
sizeChangeHandle (val) { sizeChangeHandle (val) {
@ -224,9 +250,10 @@ export default {
font-size: 16px !important; font-size: 16px !important;
} }
</style> </style>
<style lang="scss" > <style lang="scss">
.conatnt-name { .conatnt-name {
position: relative; position: relative;
&-label { &-label {
position: absolute; position: absolute;
font-size: 10px; font-size: 10px;
@ -238,9 +265,11 @@ export default {
transform: scale(0.7); transform: scale(0.7);
} }
} }
.el-tree-node__content { .el-tree-node__content {
margin: 10px 0 !important; margin: 10px 0 !important;
} }
.el-table td, .el-table td,
.el-table th { .el-table th {
padding: 8px 0 !important; padding: 8px 0 !important;
@ -251,27 +280,33 @@ export default {
.staff .table { .staff .table {
margin-left: 20px; margin-left: 20px;
} }
.el-form-item .el-form-item { .el-form-item .el-form-item {
margin-bottom: 22px; margin-bottom: 22px;
} }
.add-wrap { .add-wrap {
margin-bottom: 22px; margin-bottom: 22px;
} }
.turn-work-list { .turn-work-list {
background-color: pink; background-color: pink;
padding-bottom: 10px; padding-bottom: 10px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.dialogVisible-tabs { .dialogVisible-tabs {
// width: 248px; // width: 248px;
margin: 0 auto; margin: 0 auto;
} }
.bl-form3 { .bl-form3 {
&.el-pagination { &.el-pagination {
margin-top: 16px; margin-top: 16px;
text-align: right; text-align: right;
} }
} }
.noInfo { .noInfo {
text-align: center; text-align: center;
} }

1
src/views/modules/staff/manage/index.vue
View File

@ -302,6 +302,7 @@ export default {
this.query.page = 1 this.query.page = 1
this.handleGetTableList() this.handleGetTableList()
}, },
handleCurrentChange (val) { handleCurrentChange (val) {
console.log('val: ', val) console.log('val: ', val)
this.query.page = val this.query.page = val