Commit e14ebb65 authored by W_Y's avatar W_Y

前段传参

parent d1d4c725
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
export function getYsList(queryMaps) {
return request({
url: '/wbwarehouseys/queryWbWarehouseYsByPagination',
method: 'post',
method: 'get',
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
......@@ -4,7 +4,7 @@ import request from '@/utils/request'
export function listLog(queryMaps) {
return request({
url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
method: 'post',
method: 'get',
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
......@@ -4,7 +4,7 @@ import request from '@/utils/request'
export function listdevice(queryMaps) {
return request({
url: '/wbwarehouseinventory/queryWbWarehouseInventoryByPagination',
method: 'post',
method: 'get',
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
......@@ -4,7 +4,7 @@ import request from '@/utils/request'
export function listLog(queryMaps) {
return request({
url: '/wbchemistrylog/queryWbChemistryLogByPagination',
method: 'post',
method: 'get',
data: queryMaps,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
......
......@@ -3,7 +3,7 @@
<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="queryParams.entity.pn"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入设备lot"
clearable
size="small"
......@@ -23,7 +23,7 @@
/>
</el-form-item>
<el-form-item label="盘点状态" prop="status">
<el-select v-model="queryParams.entity.status" placeholder="请选择" clearable>
<el-select v-model="queryParams.status" placeholder="请选择" clearable>
<el-option
v-for="item in options"
:key="item.value"
......@@ -194,15 +194,13 @@ export default {
// lot: '',
beginTime: '',
endTime: '',
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 1,
status: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 1,
status: ''
},
// 表单参数
form: {}
......@@ -250,11 +248,11 @@ export default {
// 去除字段默认为0导致0对应的未盘点无法使用问题
let flag = 0
this.loading = true
if (this.queryParams.entity.status === undefined || this.queryParams.entity.status === '') {
if (this.queryParams.status === undefined || this.queryParams.status === '') {
flag = 1
}
if (flag === 1) {
this.queryParams.entity.status = -1
this.queryParams.status = -1
}
if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
this.dateRange = []
......@@ -266,7 +264,7 @@ export default {
this.loading = false
})
if (flag === 1) {
this.queryParams.entity.status = undefined
this.queryParams.status = undefined
flag = 0
}
},
......@@ -299,15 +297,13 @@ export default {
rows: 10,
beginTime: '',
endTime: '',
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 1,
status: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 1,
status: ''
}
this.dateRange = []
this.resetForm('queryForm')
......
......@@ -7,7 +7,7 @@
<el-input
ref="autoGetFocusInput"
v-model="queryParams.entity.pn"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -18,7 +18,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -29,7 +29,7 @@
<el-form-item label="plocation" prop="plocation">
<el-input
v-model="queryParams.entity.plocation"
v-model="queryParams.plocation"
placeholder="请输入plocation"
clearable
:maxlength="inputMaxLength"
......@@ -40,7 +40,7 @@
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryParams.entity.ptype"
v-model="queryParams.ptype"
placeholder="请选择库类型"
filterable
clearable
......@@ -57,7 +57,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryParams.entity.poperate"
v-model="queryParams.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -302,19 +302,16 @@ export default {
endTime: '',
// TODO: 0表示倒序排序,1表示顺序排序
tableSortMark: 0,
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入,2出,3修正,4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入,2出,3修正,4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
},
// TODO: list记录表名
listName: '出入库记录列表',
......@@ -539,19 +536,16 @@ export default {
endTime: '',
// TODO: 0表示倒序排序,1表示顺序排序
tableSortMark: 0,
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入,2出,3修正,4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入,2出,3修正,4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
this.dateRange = []
this.handleQuery()
......@@ -632,11 +626,11 @@ export default {
rows: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
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
pn: this.queryParams.pn,
lot: this.queryParams.lot,
plocation: this.queryParams.plocation,
poperate: this.queryParams.poperate,
ptype: this.queryParams.ptype
}
return exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
......@@ -3,7 +3,7 @@
<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="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入lot"
clearable
:maxlength="30"
......@@ -382,10 +382,8 @@ export default {
rows: 10,
beginTime: '',
endTime: '',
entity: {
// TODO: lot
lot: ''
}
// TODO: lot
lot: ''
},
// 查询warehouse的参数
queryParamsDetail: {
......@@ -886,10 +884,8 @@ export default {
rows: 10,
beginTime: '',
endTime: '',
entity: {
// TODO: lot
lot: ''
}
// TODO: lot
lot: ''
}
this.dateRange = []
this.handleQuery()
......
......@@ -7,7 +7,7 @@
<el-input
ref="autoGetFocusInput"
v-model="queryParams.entity.pn"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -18,7 +18,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -29,7 +29,7 @@
<el-form-item label="plocation" prop="plocation">
<el-input
v-model="queryParams.entity.plocation"
v-model="queryParams.plocation"
placeholder="请输入plocation"
clearable
:maxlength="inputMaxLength"
......@@ -40,7 +40,7 @@
<el-form-item label="库类型" prop="ptype">
<el-select
v-model="queryParams.entity.ptype"
v-model="queryParams.ptype"
placeholder="请选择库类型"
filterable
clearable
......@@ -57,7 +57,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryParams.entity.poperate"
v-model="queryParams.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -301,19 +301,16 @@ export default {
endTime: '',
// TODO: 0表示倒序排序,1表示顺序排序
tableSortMark: 0,
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入,2出,3修正,4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 位置
plocation: '',
// TODO: 库状态 1 入,2出,3修正,4废弃
poperate: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
},
// TODO: list记录表名
listName: '出入库记录列表',
......@@ -533,13 +530,11 @@ export default {
resetQuery() {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
lot: '',
plocation: '',
poperate: '',
ptype: ''
}
pn: '',
lot: '',
plocation: '',
poperate: '',
ptype: ''
}
this.dateRange = []
this.handleQuery()
......@@ -600,11 +595,11 @@ export default {
rows: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
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
pn: this.queryParams.pn,
lot: this.queryParams.lot,
plocation: this.queryParams.plocation,
poperate: this.queryParams.poperate,
ptype: this.queryParams.ptype
}
return exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
......@@ -3,7 +3,7 @@
<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="queryParams.entity.pn"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="30"
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入设备lot"
clearable
size="small"
......@@ -23,7 +23,7 @@
/>
</el-form-item>
<el-form-item label="盘点状态" prop="status">
<el-select v-model="queryParams.entity.status" placeholder="请选择" clearable>
<el-select v-model="queryParams.status" placeholder="请选择" clearable>
<el-option
v-for="item in options"
:key="item.value"
......@@ -182,15 +182,13 @@ export default {
// lot: '',
beginTime: '',
endTime: '',
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 2,
status: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 2,
status: ''
},
// 表单参数
form: {}
......@@ -237,11 +235,11 @@ export default {
// 去除字段默认为0导致0对应的未盘点无法使用问题
let flag = 0
this.loading = true
if (this.queryParams.entity.status === undefined || this.queryParams.entity.status === '') {
if (this.queryParams.status === undefined || this.queryParams.status === '') {
flag = 1
}
if (flag === 1) {
this.queryParams.entity.status = -1
this.queryParams.status = -1
}
if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
this.dateRange = []
......@@ -253,7 +251,7 @@ export default {
this.loading = false
})
if (flag === 1) {
this.queryParams.entity.status = undefined
this.queryParams.status = undefined
flag = 0
}
},
......@@ -286,15 +284,13 @@ export default {
rows: 10,
beginTime: '',
endTime: '',
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 2,
status: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: 2,
status: ''
}
this.dateRange = []
this.resetForm('queryForm')
......
......@@ -6,7 +6,7 @@
<el-form-item label="pn" prop="pn">
<el-input
ref="autoGetFocusInput"
v-model="queryParams.entity.pn"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -17,7 +17,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -184,14 +184,12 @@ export default {
endTime: '',
// TODO: 0表示倒序排序,1表示顺序排序
tableSortMark: 0,
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库状态 1入库 2出库 3修正 4废弃
poperate: '4'
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库状态 1入库 2出库 3修正 4废弃
poperate: '4'
},
// TODO: list记录表名
listName: '出入库记录列表',
......@@ -391,11 +389,9 @@ export default {
resetQuery() {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
lot: '',
poperate: '4'
}
pn: '',
lot: '',
poperate: '4'
}
this.dateRange = []
this.handleQuery()
......@@ -437,9 +433,9 @@ export default {
row: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
pn: this.queryParams.entity.pn,
lot: this.queryParams.entity.lot,
poperate: this.queryParams.entity.poperate
pn: this.queryParams.pn,
lot: this.queryParams.lot,
poperate: this.queryParams.poperate
}
exportInventoryRecord(obj).then(response => {
const blob = new Blob([response])
......
......@@ -6,7 +6,7 @@
<el-form-item label="pn" prop="pn">
<el-input
ref="autoGetFocusInput"
v-model="queryParams.entity.pn"
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="inputMaxLength"
......@@ -17,7 +17,7 @@
<el-form-item label="lot" prop="lot">
<el-input
v-model="queryParams.entity.lot"
v-model="queryParams.lot"
placeholder="请输入lot"
clearable
:maxlength="inputMaxLength"
......@@ -28,7 +28,7 @@
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryParams.entity.poperate"
v-model="queryParams.poperate"
placeholder="请选择库状态"
filterable
clearable
......@@ -217,14 +217,12 @@ export default {
endTime: '',
// TODO: 0表示倒序排序,1表示顺序排序
tableSortMark: 0,
entity: {
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库状态 1入库 2出库 3修正 4废弃
poperate: ''
}
// TODO: 设备编码
pn: '',
// TODO: lot
lot: '',
// TODO: 库状态 1入库 2出库 3修正 4废弃
poperate: ''
},
// TODO: list记录表名
listName: '出入库记录列表',
......@@ -424,11 +422,9 @@ export default {
resetQuery() {
this.queryParams = {
tableSortMark: 0,
entity: {
pn: '',
lot: '',
poperate: ''
}
pn: '',
lot: '',
poperate: ''
}
this.dateRange = []
this.handleQuery()
......@@ -470,9 +466,9 @@ export default {
row: this.queryParams.rows,
beginTime: this.queryParams.beginTime,
endTime: this.queryParams.endTime,
pn: this.queryParams.entity.pn,
lot: this.queryParams.entity.lot,
poperate: this.queryParams.entity.poperate
pn: this.queryParams.pn,
lot: this.queryParams.lot,
poperate: this.queryParams.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