|
@@ -263,7 +263,7 @@ export default {
|
|
<div>
|
|
<div>
|
|
<span style="padding-right: 15px;">{data}</span>
|
|
<span style="padding-right: 15px;">{data}</span>
|
|
{ftext?(<a-badge count={ftext} number-style={{ backgroundColor: fcolor, zoom:'80%' }}></a-badge>):''}
|
|
{ftext?(<a-badge count={ftext} number-style={{ backgroundColor: fcolor, zoom:'80%' }}></a-badge>):''}
|
|
- {record.convertPromoGiftsQty?(<a-badge count="转" number-style={{ backgroundColor: '#ffaa00', zoom:'80%' }}></a-badge>):''}
|
|
|
|
|
|
+ {record.bakConvertPromoGiftsQty?(<a-badge count="转" number-style={{ backgroundColor: '#ffaa00', zoom:'80%' }}></a-badge>):''}
|
|
{Number(record.stockQty||0) < Number(record.unpushedQty||0)?(<a-badge count="缺" number-style={{ zoom:'80%' }}></a-badge>):''}
|
|
{Number(record.stockQty||0) < Number(record.unpushedQty||0)?(<a-badge count="缺" number-style={{ zoom:'80%' }}></a-badge>):''}
|
|
</div>
|
|
</div>
|
|
)
|
|
)
|
|
@@ -542,6 +542,8 @@ export default {
|
|
item.maxConvertNums = 0
|
|
item.maxConvertNums = 0
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ item.bakConvertPromoGiftsQty = item.convertPromoGiftsQty
|
|
|
|
+
|
|
// 库存为0或待下推数为0,不可添加
|
|
// 库存为0或待下推数为0,不可添加
|
|
if(!item.convertPromoGiftsQty && (!item.unpushedQty || item.unpushedQty<0) || isTjRow){
|
|
if(!item.convertPromoGiftsQty && (!item.unpushedQty || item.unpushedQty<0) || isTjRow){
|
|
this.disableSelectedRowKeys.push(item.id)
|
|
this.disableSelectedRowKeys.push(item.id)
|