lilei 1 rok pred
rodič
commit
8a2a804bcc

+ 0 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -107,7 +107,6 @@
           colspanNums: 13,
           hasOutStockOfActive: false,
           simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
-          showConvertPromoGifts: false
         }
       },
       computed: {

+ 3 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -263,7 +263,7 @@ export default {
                     <div>
                         <span style="padding-right: 15px;">{data}</span>
                         {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>):''}
                     </div>
                 )
@@ -542,6 +542,8 @@ export default {
             item.maxConvertNums = 0
           }
           
+          item.bakConvertPromoGiftsQty = item.convertPromoGiftsQty
+          
           // 库存为0或待下推数为0,不可添加
           if(!item.convertPromoGiftsQty && (!item.unpushedQty || item.unpushedQty<0) || isTjRow){
             this.disableSelectedRowKeys.push(item.id)