lilei 6 days ago
parent
commit
cb5fa35429

+ 1 - 1
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -121,7 +121,7 @@ export default {
             {record.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
-            {Number(record.stockQty || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" number-style={{ zoom: '0.7' }}></a-badge>) : ''}
+            {Number(record.stockQty || 0) < Number(record.unpushedQty || 0) && record.borrowFlag != '1' ? (<a-badge count="缺" number-style={{ zoom: '0.7' }}></a-badge>) : ''}
           </div>
         )
       }

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

@@ -317,7 +317,7 @@ export default {
             {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
-            {Number((record.tireFlag != 0 ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" numberStyle={{ zoom: '0.7' }}></a-badge>) : ''}
+            {Number((record.tireFlag != 0 ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) && record.borrowFlag != '1' ? (<a-badge count="缺" numberStyle={{ zoom: '0.7' }}></a-badge>) : ''}
             {record.bakConvertPromoGiftsQty ? (<a-badge count="转" numberStyle={{ backgroundColor: '#ffaa00', zoom: '80%' }}></a-badge>) : ''}
           </div>
         )