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

Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_report

Browse Source
This commit is contained in:
杜建超 2020-09-23 18:15:26 +08:00
commit 0942452303
13 changed files with 487 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/api_equipment.js
View File

@ -130,3 +130,18 @@ export const apiGetCodes = data => {
return http({ url: `/lz_management/oneCode/get/getPrints`, method: 'post', data })
}
// 获取盘点次数
export const apiGetTCounts = data => {
return http({ url: `/lz_management/modules/count/tCountList`, method: 'post', data })
}
// 新增盘点次数
export const apiAddTCounts = () => {
return http({ url: `/lz_management/modules/count/newStart`, method: 'get', })
}
// 删除盘点次数
export const apiDelTCounts = data => {
return http({ url: `/lz_management/modules/count/tCountDelete`, method: 'post', data })
}

17
src/api/api_flow_manager.js
View File

@ -8,3 +8,20 @@ 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})
}
export const apiGetFlowInfo = params => {
return http({url: `/lz_management/user/lzflowmanager/get/flowInfo/${params}`, method: 'post'})
}
export const getFlow = params => {
return http({url: `/lz_management/user/lzflowmanager/get/flow/${params}`, method: 'post'})
}
export const saveFlow = (data) => {
return http({url: `/lz_management/user/lzflowmanager/save/flow`, method: 'post', data})
}

4
src/views/modules/device-manage/device-brand-detail.vue
View File

@ -129,7 +129,7 @@ export default {
this.$message('添加成功')
this.$emit('refreshDataList')
} else {
this.$$message.error(data.msg)
this.$message.error(data.msg)
}
});
} else {
@ -140,7 +140,7 @@ export default {
this.$message('更新成功')
this.$emit('refreshDataList')
} else {
this.$$message.error(data.msg)
this.$message.error(data.msg)
}
});
}

2
src/views/modules/device-manage/device-list-detail.vue
View File

@ -203,7 +203,7 @@ export default {
this.$message("更新成功");
this.$emit("refreshDataList");
} else {
this.$$message.error(data.msg);
this.$message.error(data.msg);
}
});
},

4
src/views/modules/device-manage/device-spec-detail.vue
View File

@ -198,7 +198,7 @@ export default {
this.$message('添加成功')
this.$emit('refreshDataList')
} else {
this.$$message.error(data.msg)
this.$message.error(data.msg)
}
});
} else {
@ -209,7 +209,7 @@ export default {
this.$message('更新成功')
this.$emit('refreshDataList')
} else {
this.$$message.error(data.msg)
this.$message.error(data.msg)
}
});
}

226
src/views/modules/device-manage/device-tcounts.vue Normal file
View File

