Commit 8c562b61 authored by cat's avatar cat

3合1

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