|
@@ -27,17 +27,17 @@
|
|
|
</a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
<a-form-item label="类型">
|
|
|
- <a-select v-model.trim="queryParam.ptype" :dropdownMatchSelectWidth="false" >
|
|
|
- <a-select-option value="0">
|
|
|
+ <a-select v-model.trim="queryParam.pushProductType" :dropdownMatchSelectWidth="false" >
|
|
|
+ <a-select-option value="">
|
|
|
全部产品
|
|
|
</a-select-option>
|
|
|
- <a-select-option value="1">
|
|
|
+ <a-select-option value="ABLE">
|
|
|
剩余待下推数量>0的产品
|
|
|
</a-select-option>
|
|
|
- <a-select-option value="2">
|
|
|
+ <a-select-option value="ALL">
|
|
|
可全部下推的产品
|
|
|
</a-select-option>
|
|
|
- <a-select-option value="3">
|
|
|
+ <a-select-option value="NOTALL">
|
|
|
不可全部下推的产品
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
@@ -146,7 +146,7 @@ export default {
|
|
|
salesBillSn: '',
|
|
|
detailData: null,
|
|
|
queryParam: {
|
|
|
- ptype: '0', // 类型
|
|
|
+ pushProductType: '', // 类型
|
|
|
productCode: '', // 产品编码
|
|
|
productName: '', // 产品名称
|
|
|
promoFlag: undefined, // 是否促销品
|
|
@@ -400,6 +400,10 @@ export default {
|
|
|
this.queryParam.salesBillSn = this.salesBillSn
|
|
|
this.queryParam.showStock = true
|
|
|
const params = this.queryParam
|
|
|
+ if(params.promoFlag){
|
|
|
+ params.isGifg = params.promoFlag == 1 ? 'Y' : 'N'
|
|
|
+ }
|
|
|
+
|
|
|
const active = this.activeList
|
|
|
|
|
|
// 正常产品
|
|
@@ -477,7 +481,7 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.ptype = '0'
|
|
|
+ this.queryParam.pushProductType = ''
|
|
|
this.queryParam.productCode = ''
|
|
|
this.queryParam.productName = ''
|
|
|
this.queryParam.promotionFlag = undefined
|
|
@@ -487,6 +491,7 @@ export default {
|
|
|
this.queryParam.productTypeSn3 = ''
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
this.queryParam.promoFlag = undefined
|
|
|
+ this.queryParam.isGifg = undefined
|
|
|
this.productType = []
|
|
|
this.dataSource = []
|
|
|
this.clearSelectTable()
|