@ -0,0 +1,226 @@
<template>
<div>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-button type="success" @click="addNewSpec()">新增一次盘点</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="data" style="width: 100%" @row-click="rowClick">
<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
<el-table-column prop="num" 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 fixed="right" header-align="center" align="center" width="100" label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="mini"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="specReq.page"
:page-sizes="[10, 20, 50, 100]"
:page-size="specReq.rows"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
<device-type-detail v-if="isShowDetail" ref="deviceTypeDetail" @refreshDataList="getData"></device-type-detail>
</div>
</template>
<script>
import { apiGetTCounts, apiAddTCounts, apiDelTCounts } from "@/api/api_equipment";
import DeviceTypeDetail from './device-type-detail.vue'
export default {
components: {
DeviceTypeDetail
},
data() {
return {
isShowSearch: true,
data: [],
name: "",
categorys: "",
input: "",
dataListLoading: false,
typeIndex: 0, //0现在是1级 1二级2三级
showHeader: false,
totalPage: 1,
departmentReaderOnly: false,
specReq: {
page: 1,
rows: 10,
sort: null,
order: null,
id: null,
isDelete: 0,
gmtCreate: null,
gmtModified: null,
count: null
},
isShowDetail: false
};
},
created() {
// this.handleGetImgCaptcha()
},
mounted() {
this.getData();
},
methods: {
addNewSpec(){
apiAddTCounts().then((data) =>{
if(data.code == 0){
this.$message(data.msg)
this.specReq.page = 1
this.getData()
}else{
this.$message.error(data.msg)
}
});
},
changeDepartment(type) {
if(type == 1){
//获取品牌
this.getBrands()
this.specReq.brandId = null
}else{
this.specReq.page = 1
this.getData()
}
},
sizeChangeHandle(val) {
this.specReq.page = 1
this.specReq.rows = val
this.getData();
},
currentChangeHandle(val) {
this.specReq.page = val
this.getData();
},
// 删除
handleDelete (val) {
this.$confirm('确定删除第“' + val.num + '”次盘点吗？删除后该类型将无法使用。如果该次盘点有盘点记录,将无法删除成功', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.delTCount(val.id)
}).catch(() => {
})
},
delTCount(id){
apiDelTCounts({page: 1,
rows: 10,
sort: null,
order: null,
id: id,
isDelete: 0,
gmtCreate: null,
gmtModified: null,
count:null
}).then((data) => {
console.log(data);
if (data && data.code === 0) {
this.$message('删除成功')
this.getData()
} else {
this.$message.error('删除失败' + data.msg)
}
this.dataListLoading = false;
});
},
getData() {
console.log("获取数据")
console.log(this.name)
console.log(this.categorys)
this.dataListLoading = true
apiGetTCounts(this.specReq).then((data) => {
console.log(data);
if (data && data.code === 0) {
this.data = data.rows.list;
this.totalPage = data.rows.totalCount
} else {
this.data = [];
}
this.dataListLoading = false;
});
},
btnSearch() {
this.specReq.page = 1
this.getData();
},
rowClick(row, event, column) {},
},
};
</script>
<style>
.el-row {
margin-bottom: 20px;
}
.el-col {
border-radius: 10px;
}
.bg-purple-dark {
background: #99a9bf;
}
.bg-purple {
background: #d3dce6;
}
.bg-purple-light {
background: #e5f2f1;
}
.grid-content {
border-radius: 4px;
min-height: 36px;
}
.row-bg {
padding: 10px 0;
background-color: #f9fafc;
}
.div_height {
height: 38px;
}
.div_width {
width: 100%;
}
.width_100 {
width: 100px;
}
.center {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding: 1em;
}
.flex {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
border: 1px solid;
}
.flex_son {
width: 100%;
height: 100%;
border: 0x solid;
}
</style>

4
src/views/modules/device-manage/device-type-detail.vue
View File

@ -102,7 +102,7 @@ export default {
this.$message('添加成功')
this.$emit('refreshDataList')
} else {
this.$$message.error(data.msg)
this.$message.error(data.msg)
}
});
} else {
@ -113,7 +113,7 @@ export default {
this.$message('更新成功')
this.$emit('refreshDataList')
} else {
this.$$message.error(data.msg)
this.$message.error(data.msg)
}
});
}

5
src/views/modules/device/device-detail.vue
View File

