Skip to content

T
template_vue
Commit ab996baa authored by kzy's avatar kzy
Browse files
Options

盘点和废弃的模糊搜索

parent c4634bc9
Show whitespace changes
Inline Side-by-side
Showing with 791 additions and 695 deletions
src/api/equipment/equipmentAbandonment.js 0 → 100644
View file @ ab996baa
import request from '@/utils/request'
import Qs from 'qs'
// 查询角色列表
export function listCheck(query) {
return request({
url: '/wbwarehouse/queryWbWarehouseByPagination',
method: 'get',
params: query
})
}
export function getlistRole() {
return request({
url: 'system/role/listAll',
method: 'get'
})
}
// 查询角色详细
export function getRole(businessId) {
return request({
url: '/system/role/detail/' + businessId,
method: 'get'
})
}
// 新增角色
export function addRole(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/add',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 修改角色
export function updateRole(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/role/update/' + businessId,
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色数据权限
export function dataScope(data) {
data = Qs.stringify(data)
return request({
url: '/system/role/dataScope',
method: 'put',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
// 角色状态修改
export function changeRoleStatus(businessId, flag) {
const data = {
businessId,
flag
}
return request({
url: '/system/role/changeStatus',
method: 'put',
params: data
})
}
// 删除角色
export function delRole(roleId) {
return request({
url: '/system/role/deleteLogical/' + roleId,
method: 'delete'
})
}
// 导出角色
export function exportRole(query) {
return request({
url: '/system/role/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/views/equipment/check.vue
View file @ ab996baa
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备编码" prop="equipmentCode">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
size="small"
......@@ -22,9 +22,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="位置" prop="location">
<el-form-item label="位置" prop="plocation">
<el-input
v-model="queryParams.location"
v-model="queryParams.plocation"
placeholder="请输入设备位置"
clearable
size="small"
......@@ -54,7 +54,7 @@
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="编码" prop="pn" width="120">
<el-table-column label="pn" prop="pn" width="120">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
......@@ -69,12 +69,12 @@
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="thickness">
<el-table-column label="厚度" prop="phd">
<template slot-scope="scope">
{{ scope.row.thickness || '-' }}
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="创建员" prop="createBy">
<el-table-column label="操作员" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
......
src/views/equipment/checkProcess.vue
View file @ ab996baa
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备编码" prop="equipmentCode">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
placeholder="请输入pn"
clearable
:maxlength="30"
size="small"
......@@ -54,7 +54,7 @@
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="编码" prop="pn" width="120">
<el-table-column label="pn" prop="pn" width="120">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
......@@ -69,9 +69,9 @@
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="thickness">
<el-table-column label="厚度" prop="phd">
<template slot-scope="scope">
{{ scope.row.thickness || '-' }}
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="创建员" prop="createBy">
......
src/views/equipment/equipmentAbandonment.vue
View file @ ab996baa
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="设备编码" prop="equipmentCode">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.equipmentCode"
placeholder="请输入设备编码"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
size="small"
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.roleKey"
v-model="queryParams.lot"
placeholder="请输入设备lot"
clearable
size="small"
......@@ -22,9 +22,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="位置" prop="location">
<el-form-item label="位置" prop="plocation">
<el-input
v-model="queryParams.location"
v-model="queryParams.plocation"
placeholder="请输入设备位置"
clearable
size="small"
......@@ -42,7 +42,7 @@
:type="typePrimary"
:size="smallSize"
:icon="addIcon"
>
>开始盘点
{{ check }}
</el-button>
</el-form-item>
......@@ -52,11 +52,11 @@
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备管理列表</div>
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="编码" prop="equipmentCode" width="120">
<el-table-column label="pn" prop="pn" width="120">
<template slot-scope="scope">
{{ scope.row.equipmentCode || '-' }}
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" width="120">
......@@ -64,24 +64,24 @@
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="location">
<el-table-column label="位置" prop="plocation">
<template slot-scope="scope">
{{ scope.row.location || '-' }}
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="thickness">
<el-table-column label="厚度" prop="phd">
<template slot-scope="scope">
{{ scope.row.thickness || '-' }}
{{ scope.row.phd || '-' }}
</template>
</el-table-column>
<el-table-column label="创建员" prop="createBy">
<el-table-column label="操作员" prop="createBy">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<el-table-column label="操作时间" :show-overflow-tooltip="true" 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="操作" class-name="small-padding fixed-width" width="150px">
......@@ -96,21 +96,20 @@
@click="handleDelete(scope.row)"
>废弃</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.page"
:limit.sync="queryParams.rows"
@pagination="getList"
/>
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :rules="rules" size="small" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="名称" prop="roleName">
<el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
</el-form-item>
......@@ -154,20 +153,20 @@
<!-- TODO: 单项详情信息表单配置 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-form-item label="编码：" prop="processName">
<el-input v-model.trim="singleDetails.equipmentCode" :readonly="true" />
<el-form-item label="编码：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
<el-form-item label="lot：" prop="workshop">
<el-input v-model.trim="singleDetails.lot" :readonly="true" />
</el-form-item>
<el-form-item label="位置：" prop="location">
<el-input v-model.trim="singleDetails.location" :readonly="true" />
<el-form-item label="位置：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="true" />
</el-form-item>
<el-form-item label="厚度：" prop="thickness">
<el-input v-model.trim="singleDetails.thickness" :readonly="true" />
</el-form-item>
<el-form-item label="操作时间：" prop="createTime">
{{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
<el-form-item label="操作员：" prop="createBy">
<el-input v-model.trim="singleDetails.createBy" :readonly="true" />
......@@ -175,10 +174,10 @@
</el-form>
</el-dialog>
</div>
</template>
</template>
<script>
import {
<script>
import {
addRole,
changeRoleStatus,
dataScope,
......@@ -187,11 +186,13 @@
getRole,
listRole,
updateRole
} from '@/api/system/role'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default {
} from '@/api/system/role'
import {listCheck} from '@/api/equipment/check'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default {
name: 'Role',
data() {
return {
......@@ -207,9 +208,9 @@
},
// 是否显示弹出层（数据详情）
openDetails: false,
// TODO: 模拟测试数据
equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
check: '开始盘点',
// // TODO: 模拟测试数据
// equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
// check: '开始盘点',
typeParent: 'text',
typePrimary: 'primary',
typeSuccess: 'success',
......@@ -295,11 +296,12 @@
tOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
page: 1,
rows: 10,
roleName: undefined,
roleKey: undefined,
flag: undefined
flag: undefined,
},
// 表单参数
form: {
......@@ -368,9 +370,9 @@
/** 查询角色列表 */
getList() {
this.loading = true
listRole(this.queryParams).then(
listCheck(this.queryParams).then(
response => {
this.roleList = response.rows
this.equipmentList = response.rows
this.total = response.total
this.loading = false
}
......@@ -507,7 +509,7 @@
},
/** 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.queryParams.page = 1
this.getList()
},
/** 重置按钮操作 */
......@@ -517,11 +519,11 @@
this.handleQuery()
},
// 多选框选中数据
// handleSelectionChange(selection) {
// this.ids = selection.map(item => item.roleId)
// this.single = selection.length !== 1
// this.multiple = !selection.length
// },
handleSelectionChange(selection) {
this.ids = selection.map(item => item.roleId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
// // 树权限（父子联动）
// handleCheckedTreeConnect(value, type) {
// if (type === 'menu') {
......@@ -677,10 +679,10 @@
})
}
}
}
</script>
<style lang="scss" scoped>
.aboutSingleDetails{
}
</script>
<style lang="scss" scoped>
.aboutSingleDetails{
.el-form-item{
.el-input >>> .el-input__inner {
-webkit-appearance: none;
......@@ -691,8 +693,8 @@
width: 100%;
}
}
}
.app-container {
}
.app-container {
font-size: 18px;
padding: 0;
......@@ -711,11 +713,10 @@
.el-switch {
margin-left: 15px;
}
}
}
.el-divider--vertical {
.el-divider--vertical {
height: 12em;
width: 4px;
}
</style>
\ No newline at end of file
}
</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