|
@@ -27,17 +27,17 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="4" :sm="24">
|
|
<a-col :md="4" :sm="24">
|
|
<a-form-item label="类型">
|
|
<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>
|
|
- <a-select-option value="1">
|
|
|
|
|
|
+ <a-select-option value="ABLE">
|
|
剩余待下推数量>0的产品
|
|
剩余待下推数量>0的产品
|
|
</a-select-option>
|
|
</a-select-option>
|
|
- <a-select-option value="2">
|
|
|
|
|
|
+ <a-select-option value="ALL">
|
|
可全部下推的产品
|
|
可全部下推的产品
|
|
</a-select-option>
|
|
</a-select-option>
|
|
- <a-select-option value="3">
|
|
|
|
|
|
+ <a-select-option value="NOTALL">
|
|
不可全部下推的产品
|
|
不可全部下推的产品
|
|
</a-select-option>
|
|
</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
@@ -146,7 +146,7 @@ export default {
|
|
salesBillSn: '',
|
|
salesBillSn: '',
|
|
detailData: null,
|
|
detailData: null,
|
|
queryParam: {
|
|
queryParam: {
|
|
- ptype: '0', // 类型
|
|
|
|
|
|
+ pushProductType: '', // 类型
|
|
productCode: '', // 产品编码
|
|
productCode: '', // 产品编码
|
|
productName: '', // 产品名称
|
|
productName: '', // 产品名称
|
|
promoFlag: undefined, // 是否促销品
|
|
promoFlag: undefined, // 是否促销品
|
|
@@ -297,8 +297,8 @@ export default {
|
|
数量:<strong>{record.total&&record.total.totalQty||'--'}</strong>;
|
|
数量:<strong>{record.total&&record.total.totalQty||'--'}</strong>;
|
|
{_this.$hasPermissions('B_salesEdit_salesPrice') ? (<span>总金额:<strong>{record.total&&record.total.totalAmount||'--'}</strong>;</span>):('')}
|
|
{_this.$hasPermissions('B_salesEdit_salesPrice') ? (<span>总金额:<strong>{record.total&&record.total.totalAmount||'--'}</strong>;</span>):('')}
|
|
{_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.lossAmount ? (<span>优惠金额:<strong>{record.total.lossAmount}</strong>;</span>):('')}
|
|
{_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.lossAmount ? (<span>优惠金额:<strong>{record.total.lossAmount}</strong>;</span>):('')}
|
|
- {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.totalPromoGiftsAmount&&record.total&&record.total.cgejyAmount>0 ? (<span>采购额结余:<strong>{_this.toThousands(record.total.cgejyAmount)}</strong>;</span>):('')}
|
|
|
|
- {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.totalPromoGiftsAmount&&record.total&&record.total.cgejyAmount<0 ? (<span>采购额超出:<strong>{_this.toThousands(record.total.cgeccAmount)}</strong>;</span>):('')}
|
|
|
|
|
|
+ {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.cgejyAmount>0 ? (<span>采购额结余:<strong>{_this.toThousands(record.total.cgejyAmount)}</strong>;</span>):('')}
|
|
|
|
+ {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.cgejyAmount<0 ? (<span>采购额超出:<strong>{_this.toThousands(record.total.cgeccAmount)}</strong>;</span>):('')}
|
|
{record.expenseAccountFlag!='WAIT' ? record.expenseAccountFlagDictValue : ''}
|
|
{record.expenseAccountFlag!='WAIT' ? record.expenseAccountFlagDictValue : ''}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -400,6 +400,10 @@ export default {
|
|
this.queryParam.salesBillSn = this.salesBillSn
|
|
this.queryParam.salesBillSn = this.salesBillSn
|
|
this.queryParam.showStock = true
|
|
this.queryParam.showStock = true
|
|
const params = this.queryParam
|
|
const params = this.queryParam
|
|
|
|
+ if(params.promoFlag){
|
|
|
|
+ params.isGifg = params.promoFlag == 1 ? 'Y' : 'N'
|
|
|
|
+ }
|
|
|
|
+
|
|
const active = this.activeList
|
|
const active = this.activeList
|
|
|
|
|
|
// 正常产品
|
|
// 正常产品
|
|
@@ -477,7 +481,7 @@ export default {
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- this.queryParam.ptype = '0'
|
|
|
|
|
|
+ this.queryParam.pushProductType = ''
|
|
this.queryParam.productCode = ''
|
|
this.queryParam.productCode = ''
|
|
this.queryParam.productName = ''
|
|
this.queryParam.productName = ''
|
|
this.queryParam.promotionFlag = undefined
|
|
this.queryParam.promotionFlag = undefined
|
|
@@ -487,6 +491,7 @@ export default {
|
|
this.queryParam.productTypeSn3 = ''
|
|
this.queryParam.productTypeSn3 = ''
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.warehouseSn = undefined
|
|
this.queryParam.promoFlag = undefined
|
|
this.queryParam.promoFlag = undefined
|
|
|
|
+ this.queryParam.isGifg = undefined
|
|
this.productType = []
|
|
this.productType = []
|
|
this.dataSource = []
|
|
this.dataSource = []
|
|
this.clearSelectTable()
|
|
this.clearSelectTable()
|
|
@@ -518,23 +523,26 @@ export default {
|
|
_this.$message.warning('请先选择产品!')
|
|
_this.$message.warning('请先选择产品!')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- const chooseRow = this.dataSource.filter(item => chooseList.includes(item.id) && item.id.indexOf('promo-')<0)
|
|
|
|
|
|
+ const chooseRow = this.dataSource.filter(item => chooseList.includes(item.id) && item.stockQty > 0)
|
|
const obj = []
|
|
const obj = []
|
|
chooseRow && chooseRow.map(item => {
|
|
chooseRow && chooseRow.map(item => {
|
|
- if (item.stockQty > 0) {
|
|
|
|
- obj.push(item.salesBillDetailSn)
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- this.$confirm({
|
|
|
|
- title: '提示',
|
|
|
|
- content: '确认要批量添加到待下推列表吗?',
|
|
|
|
- centered: true,
|
|
|
|
- closable: true,
|
|
|
|
- onOk () {
|
|
|
|
- _this.$emit('addProduct', obj)
|
|
|
|
- }
|
|
|
|
|
|
+ obj.push(item.salesBillDetailSn)
|
|
})
|
|
})
|
|
|
|
+
|
|
|
|
+ if(obj.length){
|
|
|
|
+ this.$confirm({
|
|
|
|
+ title: '提示',
|
|
|
|
+ content: '确认要批量添加到待下推列表吗?',
|
|
|
|
+ centered: true,
|
|
|
|
+ closable: true,
|
|
|
|
+ onOk () {
|
|
|
|
+ _this.$emit('addProduct', obj)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }else{
|
|
|
|
+ _this.$message.warning('库存为0,不可添加!')
|
|
|
|
+ }
|
|
|
|
+
|
|
},
|
|
},
|
|
// 整单取消
|
|
// 整单取消
|
|
handleAllCancel () {
|
|
handleAllCancel () {
|