@ -391,7 +391,8 @@ export default {
getDeviceInfo() {
this.dataListLoading = true;
apiFindEquipmentByCode({}, this.deviceInfo.code).then((data) => {
console.log(data.data);
console.log(data);
if (data.code == 0) {
if (typeof data.data == "undefined") {
this.$message("未绑定设备");
@ -445,7 +446,7 @@ export default {
}
}
} else {
this.$message.error("异常");
this.$message.error("异常" + data.msg);
}
this.dataListLoading = false;

8
src/views/modules/device/device-staff-depat.vue
View File

@ -75,6 +75,10 @@ export default {
if(this.typeIndex == 0 || this.typeIndex == 3){
apiFindStaff(this.query).then(data => {
console.log(data)
if(data.code != 0){
this.$message.error("异常" + data.msg);
return
}
if(typeof data.data == 'undefined'){
}else{
this.query.currPage = data.data.currPage
@ -86,6 +90,10 @@ export default {
}else {
apiFindDepat(this.query).then(data => {
console.log(data)
if(data.code != 0){
this.$message.error("异常" + data.msg);
return
}
if(typeof data.data == 'undefined'){
}else{
this.query.currPage = data.data.currPage

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

@ -1,78 +1,108 @@
<template>
<div class="mod-config">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button v-if="isAuth('user:lzflowmanager:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button v-if="isAuth('user:lzflowmanager:delete')" type="danger" @click="deleteHandle()"
:disabled="dataListSelections.length <= 0">批量删除
</el-button>
</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>
<div class="mod-config" v-if="tabValue=='1'">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
</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
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-pagination v-if="tabValue=='1'"
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible " ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<el-table v-if="tabValue=='0'"
<el-table
: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-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="name" 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>
<el-pagination v-if="tabValue=='1'"
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</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-tabs>
</div>
<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-card>
</div>
</el-tabs>
</template>
<script>
import AddOrUpdate from './lzflowmanager-add-or-update'
import {apiGetFlowList, apiFlowInfo} from '@/api/api_flow_manager'
import {apiGetFlowList, apiFlowInfo, apiGetFlowInfo, apiDepartmentMenuList} from '@/api/api_flow_manager'
export default {
data () {
@ -81,20 +111,35 @@ export default {
dataForm: {
key: ''
},
tableData: [], // 表格数据
menuList: [],
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
query: {
page: 1,
limit: 20,
name: '',
pageTotal: 0,
departmentId: null,
staffId: 0
},
loading: false,
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false
addOrUpdateVisible: false,
defaultProps: {
children: 'list',
label: 'name'
}
}
},
components: {
AddOrUpdate
},
activated () {
this.getDataList()
this.handleGetMenuList()
},
methods: {
// 获取数据列表
@ -114,12 +159,36 @@ export default {
this.dataListLoading = false
})
},
getTable () {
this.query.page = 1
this.handleGetTableList()
},
handleNodeClick (data) {
this.query.staffId = data.staffId
this.getTable()
},
// 获取侧边架构列表
async handleGetMenuList () {
let result = await apiDepartmentMenuList()
this.menuList = result
},
handleClick (row) {
this.tabValue = row.name
if (this.tabValue === '1') {
this.getDataList()
}
},
async handleGetTableList (id) {
this.loading = true
let result = await apiGetFlowInfo(this.query.staffId)
if (result.code === 0) {
this.tableData = result.page.list
this.query.pageTotal = result.page.totalCount
} else {
this.$message.error(result.msg)
}
this.loading = false
},
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
@ -175,3 +244,70 @@ 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>

8
src/views/modules/staff/manage/index.vue
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>
@ -295,6 +302,7 @@ export default {
this.query.page = 1
this.handleGetTableList()
},
handleCurrentChange (val) {
console.log('val: ', val)
this.query.page = val

4
src/views/modules/sys/role/role-add-or-update.vue
View File

@ -7,7 +7,7 @@
@keyup.enter.native="handleConfirm()"
label-width="80px"
>
<el-form-item label="角色名称" prop="roleName">
<el-form-item label="角色名称">
<el-input
clearable
maxlength="20"
@ -17,7 +17,7 @@
placeholder="角色名称"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input
clearable
maxlength="30"

5
src/views/modules/sys/user/user-add-or-update.vue
View File

@ -70,8 +70,7 @@
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<el-form-item label="关联角色" size="mini" prop="roleIdList">
<el-form-item label="关联角色" size="mini" prop="roleIdList">
<el-checkbox-group v-model="dataForm.roleIdList">
<el-checkbox
v-for="role in roleList"
@ -80,6 +79,8 @@
>{{ role.roleName }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="handleConfirm()">确定</el-button>