diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue index 62316d08..0a0b7ff9 100644 --- a/jshERP-web/src/views/report/InMaterialCount.vue +++ b/jshERP-web/src/views/report/InMaterialCount.vue @@ -153,7 +153,7 @@ {title: '名称', dataIndex: 'mName', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 100, ellipsis:true}, - {title: '类型', dataIndex: 'categoryName', width: 120, ellipsis:true}, + {title: '类别', dataIndex: 'categoryName', width: 120, ellipsis:true}, {title: '单位', dataIndex: 'materialUnit', width: 120, ellipsis:true}, {title: '入库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum, width: 120}, {title: '入库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120} @@ -207,7 +207,7 @@ } }, exportExcel() { - let aoa = [['条码', '名称', '规格', '型号', '类型', '单位', '入库数量', '入库金额']] + let aoa = [['条码', '名称', '规格', '型号', '类别', '单位', '入库数量', '入库金额']] for (let i = 0; i < this.dataSource.length; i++) { let ds = this.dataSource[i] let item = [ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum] diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue index 8e9b762f..4f9d5c80 100644 --- a/jshERP-web/src/views/report/OutMaterialCount.vue +++ b/jshERP-web/src/views/report/OutMaterialCount.vue @@ -153,7 +153,7 @@ {title: '名称', dataIndex: 'mName', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 100, ellipsis:true}, - {title: '类型', dataIndex: 'categoryName', width: 120, ellipsis:true}, + {title: '类别', dataIndex: 'categoryName', width: 120, ellipsis:true}, {title: '单位', dataIndex: 'materialUnit', width: 120, ellipsis:true}, {title: '出库数量', dataIndex: 'numSum', sorter: (a, b) => a.numSum - b.numSum, width: 120}, {title: '出库金额', dataIndex: 'priceSum', sorter: (a, b) => a.priceSum - b.priceSum, width: 120}