Skip to content

T
template_vue
Commit 8c562b61 authored by cat's avatar cat
Browse files
Options

3合1

parent 5169ac3b
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 119 deletions
src/api/equipment/printingCheck/index.js
View file @ 8c562b61
import request from '@/utils/request'
// 查询印刷列表
export function getYsList(queryParams, queryMaps) {
export function getYsList(queryMaps) {
return request({
url: '/wbwarehouseys/queryWbWarehouseYsByPagination',
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
src/api/processMangement/InventoryRecord.js
View file @ 8c562b61
import request from '@/utils/request'
// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
export function listLog(queryParams, queryMaps) {
export function listLog(queryMaps) {
return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
src/api/processMangement/processesCheck/index.js
View file @ 8c562b61
import request from '@/utils/request'
// 查询列表
export function listdevice(queryParams, queryMaps) {
export function listdevice(queryMaps) {
return request({
url: '/wbwarehouseinventory/queryWbWarehouseInventoryByPagination',
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......@@ -13,14 +12,3 @@ export function listdevice(queryParams, queryMaps) {
})
}
export function listLog(queryParams, queryMaps) {
return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
src/api/sample/inventoryRecord.js
View file @ 8c562b61
import request from '@/utils/request'
// TODO: 用来进行工序库的出入库记录的 分页+时间+普通字段的查询
export function listLog(queryParams, queryMaps) {
export function listLog(queryMaps) {
return request({
url: '/wbchemistrylog/queryWbChemistryLogByPagination',
method: 'post',
params: queryParams,
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
src/views/equipment/equipmentCheck/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryEntity.entity.pn"
v-model="queryParams.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入设备lot"
clearable
size="small"
......@@ -23,7 +23,7 @@
/>
</el-form-item>
<el-form-item label="盘点状态" prop="status">
<el-select v-model="queryEntity.entity.status" placeholder="请选择" clearable>
<el-select v-model="queryParams.entity.status" placeholder="请选择" clearable>
<el-option
v-for="item in options"
:key="item.value"
......@@ -193,9 +193,7 @@ export default {
// pn: '',
// lot: '',
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
entity: {
// TODO: 设备编码
pn: '',
......@@ -250,23 +248,23 @@ export default {
// 去除字段默认为0导致0对应的未盘点无法使用问题
let flag = 0
this.loading = true
if (this.queryEntity.entity.status === undefined || this.queryEntity.entity.status === '') {
if (this.queryParams.entity.status === undefined || this.queryParams.entity.status === '') {
flag = 1
}
if (flag === 1) {
this.queryEntity.entity.status = -1
this.queryParams.entity.status = -1
}
if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
this.dateRange = []
}
listdevice(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
listdevice(this.queryParams).then(response => {
// console.log('list', response)
this.equipmentList = response.rows
this.total = response.total
this.loading = false
})
if (flag === 1) {
this.queryEntity.entity.status = undefined
this.queryParams.entity.status = undefined
flag = 0
}
},
......@@ -294,7 +292,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
entity: {
// TODO: 设备编码
pn: '',
......
src/views/equipment/inventoryRecord/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<div class="ToolBar">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
ref="autoGetFocusInput"
v-model="queryEntity.entity.pn"
v-model="queryParams.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -18,7 +18,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -29,7 +29,7 @@
<el-form-item label="plocation" prop="plocation">
<el-input
v-model="queryEntity.entity.plocation"
v-model="queryParams.entity.plocation"
placeholder="请输入plocation"
clearable
:maxlength="inputMaxLength"
......@@ -40,7 +40,7 @@
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryEntity.entity.ptype"
v-model="queryParams.entity.ptype"
placeholder="请选择库类型"
filterable
clearable
......@@ -57,7 +57,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryEntity.entity.poperate"
v-model="queryParams.entity.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -299,10 +299,7 @@ export default {
page: 1,
rows: 10,
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
// TODO: 0表示倒序排序，1表示顺序排序
tableSortMark: 0,
......@@ -491,7 +488,7 @@ export default {
/** TODO:查询工序库的出入库记录列表 */
getList() {
this.loading = true
listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
listLog(this.queryParams).then(response => {
this.inventoryRecordList = response.rows
this.total = response.total
this.loading = false
......@@ -531,7 +528,7 @@ export default {
},
/** TODO: 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
......@@ -555,10 +552,10 @@ export default {
console.log('column', val)
// TODO:按照降序排序
if (val.order === 'descending') {
this.queryEntity.tableSortMark = 0
this.queryParams.tableSortMark = 0
} else {
// TODO:按照升序排序
this.queryEntity.tableSortMark = 1
this.queryParams.tableSortMark = 1
}
this.getList()
},
......@@ -620,11 +617,11 @@ export default {
rows: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
pn: this.queryEntity.entity.pn,
lot: this.queryEntity.entity.lot,
plocation: this.queryEntity.entity.plocation,
poperate: this.queryEntity.entity.poperate,
ptype: this.queryEntity.entity.ptype
pn: this.queryParams.entity.pn,
lot: this.queryParams.entity.lot,
plocation: this.queryParams.entity.plocation,
poperate: this.queryParams.entity.poperate,
ptype: this.queryParams.entity.ptype
}
return exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
src/views/equipment/printingCheck/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="lot" prop="pn">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="30"
......@@ -543,10 +543,7 @@ export default {
page: 1,
rows: 10,
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
entity: {
// TODO: lot
lot: ''
......@@ -633,7 +630,7 @@ export default {
if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
this.dateRange = []
}
getYsList(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(res => {
getYsList(this.queryParams).then(res => {
this.ysList = res.rows
this.total = res.total
this.loading = false
......@@ -1025,7 +1022,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
entity: {
// TODO: lot
......
src/views/processManagement/inventoryRecord/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<div class="ToolBar">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
ref="autoGetFocusInput"
v-model="queryEntity.entity.pn"
v-model="queryParams.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -18,7 +18,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -29,7 +29,7 @@
<el-form-item label="plocation" prop="plocation">
<el-input
v-model="queryEntity.entity.plocation"
v-model="queryParams.entity.plocation"
placeholder="请输入plocation"
clearable
:maxlength="inputMaxLength"
......@@ -40,7 +40,7 @@
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryEntity.entity.ptype"
v-model="queryParams.entity.ptype"
placeholder="请选择库类型"
filterable
clearable
......@@ -57,7 +57,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryEntity.entity.poperate"
v-model="queryParams.entity.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -121,7 +121,6 @@
:is="BaseTable"
:key="queryParams.rows"
:all-table-arguments="allTableArguments"
@n-index="nIndex"
@handle-detail="handleDetail"
@change-table-sort="changeTableSort"
/>
......@@ -299,10 +298,7 @@ export default {
page: 1,
rows: 10,
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
// TODO: 0表示倒序排序，1表示顺序排序
tableSortMark: 0,
......@@ -473,6 +469,7 @@ export default {
this.queryParams.beginTime = ''
this.queryParams.endTime = ''
}
console.log('queryParams', this.queryParams)
},
replace(value) {
return this.dictList.find(item => item.dictLabel === value).dictValue
......@@ -491,7 +488,8 @@ export default {
/** TODO:查询工序库的出入库记录列表 */
getList() {
this.loading = true
listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
listLog(this.queryParams).then(response => {
console.log('res', response)
this.inventoryRecordList = response.rows
this.total = response.total
this.loading = false
......@@ -531,7 +529,7 @@ export default {
},
/** TODO: 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
......@@ -555,10 +553,10 @@ export default {
console.log('column', val)
// TODO:按照降序排序
if (val.order === 'descending') {
this.queryEntity.tableSortMark = 0
this.queryParams.tableSortMark = 0
} else {
// TODO:按照升序排序
this.queryEntity.tableSortMark = 1
this.queryParams.tableSortMark = 1
}
this.getList()
},
......@@ -600,11 +598,11 @@ export default {
rows: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
pn: this.queryEntity.entity.pn,
lot: this.queryEntity.entity.lot,
plocation: this.queryEntity.entity.plocation,
poperate: this.queryEntity.entity.poperate,
ptype: this.queryEntity.entity.ptype
pn: this.queryParams.entity.pn,
lot: this.queryParams.entity.lot,
plocation: this.queryParams.entity.plocation,
poperate: this.queryParams.entity.poperate,
ptype: this.queryParams.entity.ptype
}
return exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
src/views/processManagement/processesCheck/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryEntity.entity.pn"
v-model="queryParams.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入设备lot"
clearable
size="small"
......@@ -23,7 +23,7 @@
/>
</el-form-item>
<el-form-item label="盘点状态" prop="status">
<el-select v-model="queryEntity.entity.status" placeholder="请选择" clearable>
<el-select v-model="queryParams.entity.status" placeholder="请选择" clearable>
<el-option
v-for="item in options"
:key="item.value"
......@@ -181,9 +181,7 @@ export default {
// pn: '',
// lot: '',
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
entity: {
// TODO: 设备编码
pn: '',
......@@ -237,23 +235,23 @@ export default {
// 去除字段默认为0导致0对应的未盘点无法使用问题
let flag = 0
this.loading = true
if (this.queryEntity.entity.status === undefined || this.queryEntity.entity.status === '') {
if (this.queryParams.entity.status === undefined || this.queryParams.entity.status === '') {
flag = 1
}
if (flag === 1) {
this.queryEntity.entity.status = -1
this.queryParams.entity.status = -1
}
if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
this.dateRange = []
}
listdevice(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
listdevice(this.queryParams).then(response => {
// console.log('list', response)
this.equipmentList = response.rows
this.total = response.total
this.loading = false
})
if (flag === 1) {
this.queryEntity.entity.status = undefined
this.queryParams.entity.status = undefined
flag = 0
}
},
......@@ -281,7 +279,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
entity: {
// TODO: 设备编码
pn: '',
......
src/views/sample/errorRecord/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<div class="ToolBar">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
ref="autoGetFocusInput"
v-model="queryEntity.entity.pn"
v-model="queryParams.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -17,7 +17,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -181,10 +181,7 @@ export default {
page: 1,
rows: 10,
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
// TODO: 0表示倒序排序，1表示顺序排序
tableSortMark: 0,
entity: {
......@@ -357,7 +354,7 @@ export default {
/** TODO:查询工序库的出入库记录列表 */
getList() {
this.loading = true
listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
listLog(this.queryParams).then(response => {
this.inventoryRecordList = response.rows
this.total = response.total
this.loading = false
......@@ -385,7 +382,7 @@ export default {
},
/** TODO: 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
......@@ -406,10 +403,10 @@ export default {
console.log('column', val)
// TODO:按照降序排序
if (val.order === 'descending') {
this.queryEntity.tableSortMark = 0
this.queryParams.tableSortMark = 0
} else {
// TODO:按照升序排序
this.queryEntity.tableSortMark = 1
this.queryParams.tableSortMark = 1
}
this.getList()
},
......@@ -433,9 +430,9 @@ export default {
row: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
pn: this.queryEntity.entity.pn,
lot: this.queryEntity.entity.lot,
poperate: this.queryEntity.entity.poperate
pn: this.queryParams.entity.pn,
lot: this.queryParams.entity.lot,
poperate: this.queryParams.entity.poperate
}
exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
src/views/sample/inventoryRecord/index.vue
View file @ 8c562b61
<template>
<div class="app-container">
<div class="ToolBar">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
<el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
ref="autoGetFocusInput"
v-model="queryEntity.entity.pn"
v-model="queryParams.entity.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -17,7 +17,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryEntity.entity.lot"
v-model="queryParams.entity.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -28,7 +28,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryEntity.entity.poperate"
v-model="queryParams.entity.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -214,10 +214,7 @@ export default {
page: 1,
rows: 10,
beginTime: '',
endTime: ''
},
queryEntity: {
endTime: '',
// TODO: 0表示倒序排序，1表示顺序排序
tableSortMark: 0,
entity: {
......@@ -390,7 +387,7 @@ export default {
/** TODO:查询工序库的出入库记录列表 */
getList() {
this.loading = true
listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
listLog(this.queryParams).then(response => {
this.inventoryRecordList = response.rows
this.total = response.total
this.loading = false
......@@ -418,7 +415,7 @@ export default {
},
/** TODO: 重置按钮操作 */
resetQuery() {
this.queryEntity = {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
......@@ -439,10 +436,10 @@ export default {
console.log('column', val)
// TODO:按照降序排序
if (val.order === 'descending') {
this.queryEntity.tableSortMark = 0
this.queryParams.tableSortMark = 0
} else {
// TODO:按照升序排序
this.queryEntity.tableSortMark = 1
this.queryParams.tableSortMark = 1
}
this.getList()
},
......@@ -466,9 +463,9 @@ export default {
row: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
pn: this.queryEntity.entity.pn,
lot: this.queryEntity.entity.lot,
poperate: this.queryEntity.entity.poperate
pn: this.queryParams.entity.pn,
lot: this.queryParams.entity.lot,
poperate: this.queryParams.entity.poperate
}
exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
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