|
@@ -32,7 +32,7 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="仓库仓位">
|
|
<a-form-model-item label="仓库仓位">
|
|
- <Warehouse id="inventoryQueryList-warehouse" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
|
|
|
|
|
|
+ <Warehouse id="inventoryQueryList-warehouse" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
@@ -188,7 +188,9 @@ export default {
|
|
productTypeSn1: '', // 产品分类1
|
|
productTypeSn1: '', // 产品分类1
|
|
productTypeSn2: '', // 产品分类2
|
|
productTypeSn2: '', // 产品分类2
|
|
productTypeSn3: '', // 产品分类3
|
|
productTypeSn3: '', // 产品分类3
|
|
- warehouse: undefined,
|
|
|
|
|
|
+ warehouse: [],
|
|
|
|
+ warehouseSn: '',
|
|
|
|
+ warehouseLocationSn:'',
|
|
zeroQtyFlag: false, // 库存情况
|
|
zeroQtyFlag: false, // 库存情况
|
|
enableFlag: true, // 显示禁用产品
|
|
enableFlag: true, // 显示禁用产品
|
|
minUnsalableDays: undefined, // 滞销天数最小值
|
|
minUnsalableDays: undefined, // 滞销天数最小值
|
|
@@ -228,6 +230,11 @@ export default {
|
|
params.product = {
|
|
params.product = {
|
|
sysFlag: params.productSysFlag || undefined
|
|
sysFlag: params.productSysFlag || undefined
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // 仓库仓位
|
|
|
|
+ params.warehouseSn = params.warehouse[0]
|
|
|
|
+ params.warehouseLocationSn = params.warehouse[1]
|
|
|
|
+
|
|
return stockList(params).then(res => {
|
|
return stockList(params).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
@@ -341,7 +348,9 @@ export default {
|
|
this.queryParam.brandName = undefined
|
|
this.queryParam.brandName = undefined
|
|
this.queryParam.productTypeName = undefined
|
|
this.queryParam.productTypeName = undefined
|
|
this.queryParam.zeroQtyFlag = false
|
|
this.queryParam.zeroQtyFlag = false
|
|
- this.queryParam.warehouse = undefined
|
|
|
|
|
|
+ this.queryParam.warehouse = []
|
|
|
|
+ this.queryParam.warehouseSn = ''
|
|
|
|
+ this.queryParam.warehouseLocationSn = ''
|
|
this.$refs.warehouse.setDefaultVal()
|
|
this.$refs.warehouse.setDefaultVal()
|
|
this.productTypeSn = []
|
|
this.productTypeSn = []
|
|
this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
|
|
this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
|
|
@@ -435,6 +444,11 @@ export default {
|
|
})
|
|
})
|
|
// 是否默认包括禁用产品
|
|
// 是否默认包括禁用产品
|
|
this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
|
|
this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
|
|
|
|
+
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.queryParam.warehouse = []
|
|
|
|
+ this.$refs.warehouse.setDefaultVal()
|
|
|
|
+ })
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|