|
@@ -95,7 +95,7 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:dataSource="loadData"
|
|
|
- :scroll="{ x: 2070, y: tableHeight }"
|
|
|
+ :scroll="{ x: 2120, y: tableHeight }"
|
|
|
:pagination="paginationProps"
|
|
|
bordered>
|
|
|
<!-- 产品分类 -->
|
|
@@ -105,7 +105,7 @@
|
|
|
</template>
|
|
|
<!-- 实时库存数 -->
|
|
|
<template slot="stockQty" slot-scope="text, record">
|
|
|
- {{ record.stockQty||0 + record.freezeQty||0 }}
|
|
|
+ {{ record.currentStockQty + record.freezeQty }}
|
|
|
<span v-if="record.freezeQty">(冻结{{ record.freezeQty }})</span>
|
|
|
</template>
|
|
|
<!-- 预警提示 -->
|
|
@@ -191,7 +191,7 @@ export default {
|
|
|
{ title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品品牌', dataIndex: 'brandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
|
|
|
- { title: '实时库存数(个)', scopedSlots: { customRender: 'stockQty' }, width: 130, align: 'center' },
|
|
|
+ { title: '实时库存数(个)', scopedSlots: { customRender: 'stockQty' }, width: 180, align: 'center' },
|
|
|
{ title: '在途数(个)', scopedSlots: { customRender: 'inTransit' }, width: 130, align: 'center' },
|
|
|
{ title: '总库存数(个)', dataIndex: 'totalStockQty', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '最大库存数(个)', scopedSlots: { customRender: 'upperLimit' }, width: 130, align: 'center' },
|