diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index 987d531f..06486278 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -179,7 +179,7 @@ {title: '库存流水', dataIndex: 'action', align:"center", width: 60, scopedSlots: { customRender: 'action' } }, - {title: '条码', dataIndex: 'mBarCode', width: 100, + {title: '条码', dataIndex: 'mBarCode', width: 100, sorter: (a, b) => a.mBarCode - b.mBarCode, scopedSlots: { customRender: 'customBarCode' } }, {title: '名称', dataIndex: 'name', width: 140, ellipsis:true}, @@ -190,7 +190,7 @@ {title: '仓位货架', dataIndex: 'position', width: 60, ellipsis:true}, {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: 'initialStock', width: 60}, {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60, scopedSlots: { customRender: 'customRenderStock' } },