gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善报表的导出和展示，增加品牌和制造商

Browse Source
This commit is contained in:
jishenghua 2024-10-09 00:49:53 +08:00
parent 8795c9358c
commit 68c88f4569
11 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jshERP-web/src/views/report/AllocationDetail.vue
View File

@ -230,6 +230,9 @@
{title: '名称', dataIndex: 'mname', width: 120, ellipsis:true},
{title: '规格', dataIndex: 'standard', width: 60, ellipsis:true},
{title: '型号', dataIndex: 'model', width: 60, ellipsis:true},
{title: '颜色', dataIndex: 'color', width: 40, ellipsis:true},
{title: '品牌', dataIndex: 'brand', width: 60, ellipsis:true},
{title: '制造商', dataIndex: 'mfrs', width: 60, ellipsis:true},
{title: '单位', dataIndex: 'mUnit', width: 60, ellipsis:true},
{title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
{title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
@ -329,11 +332,11 @@
},
exportExcel() {
let list = []
let head = '单据编号,条码,名称,规格,型号,单位,数量,单价,金额,调出仓库,调入仓库,调拨日期,备注'
let head = '单据编号,条码,名称,规格,型号,颜色,品牌,制造商,单位,数量,单价,金额,调出仓库,调入仓库,调拨日期,备注'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber,
item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.color, ds.brand, ds.mfrs, ds.mUnit, ds.operNumber,
ds.unitPrice, ds.allPrice, ds.dname, ds.sname, ds.operTime, ds.newRemark)
list.push(item)
}

9
jshERP-web/src/views/report/BuyInReport.vue
View File

@ -197,6 +197,9 @@
{title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true},
{title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
{title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
{title: '颜色', dataIndex: 'materialColor', width: 60, ellipsis:true},
{title: '品牌', dataIndex: 'materialBrand', width: 80, ellipsis:true},
{title: '制造商', dataIndex: 'materialMfrs', width: 80, ellipsis:true},
{title: '扩展信息', dataIndex: 'materialOther', width: 150, ellipsis:true},
{title: '单位', dataIndex: 'materialUnit', width: 80, ellipsis:true},
{title: '采购数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 80},
@ -288,12 +291,12 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,扩展信息,单位,进货数量,进货金额,退货数量,退货金额,实际采购金额'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,进货数量,进货金额,退货数量,退货金额,实际采购金额'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit,
ds.inSum, ds.inSumPrice, ds.outSum, ds.outSumPrice, ds.inOutSumPrice)
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialColor, ds.materialBrand,
ds.materialMfrs, ds.materialOther, ds.materialUnit, ds.inSum, ds.inSumPrice, ds.outSum, ds.outSumPrice, ds.inOutSumPrice)
list.push(item)
}
let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime

7
jshERP-web/src/views/report/InDetail.vue
View File

@ -233,6 +233,9 @@
{title: '名称', dataIndex: 'mname', width: 120, ellipsis:true},
{title: '规格', dataIndex: 'standard', width: 60, ellipsis:true},
{title: '型号', dataIndex: 'model', width: 60, ellipsis:true},
{title: '颜色', dataIndex: 'color', width: 40, ellipsis:true},
{title: '品牌', dataIndex: 'brand', width: 60, ellipsis:true},
{title: '制造商', dataIndex: 'mfrs', width: 60, ellipsis:true},
{title: '单位', dataIndex: 'mUnit', width: 50, ellipsis:true},
{title: '多属性', dataIndex: 'sku', width: 100, ellipsis:true},
{title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
@ -343,11 +346,11 @@
},
exportExcel() {
let list = []
let head = '单据编号,条码,名称,规格,型号,单位,多属性,数量,单价,金额,税率(%),税额,往来单位,仓库,入库日期,备注'
let head = '单据编号,条码,名称,规格,型号,颜色,品牌,制造商,单位,多属性,数量,单价,金额,税率(%),税额,往来单位,仓库,入库日期,备注'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.sku, ds.operNumber, ds.unitPrice,
item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.color, ds.brand, ds.mfrs, ds.mUnit, ds.sku, ds.operNumber, ds.unitPrice,
ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark)
list.push(item)
}

7
jshERP-web/src/views/report/InMaterialCount.vue
View File

@ -197,6 +197,9 @@
{title: '名称', dataIndex: 'mName', width: 120, ellipsis:true},
{title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
{title: '型号', dataIndex: 'model', width: 100, ellipsis:true},
{title: '颜色', dataIndex: 'color', width: 60, ellipsis:true},
{title: '品牌', dataIndex: 'brand', width: 100, ellipsis:true},
{title: '制造商', dataIndex: 'mfrs', width: 100, 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},
@ -284,11 +287,11 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,类别,单位,入库数量,入库金额'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,类别,单位,入库数量,入库金额'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum)
item.push(ds.barCode, ds.mName, ds.standard, ds.model, ds.color, ds.brand, ds.mfrs, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum)
list.push(item)
}
let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime

