diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index 63232ec8..3e98ca66 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -124,15 +124,15 @@ } }, {title: '条码', dataIndex: 'mBarCode', width: 80}, - {title: '名称', dataIndex: 'name', width: 80}, + {title: '名称', dataIndex: 'name', width: 140}, {title: '规格', dataIndex: 'standard', width: 80}, {title: '型号', dataIndex: 'model', width: 80}, {title: '颜色', dataIndex: 'color', width: 80}, {title: '类别', dataIndex: 'categoryName', width: 80}, - {title: '单位', dataIndex: 'unitName', width: 80}, + {title: '单位', dataIndex: 'unitName', width: 60}, {title: '单价', dataIndex: 'purchaseDecimal', width: 60}, - {title: '初始库存', dataIndex: 'initialStock', width: 80}, - {title: '当前库存', dataIndex: 'currentStock', width: 80}, + {title: '初始库存', dataIndex: 'initialStock', width: 60}, + {title: '当前库存', dataIndex: 'currentStock', width: 60}, {title: '当前库存金额', dataIndex: 'currentStockPrice', width: 80}, { title: '库存流水', dataIndex: 'action', align:"center", width: 100, scopedSlots: { customRender: 'action' } diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue index c4e53c51..7b645c17 100644 --- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue +++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue @@ -1,7 +1,7 @@