fix(wms/report): 修复逻辑库位查询参数传递问题
This commit is contained in:
@@ -40,15 +40,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位" prop="warehouseIds">
|
<el-form-item label="逻辑库位" prop="warehouseIds">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称" prop="itemName">
|
<el-form-item label="产品名称" prop="itemName">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -448,7 +448,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}),
|
}),
|
||||||
]).then(([lossList, outputList]) => {
|
]).then(([lossList, outputList]) => {
|
||||||
this.lossList = lossList
|
this.lossList = lossList
|
||||||
|
|||||||
@@ -14,15 +14,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位" prop="warehouseIds">
|
<el-form-item label="逻辑库位" prop="warehouseIds">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称" prop="itemName">
|
<el-form-item label="产品名称" prop="itemName">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -341,7 +341,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}),
|
}),
|
||||||
]).then(([lossList, outputList]) => {
|
]).then(([lossList, outputList]) => {
|
||||||
this.lossList = lossList
|
this.lossList = lossList
|
||||||
|
|||||||
@@ -42,15 +42,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位" prop="warehouseIds">
|
<el-form-item label="逻辑库位" prop="warehouseIds">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称" prop="itemName">
|
<el-form-item label="产品名称" prop="itemName">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -452,7 +452,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}),
|
}),
|
||||||
]).then(([lossList, outputList]) => {
|
]).then(([lossList, outputList]) => {
|
||||||
// 将mergeCoils中存在的卷剔除
|
// 将mergeCoils中存在的卷剔除
|
||||||
|
|||||||
@@ -14,15 +14,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位" prop="warehouseIds">
|
<el-form-item label="逻辑库位" prop="warehouseIds">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称" prop="itemName">
|
<el-form-item label="产品名称" prop="itemName">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -414,7 +414,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}),
|
}),
|
||||||
]).then(([lossList, outputList]) => {
|
]).then(([lossList, outputList]) => {
|
||||||
this.lossList = lossList
|
this.lossList = lossList
|
||||||
|
|||||||
@@ -20,15 +20,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位" prop="endTime">
|
<el-form-item label="逻辑库位" prop="endTime">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称" prop="endTime">
|
<el-form-item label="产品名称" prop="endTime">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -208,7 +208,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}).then((resList) => {
|
}).then((resList) => {
|
||||||
this.list = resList
|
this.list = resList
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|||||||
@@ -24,15 +24,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位">
|
<el-form-item label="逻辑库位">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称">
|
<el-form-item label="产品名称">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -326,7 +326,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}),
|
}),
|
||||||
]).then(([lossList, outputList]) => {
|
]).then(([lossList, outputList]) => {
|
||||||
this.lossList = lossList
|
this.lossList = lossList
|
||||||
|
|||||||
@@ -14,15 +14,15 @@
|
|||||||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="逻辑库位" prop="warehouseIds">
|
<el-form-item label="逻辑库位" prop="warehouseIds">
|
||||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item>
|
||||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
<!-- <el-form-item label="逻辑库位" prop="warehouseId">
|
||||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="产品名称" prop="itemName">
|
<el-form-item label="产品名称" prop="itemName">
|
||||||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
@@ -312,7 +312,7 @@ export default {
|
|||||||
fetchOutputList({
|
fetchOutputList({
|
||||||
...this.queryParams,
|
...this.queryParams,
|
||||||
...this.baseQueryParams,
|
...this.baseQueryParams,
|
||||||
// warehouseIds: this.warehouseIds.join(','),
|
warehouseIds: this.warehouseIds.join(','),
|
||||||
}),
|
}),
|
||||||
]).then(([lossList, outputList]) => {
|
]).then(([lossList, outputList]) => {
|
||||||
this.lossList = lossList
|
this.lossList = lossList
|
||||||
|
|||||||
Reference in New Issue
Block a user