|
@@ -22,7 +22,7 @@
|
|
<div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
|
|
<div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
|
|
</div>
|
|
</div>
|
|
<!-- 总计 -->
|
|
<!-- 总计 -->
|
|
- <div v-if="countData" style="padding:6px 0 0;text-align: right;">
|
|
|
|
|
|
+ <div v-if="countData&&activeList.length>0" style="padding:6px 0 0;text-align: right;">
|
|
总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
|
|
总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
|
|
总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
|
|
总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
|
|
<span v-if="$hasPermissions(authCode + '_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
|
|
<span v-if="$hasPermissions(authCode + '_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
|
|
@@ -390,7 +390,7 @@ export default {
|
|
// 格式化数据
|
|
// 格式化数据
|
|
let str = ''
|
|
let str = ''
|
|
this.outStockStr = ''
|
|
this.outStockStr = ''
|
|
- this.dataSource.map((item, i) => {
|
|
|
|
|
|
+ this.dataSource.forEach((item, i) => {
|
|
item.no = i + 1
|
|
item.no = i + 1
|
|
// 格式化数据,产品编码、产品名称、原厂编码、包装数单位
|
|
// 格式化数据,产品编码、产品名称、原厂编码、包装数单位
|
|
const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)
|
|
const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)
|