소스 검색

Merge branch 'develop_yh48' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh48

chenrui 8 달 전
부모
커밋
fa74d2507c
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      src/views/salesManagement/waitDispatchNew/queryPart.vue

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

@@ -308,7 +308,7 @@ export default {
             <span style="padding-right: 15px;">{data}</span>
             {ftext ? (<a-badge count={ftext} number-style={{ backgroundColor: fcolor, 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((_this.showLockStockQty ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" number-style={{ zoom: '80%' }}></a-badge>) : ''}
           </div>
         )
       }