|
@@ -63,7 +63,7 @@
|
|
</template>
|
|
</template>
|
|
<a-col :md="12" :sm="24">
|
|
<a-col :md="12" :sm="24">
|
|
<a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
|
|
<a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
|
|
- <a-checkbox v-model="queryParam.productEnabledFlag" :checked="queryParam.productEnabledFlag" id="inventoryQueryList-productEnabledFlag">包括禁用产品</a-checkbox>
|
|
|
|
|
|
+ <a-checkbox v-model="queryParam.enableFlag" :checked="queryParam.enableFlag" id="inventoryQueryList-enableFlag">包括禁用产品</a-checkbox>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
|
|
<a-button
|
|
<a-button
|
|
@@ -165,7 +165,7 @@ export default {
|
|
productTypeSn2: '', // 产品分类2
|
|
productTypeSn2: '', // 产品分类2
|
|
productTypeSn3: '', // 产品分类3
|
|
productTypeSn3: '', // 产品分类3
|
|
zeroQtyFlag: false, // 库存情况
|
|
zeroQtyFlag: false, // 库存情况
|
|
- productEnabledFlag: true, // 显示禁用产品
|
|
|
|
|
|
+ enableFlag: true, // 显示禁用产品
|
|
minUnsalableDays: undefined, // 滞销天数最小值
|
|
minUnsalableDays: undefined, // 滞销天数最小值
|
|
maxUnsalableDays: undefined // 滞销天数最大值
|
|
maxUnsalableDays: undefined // 滞销天数最大值
|
|
},
|
|
},
|
|
@@ -193,7 +193,7 @@ export default {
|
|
}
|
|
}
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
|
|
params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
|
|
- params.productEnabledFlag = params.productEnabledFlag ? '' : '1'
|
|
|
|
|
|
+ params.enableFlag = params.enableFlag ? '' : '1'
|
|
return stockList(params).then(res => {
|
|
return stockList(params).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
@@ -340,7 +340,7 @@ export default {
|
|
const _this = this
|
|
const _this = this
|
|
const params = JSON.parse(JSON.stringify(this.queryParam))
|
|
const params = JSON.parse(JSON.stringify(this.queryParam))
|
|
params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
|
|
params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
|
|
- params.productEnabledFlag = params.productEnabledFlag ? '' : '1'
|
|
|
|
|
|
+ params.enableFlag = params.enableFlag ? '' : '1'
|
|
params.showCost = this.$hasPermissions('M_ShowAllCost') ? 1 : 0
|
|
params.showCost = this.$hasPermissions('M_ShowAllCost') ? 1 : 0
|
|
this.exportLoading = true
|
|
this.exportLoading = true
|
|
_this.spinning = true
|
|
_this.spinning = true
|
|
@@ -396,7 +396,7 @@ export default {
|
|
_this.setTableH()
|
|
_this.setTableH()
|
|
})
|
|
})
|
|
// 是否默认包括禁用产品
|
|
// 是否默认包括禁用产品
|
|
- this.queryParam.productEnabledFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
|
|
|
|
|
|
+ this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
@@ -410,7 +410,7 @@ export default {
|
|
_this.setTableH()
|
|
_this.setTableH()
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- 'queryParam.productEnabledFlag' (newValue, oldValue) {
|
|
|
|
|
|
+ 'queryParam.enableFlag' (newValue, oldValue) {
|
|
localStorage.setItem('productEnabledFlag-' + this.$store.state.user.info.orgId, newValue)
|
|
localStorage.setItem('productEnabledFlag-' + this.$store.state.user.info.orgId, newValue)
|
|
},
|
|
},
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|