8
jshERP-web/src/views/report/InOutStockReport.vue
View File

@ -194,6 +194,9 @@
{title: '名称', dataIndex: 'materialName', width: 120, ellipsis:true},
{title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
{title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
{title: '颜色', dataIndex: 'materialColor', width: 50, ellipsis:true},
{title: '品牌', dataIndex: 'materialBrand', width: 80, ellipsis:true},
{title: '制造商', dataIndex: 'materialMfrs', width: 80, ellipsis:true},
{title: '扩展信息', dataIndex: 'materialOther', width: 80, ellipsis:true},
{title: '单位', dataIndex: 'unitName', width: 60, ellipsis:true},
{title: '成本价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
@ -287,11 +290,12 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,扩展信息,单位,成本价,上期结存数量,入库数量,出库数量,本期结存数量,结存金额'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,成本价,上期结存数量,入库数量,出库数量,本期结存数量,结存金额'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.unitName, ds.unitPrice,
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialColor, ds.materialBrand,
ds.materialMfrs, ds.materialOther, ds.unitName, ds.unitPrice,
ds.prevSum, ds.inSum, ds.outSum, ds.thisSum, ds.thisAllPrice)
list.push(item)
}

6
jshERP-web/src/views/report/MaterialStock.vue
View File

@ -208,7 +208,7 @@
{title: '库存流水', dataIndex: 'action', align:"center", width: 60,
scopedSlots: { customRender: 'action' }
},
{title: '图片', dataIndex: 'pic', width: 40, scopedSlots: { customRender: 'customPic' }},
{title: '图片', dataIndex: 'pic', width: 45, scopedSlots: { customRender: 'customPic' }},
{title: '条码', dataIndex: 'mBarCode', width: 100, sorter: (a, b) => a.mBarCode - b.mBarCode},
{title: '名称', dataIndex: 'name', width: 140, ellipsis:true},
{title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
@ -316,11 +316,11 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,颜色,类别,单位,成本价,初始库存,库存,库存金额,重量'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,类别,单位,成本价,初始库存,库存,库存金额,重量'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.mBarCode, ds.name, ds.standard, ds.model, ds.color, ds.categoryName, ds.unitName,
item.push(ds.mBarCode, ds.name, ds.standard, ds.model, ds.color, ds.brand, ds.mfrs, ds.categoryName, ds.unitName,
ds.purchaseDecimal, ds.initialStock, ds.currentStock, ds.currentStockPrice, ds.currentWeight)
list.push(item)
}

9
jshERP-web/src/views/report/OutDetail.vue
View File

@ -233,6 +233,9 @@
{title: '名称', dataIndex: 'mname', width: 120, ellipsis:true},
{title: '规格', dataIndex: 'standard', width: 60, ellipsis:true},
{title: '型号', dataIndex: 'model', width: 60, ellipsis:true},
{title: '颜色', dataIndex: 'color', width: 40, ellipsis:true},
{title: '品牌', dataIndex: 'brand', width: 60, ellipsis:true},
{title: '制造商', dataIndex: 'mfrs', width: 60, ellipsis:true},
{title: '单位', dataIndex: 'mUnit', width: 50, ellipsis:true},
{title: '多属性', dataIndex: 'sku', width: 100, ellipsis:true},
{title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
@ -343,12 +346,12 @@
},
exportExcel() {
let list = []
let head = '单据编号,条码,名称,规格,型号,单位,多属性,数量,单价,金额,税率(%),税额,往来单位,仓库,出库日期,备注'
let head = '单据编号,条码,名称,规格,型号,颜色,品牌,制造商,单位,多属性,数量,单价,金额,税率(%),税额,往来单位,仓库,出库日期,备注'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.sku, ds.operNumber, ds.unitPrice,
ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark)
item.push(ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.color, ds.brand, ds.mfrs, ds.mUnit, ds.sku,
ds.operNumber, ds.unitPrice, ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark)
list.push(item)
}
let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime

8
jshERP-web/src/views/report/OutMaterialCount.vue
View File

@ -197,6 +197,9 @@
{title: '名称', dataIndex: 'mName', width: 120, ellipsis:true},
{title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
{title: '型号', dataIndex: 'model', width: 100, ellipsis:true},
{title: '颜色', dataIndex: 'color', width: 60, ellipsis:true},
{title: '品牌', dataIndex: 'brand', width: 100, ellipsis:true},
{title: '制造商', dataIndex: 'mfrs', width: 100, 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},
@ -284,11 +287,12 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,类型,单位,出库数量,出库金额'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,类型,单位,出库数量,出库金额'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.barCode, ds.mName, ds.standard, ds.model, ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum)
item.push(ds.barCode, ds.mName, ds.standard, ds.model, ds.color, ds.brand, ds.mfrs,
ds.categoryName, ds.materialUnit, ds.numSum, ds.priceSum)
list.push(item)
}
let tip = '单据日期：' + this.queryParam.beginTime + '~' + this.queryParam.endTime

