diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 75ad32b3..960fa005 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -401,7 +401,7 @@ export const JeecgListMixin = { //需要合计的列 let parseCols = 'initialStock,currentStock,currentStockPrice,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,inOutSumPrice,' + 'outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' + - 'allPrice,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed' + 'allPrice,taxMoney,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed' columns.forEach(column => { let { key, dataIndex } = column if (![key, dataIndex].includes(numKey)) { diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index edb7cd33..46000590 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -179,13 +179,15 @@ {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 60, ellipsis:true}, - {title: '单位', dataIndex: 'mUnit', width: 60, ellipsis:true}, + {title: '单位', dataIndex: 'mUnit', width: 50, 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}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, + {title: '税率(%)', dataIndex: 'taxRate', width: 60}, + {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60}, {title: '供应商', dataIndex: 'sname', width: 80, ellipsis:true}, {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true}, - {title: '入库日期', dataIndex: 'operTime', width: 80}, + {title: '入库日期', dataIndex: 'operTime', width: 70}, {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true} ], url: { @@ -244,11 +246,11 @@ } }, exportExcel() { - let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '供应商', '仓库', '入库日期', '备注']] + let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '税率(%)', '税额', '供应商', '仓库', '入库日期', '备注']] for (let i = 0; i < this.dataSource.length; i++) { let ds = this.dataSource[i] let item = [ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber, ds.unitPrice, - ds.allPrice, ds.sname, ds.dname, ds.operTime, ds.newRemark] + ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark] aoa.push(item) } openDownloadDialog(sheet2blob(aoa), '入库明细') diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index 7fbecf4e..63fb3c53 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -179,13 +179,15 @@ {title: '名称', dataIndex: 'mname', width: 120, ellipsis:true}, {title: '规格', dataIndex: 'standard', width: 60, ellipsis:true}, {title: '型号', dataIndex: 'model', width: 60, ellipsis:true}, - {title: '单位', dataIndex: 'mUnit', width: 60, ellipsis:true}, + {title: '单位', dataIndex: 'mUnit', width: 50, ellipsis:true}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, + {title: '税率(%)', dataIndex: 'taxRate', width: 60}, + {title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60}, {title: '客户', dataIndex: 'sname', width: 80, ellipsis:true}, {title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true}, - {title: '出库日期', dataIndex: 'operTime', width: 80}, + {title: '出库日期', dataIndex: 'operTime', width: 70}, {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true} ], url: { @@ -244,11 +246,11 @@ } }, exportExcel() { - let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '客户', '仓库', '出库日期', '备注']] + let aoa = [['单据编号', '条码', '名称', '规格', '型号', '单位', '数量', '单价', '金额', '税率(%)', '税额', '客户', '仓库', '出库日期', '备注']] for (let i = 0; i < this.dataSource.length; i++) { let ds = this.dataSource[i] let item = [ds.number, ds.barCode, ds.mname, ds.standard, ds.model, ds.mUnit, ds.operNumber, ds.unitPrice, - ds.allPrice, ds.sname, ds.dname, ds.operTime, ds.newRemark] + ds.allPrice, ds.taxRate, ds.taxMoney, ds.sname, ds.dname, ds.operTime, ds.newRemark] aoa.push(item) } openDownloadDialog(sheet2blob(aoa), '出库明细')