diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 6b47ac9e..9a94b3b6 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -146,6 +146,11 @@
+
+
+ {{text}}
+
+
启用
禁用
@@ -254,7 +259,9 @@
},
{title: '基础重量', dataIndex: 'weight', width: 80},
{title: '保质期', dataIndex: 'expiryNum', width: 60},
- {title: '库存', dataIndex: 'stock', width: 80},
+ {title: '库存', dataIndex: 'stock', width: 80,
+ scopedSlots: { customRender: 'customRenderStock' }
+ },
{title: '采购价', dataIndex: 'purchaseDecimal', width: 80},
{title: '零售价', dataIndex: 'commodityDecimal', width: 80},
{title: '销售价', dataIndex: 'wholesaleDecimal', width: 80},
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 2a0c7fb4..054c3cfa 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -60,6 +60,11 @@
:scroll="scroll"
:loading="loading"
@change="handleTableChange">
+
+
+ {{text}}
+
+
@@ -140,7 +145,9 @@
{title: '上月结存数量', dataIndex: 'prevSum', sorter: (a, b) => a.prevSum - b.prevSum, width: 80},
{title: '入库数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 60},
{title: '出库数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 60},
- {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, width: 80},
+ {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, width: 80,
+ scopedSlots: { customRender: 'customRenderStock' }
+ },
{title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60}
],
url: {
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 91486475..2374793e 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -72,6 +72,11 @@
{{record.id?'流水':''}}
+
+
+ {{text}}
+
+
@@ -158,7 +163,9 @@
{title: '单位', dataIndex: 'unitName', width: 60, ellipsis:true},
{title: '单价', dataIndex: 'purchaseDecimal', sorter: (a, b) => a.purchaseDecimal - b.purchaseDecimal, width: 60},
{title: '初始库存', dataIndex: 'initialStock', sorter: (a, b) => a.initialStock - b.initialStock, width: 60},
- {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60},
+ {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60,
+ scopedSlots: { customRender: 'customRenderStock' }
+ },
{title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80}
],
url: {