8
jshERP-web/src/views/report/RetailOutReport.vue
View File

@ -198,6 +198,9 @@
{title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true},
{title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
{title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
{title: '颜色', dataIndex: 'materialColor', width: 60, ellipsis:true},
{title: '品牌', dataIndex: 'materialBrand', width: 80, ellipsis:true},
{title: '制造商', dataIndex: 'materialMfrs', width: 80, ellipsis:true},
{title: '扩展信息', dataIndex: 'materialOther', width: 150, ellipsis:true},
{title: '单位', dataIndex: 'materialUnit', width: 80, ellipsis:true},
{title: '零售数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80},
@ -291,11 +294,12 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,扩展信息,单位,零售数量,零售金额,退货数量,退货金额,实际零售金额'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,零售数量,零售金额,退货数量,退货金额,实际零售金额'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit, ds.outSum,
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialColor, ds.materialBrand,
ds.materialMfrs, ds.materialOther, ds.materialUnit, ds.outSum,
ds.outSumPrice, ds.inSum, ds.inSumPrice, ds.outInSumPrice)
list.push(item)
}

8
jshERP-web/src/views/report/SaleOutReport.vue
View File

@ -197,6 +197,9 @@
{title: '名称', dataIndex: 'materialName', width: 160, ellipsis:true},
{title: '规格', dataIndex: 'materialStandard', width: 80, ellipsis:true},
{title: '型号', dataIndex: 'materialModel', width: 80, ellipsis:true},
{title: '颜色', dataIndex: 'materialColor', width: 60, ellipsis:true},
{title: '品牌', dataIndex: 'materialBrand', width: 80, ellipsis:true},
{title: '制造商', dataIndex: 'materialMfrs', width: 80, ellipsis:true},
{title: '扩展信息', dataIndex: 'materialOther', width: 150, ellipsis:true},
{title: '单位', dataIndex: 'materialUnit', width: 80, ellipsis:true},
{title: '销售数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 80},
@ -290,11 +293,12 @@
},
exportExcel() {
let list = []
let head = '条码,名称,规格,型号,扩展信息,单位,销售数量,销售金额,退货数量,退货金额,实际销售金额'
let head = '条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,销售数量,销售金额,退货数量,退货金额,实际销售金额'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialOther, ds.materialUnit, ds.outSum,
item.push(ds.barCode, ds.materialName, ds.materialStandard, ds.materialModel, ds.materialColor, ds.materialBrand,
ds.materialMfrs, ds.materialOther, ds.materialUnit, ds.outSum,
ds.outSumPrice, ds.inSum, ds.inSumPrice, ds.outInSumPrice)
list.push(item)
}

9
jshERP-web/src/views/report/StockWarningReport.vue
View File

@ -149,6 +149,9 @@
{title: '名称', dataIndex: 'mname', width: 100, ellipsis:true},
{title: '规格', dataIndex: 'mstandard', width: 80, ellipsis:true},
{title: '型号', dataIndex: 'mmodel', width: 80, ellipsis:true},
{title: '颜色', dataIndex: 'mcolor', width: 50, ellipsis:true},
{title: '品牌', dataIndex: 'brand', width: 80, ellipsis:true},
{title: '制造商', dataIndex: 'mmfrs', width: 80, ellipsis:true},
{title: '扩展信息', dataIndex: 'materialOther', width: 100, ellipsis:true},
{title: '单位', dataIndex: 'materialUnit', width: 60, ellipsis:true},
{title: '库存', dataIndex: 'currentNumber', sorter: (a, b) => a.currentNumber - b.currentNumber, width: 80},
@ -185,12 +188,12 @@
},
exportExcel() {
let list = []
let head = '仓库,条码,名称,规格,型号,扩展信息,单位,库存,最低安全库存,最高安全库存,建议入库量,建议出库量'
let head = '仓库,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,库存,最低安全库存,最高安全库存,建议入库量,建议出库量'
for (let i = 0; i < this.dataSource.length; i++) {
let item = []
let ds = this.dataSource[i]
item.push(ds.depotName, ds.barCode, ds.mname, ds.mstandard, ds.mmodel, ds.materialOther, ds.materialUnit,
ds.currentNumber, ds.lowSafeStock, ds.highSafeStock, ds.lowCritical, ds.highCritical)
item.push(ds.depotName, ds.barCode, ds.mname, ds.mstandard, ds.mmodel, ds.mcolor, ds.brand, ds.mmfrs,
ds.materialOther, ds.materialUnit, ds.currentNumber, ds.lowSafeStock, ds.highSafeStock, ds.lowCritical, ds.highCritical)
list.push(item)
}
let tip = '库存预警查询'