lilei 6 days ago
parent
commit
205d1836d1

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

@@ -196,7 +196,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.stockQty || 0) < Number(record.unpushedQty || 0)) && _this.showStock ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
+            {(Number(record.stockQty || 0) < Number(record.unpushedQty || 0)) && _this.showStock && record.borrowFlag != '1' ? <a-badge count="缺" numberStyle={{ zoom: '0.7' }}/> : ''}
           </div>
         )
       }

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

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